f192544be3
Addressing issues from code review
2016-03-02 11:10:49 -08:00
2cc2c6a9d3
[Edit Mode] #627 removed edit concerns from browse controllers and markup
...
Fixed elements not appearing in edit mode
Fixed failing tests
2016-03-02 11:05:23 -08:00
a910fa8f37
Removed unused 'controller as'
2016-03-02 11:01:34 -08:00
65ca78d8aa
Added missing dependency on
2016-03-02 11:00:08 -08:00
2f036a89e4
Refactoring out regions
2016-03-02 11:00:08 -08:00
fa46d31ac2
[Edit Mode] #627 slightly modified edit representer to detect newly created objects
...
Added some comments, renamed controller variable in markup
Removed edit references from BrowseController
2016-03-02 10:57:05 -08:00
549dfab5aa
[Edit Mode] #627 remove edit concerns from browse controller
2016-03-02 10:55:18 -08:00
494212a448
Merge pull request #653 from nasa/open499
...
[Notifications] #499 All notifications now dismissable by default.
2016-03-01 14:50:56 -08:00
8511dc93b5
Merge pull request #714 from nasa/ci-test-reporter
...
[Build] run JSHint on circleci, generate test reports
2016-03-01 13:47:24 -08:00
751414a686
[CI] Save coverage in artifacts
...
Save code coverage results in artifacts when building on circleci.
2016-03-01 13:37:52 -08:00
668b09b789
[Style] Pull functions out of loop
...
Pull functions out of loop for jshint compliance.
2016-03-01 13:25:37 -08:00
b9e0a77655
[CI] Run JSHINT after tests
2016-03-01 13:07:16 -08:00
b9a7ee423a
Merge branch 'master' into open670_master
2016-03-01 12:56:08 -08:00
b5c6b70993
Merge branch 'master' into open670_master
2016-03-01 12:55:45 -08:00
d9b2034550
[Tests] Add jUnit reporter
...
Add jUnit reporter to allow CircleCI to store test results.
2016-03-01 12:53:32 -08:00
183bd9793c
Merge branch 'open677'
2016-03-01 11:33:31 -08:00
d176797307
[Style] Add missing semicolon
2016-03-01 10:59:23 -08:00
96d9f8c194
[Templates] load plot templates with require
...
Load templates with requirejs.
https://github.com/nasa/openmctweb/issues/673
2016-03-01 10:52:07 -08:00
748673f99b
Merge branch 'master' into open638_rebase
2016-03-01 10:48:53 -08:00
78374f8241
Merge branch 'open401'
2016-03-01 10:37:12 -08:00
bc6185f76d
[Browse] Remove unused constant
...
https://github.com/nasa/openmctweb/issues/401
2016-03-01 10:36:30 -08:00
747a98d130
Addressed issues from code review
2016-02-29 18:42:48 -08:00
7daaecbf8f
Merge pull request #710 from nasa/open673
...
[Templates] Load templates using RequireJS text plugin
2016-02-29 18:45:46 +00:00
6f9e78a14f
Merge pull request #711 from nasa/open442a
...
[Frontend] Markup, CSS changes
2016-02-29 17:36:54 +00:00
beee4136a6
Merge pull request #702 from nasa/open164
...
Review and integrate open164
2016-02-26 16:49:26 -08:00
5a9bcfa938
[Frontend] Markup, CSS changes
...
#442
Removed white space from markup;
Moved getGlyphClass up to status-block-holder
element out of status-block;
CSS mods to selectors and style defs
in _messages.scss;
2016-02-26 16:48:23 -08:00
721557b814
[Templates] Exercise selection method
...
...add to TimelineSwimlanePopulator to reflect changes to
time at which selection object may become available as
a consequence to changes in the way templates are normally
loaded. #673
2016-02-26 16:29:06 -08:00
70ed16491a
[Templates] Change watch order
...
...to work around order-sensitive test case
2016-02-26 16:26:31 -08:00
7240ff4f8d
[Templates] Update mct-control spec
...
...to reflect usage of templateLinker, to support including
templates via RequireJS text plugin
2016-02-26 16:22:55 -08:00
3a6e0be2d7
[Templates] Update FixedController spec
...
...to reflect changes to how selection object is obtained,
which in turn reflects change to using templates obtained
via RequireJS text plugin, instead of loading by URL.
2016-02-26 16:19:14 -08:00
9b21b0b7f2
[Templates] Update mct-container spec
...
...to reflect change to template over templateUrl
2016-02-26 16:17:33 -08:00
164c2faf07
Merge branch 'master' into open673
...
Merge latest from master into topic branch for #673
2016-02-26 15:54:41 -08:00
894cf5c461
[Templates] Include templates in test configuration
...
...such that they are available to the RequireJS text plugin
for loading.
2016-02-26 15:53:35 -08:00
fe419714f5
[Templates] Check for availability of timespan
...
...as ordering changes due to change from templateUrl to template
may mean this is not available when first initialized.
2016-02-26 15:50:07 -08:00
f3fd2e67fc
[Templates] Watch for selection object
...
...from Timeline, to ensure toolbar appears etc.
Reflects changes to ordering triggered by use of
template instead of templateUrl
2016-02-26 15:49:21 -08:00
931fa77cbe
[Templates] Handle deferred selection availability
...
Loading templates via RequireJS text plugin means they are
immediately available; appears to have caused a change in
ordering wherein controllers for views may be initialized
before representers have installed things like selection
state. As such, need to watch for changes instead of simply
checking for a selection object when the controller is
initialized.
2016-02-26 15:37:19 -08:00
872c4021e3
Merge pull request #82 from tarikozket/patch-1
...
Fixed typo
2016-02-26 23:28:24 +00:00
26d29c3d92
Merge pull request #652 from nasa/open649
...
[CSV Export] Implement exportService
2016-02-26 23:18:12 +00:00
596735352a
[Templates] Simplify MCTToolbar
...
Use mct-form as a basis; simply change the template.
2016-02-26 15:17:31 -08:00
402512a461
Merged from master to resolve conflict
2016-02-26 15:15:22 -08:00
2d03e3e6d4
[Templates] Remove unused template path calculation
2016-02-26 15:03:45 -08:00
19b442cc0b
[Templates] Require data table templates
...
...via text plugin
2016-02-26 15:02:04 -08:00
5c3d8508a2
[Templates] Use templateLinker for forms
...
...for compatibility with both template and templateUrl
2016-02-26 15:01:40 -08:00
8581547a9c
[Templates] Allow only template property for containers
...
...to work around difficulties with transclusion using
templateLinker.
2016-02-26 14:49:55 -08:00
192bbae6e5
[Frontend] Fix paths, includes
...
#702
Per https://github.com/nasa/openmctweb/pull/702 ;
Removed include of _logo-and-bg.scss into _about.scss;
2016-02-26 14:49:34 -08:00
e61711688e
[Templates] Use templateLinker from MCTContainer
...
...for compatibility with both template and templateUrl.
2016-02-26 14:24:41 -08:00
a73f1ebbbd
Merge pull request #637 from nasa/rems_data
...
[Examples] Rems data integration
2016-02-26 14:21:30 -08:00
4674918b4b
[Examples] #359 Updated to attempt connection to remote data source and fallback to local if unavailable
...
Minor change to readme
Fixed JSLint errors
More JSLint errors
[Example] Rems data integration - disabled bundle by default.
[Examples] REMS data integration - added newlines at end of files
[Example] Added time conductor support to REMS data integration
Added caching of results
[Examples] Added domain format to REMS data #359
[Example] #637 Added local proxy to app.js to allow cross-origin requests
Updated readme
2016-02-26 14:03:10 -08:00
741d4476e6
[Templates] Use text plugin for toolbar
2016-02-26 13:12:35 -08:00
bf1fa0ac4c
[Templates] Include templates using text plugin
...
Resolves #673
2016-02-26 13:07:50 -08:00
