Commit Graph

3539 Commits

Author SHA1 Message Date
Victor Woeltjen
924a4026ff [Build] Trigger gulp from prepublish 2016-01-29 11:54:18 -08:00
Victor Woeltjen
25a7df7885 [Build] Update JSDoc 2016-01-29 11:46:37 -08:00
Victor Woeltjen
ddb5837145 Merge branch 'master' into open460 2016-01-29 11:44:38 -08:00
Victor Woeltjen
6509d84a5d [Build] Update TemplateLinker spec 2016-01-29 11:42:14 -08:00
Victor Woeltjen
507f2391ff [Build] Update mct-include, mct-representation specs
...to reflect changes in TemplateLinker API allowing
templates to be explicitly included.
2016-01-29 11:27:08 -08:00
Victor Woeltjen
38e703a121 [Build] Fix failing test
Acquire reference to moment as an argument instead of
assuming global availability; this appears to be no longer
be present globally after build changes
2016-01-29 10:33:43 -08:00
Victor Woeltjen
e564baba1a [Build] Update test runner 2016-01-29 10:26:47 -08:00
Victor Woeltjen
0a546cd50c [Build] Run bower as a postinstall step 2016-01-29 10:17:44 -08:00
Victor Woeltjen
baf32dd62f [Build] Add verify task 2016-01-29 10:15:34 -08:00
Victor Woeltjen
71db4b38ab [Build] Remove obsolete pom.xml 2016-01-29 10:08:33 -08:00
Victor Woeltjen
2727c9544d Merge remote-tracking branch 'github/master' into open-master 2016-01-28 17:33:45 -08:00
Victor Woeltjen
a35b0c1d7b Remove erroneously committed file
From #474
2016-01-28 17:33:00 -08:00
Victor Woeltjen
df94d31cf3 [Build] Generate build info for About dialog 2016-01-28 17:16:44 -08:00
Victor Woeltjen
c3f819fa8c [Build] Begin adding build info 2016-01-28 17:08:02 -08:00
Victor Woeltjen
5b0ee8588c [Build] Respect shim config when optimizing 2016-01-28 15:23:37 -08:00
Victor Woeltjen
fcfb3eebda [Build] Include all static assets 2016-01-28 15:23:17 -08:00
Victor Woeltjen
84e1e87ce3 [Build] Copy run-time resources into dist 2016-01-28 15:06:07 -08:00
Victor Woeltjen
41cfd050a2 [Build] Change task name for code style check 2016-01-28 14:54:30 -08:00
Victor Woeltjen
d67ffa8401 [Build] Add fixstyle step 2016-01-28 14:39:14 -08:00
Victor Woeltjen
fd2f4128a0 [Build] Add code style checks 2016-01-28 14:33:57 -08:00
Victor Woeltjen
814fb3b513 [Build] Add lint step 2016-01-28 13:44:18 -08:00
Victor Woeltjen
e0fbaa83b0 [Build] Add compatibility with text plugin
Allow templates to be loaded via the text plugin, which
in turn will allow these to be built into the final JS
artifact.
2016-01-28 11:41:14 -08:00
Victor Woeltjen
967f8c9151 [Build] Update remaining library references 2016-01-28 11:25:44 -08:00
Victor Woeltjen
84ecfd3527 [Build] Remove remaining files in libs 2016-01-28 11:21:08 -08:00
Victor Woeltjen
3a4f6a7229 [Build] Update dependency references
...to reflect movement of third-party libraries to
bower_components.
2016-01-28 11:18:57 -08:00
Victor Woeltjen
7a160a0a98 [Build] Remove third-party libraries 2016-01-28 11:13:11 -08:00
Victor Woeltjen
cf15b6eed7 [Build] Add additional run-time dependencies 2016-01-28 11:12:18 -08:00
Victor Woeltjen
452b05eb7b [Build] Update RequireJS config
...to use bower_components paths
2016-01-28 10:55:22 -08:00
Victor Woeltjen
82261dfabc [Build] Add bower.json
...to declare front-end dependencies, to allow these to be
removed from repository.
2016-01-28 10:51:52 -08:00
Victor Woeltjen
fc7bd36dba [Build] Begin integrating compass
Convert SCSS to CSS as a build step.
2016-01-28 10:36:01 -08:00
Victor Woeltjen
918c667496 [Build] Update code coverage report path 2016-01-27 15:00:59 -08:00
Victor Woeltjen
7c23f803e8 Merge pull request #477 from nasa/open337
Review and integrate open337
2016-01-27 14:33:37 -08:00
Victor Woeltjen
97c69799b4 [Build] Use spaces instead of tabs 2016-01-27 14:30:40 -08:00
Victor Woeltjen
406fdd5efc [Build] Run karma tests from gulp 2016-01-27 14:30:07 -08:00
Victor Woeltjen
f334be8f23 [Build] Externalize source maps 2016-01-27 14:01:09 -08:00
Victor Woeltjen
e1b7f2af30 [Build] Add initial gulp task
Add initial gulp task (r.js optimization)
2016-01-27 13:23:17 -08:00
Victor Woeltjen
ad63b9ff1b [Build] Ignore dist 2016-01-27 13:03:08 -08:00
Victor Woeltjen
e83b19c84b [Build] Add gulp dependency
Add dependency on gulp to begin modifying build, per
#460
2016-01-27 13:00:20 -08:00
Victor Woeltjen
dbf196e014 Merge remote-tracking branch 'github/master' into open477
Resolve conflicts to complete merge of #477

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
2016-01-27 12:53:46 -08:00
Victor Woeltjen
b5c8ecc85f Merge pull request #475 from nasa/open325b
[Time Conductor] Update validation logic
2016-01-27 12:44:14 -08:00
Victor Woeltjen
9e6da94878 [Time Conductor] Reformat expression in template
...to use less line width, and to exhibit more normal
indentation, per code review feedback from #475
2016-01-22 15:24:27 -08:00
Victor Woeltjen
3a26c864b8 [Time Conductor] Fix comment text
Per code review feedback, #475
2016-01-22 15:22:54 -08:00
Pete Richards
be7827d6f8 Merge remote-tracking branch 'open/open445' into open-master 2016-01-22 11:47:05 -08:00
Henry
b8b5fdcabf [Copy] #497 Removed extraenuous persist call 2016-01-22 11:32:20 -08:00
Victor Woeltjen ★
45276183b9 Merge pull request #496 from nasa/open492
[Documentation] #492 Amended CircleCI configuration to add missing dependency
2016-01-22 09:30:27 -08:00
Henry
54653f3914 [Create] #491 Locator is not visible when creating a new object where selected object does not have location
Added additional test for default context

Fixed JSLint error
2016-01-21 16:35:18 -08:00
Henry
cd2b19eb1e [New Edit Mode] Fixed failing tests, and added new test in CreateWizard
[New Edit Mode] #480 fixed JSLint errors

[New Edit Mode] #480 do not show locator for sub objects

[New Edit Mode] Modified persistence in SaveAction

Removed redundant variable

Fixed Failing Test

Fixed JSLint errors

Improved some documentation
2016-01-21 12:01:38 -08:00
Henry
3850db268a [Documentation] #492 Added missing dependency for CircleCI 2016-01-21 10:54:49 -08:00
Henry
c65096f166 [New Edit Mode] Added AddAction, modified EditableDomainObject to properly wrap inherited functions, added new EditableInstantiationCapability 2016-01-20 18:49:39 -08:00
Victor Woeltjen ★
fcae3fd7a9 Merge pull request #487 from nasa/open486
Review and integrate open486
2016-01-19 11:38:50 -08:00