Henry
032b2542f0
Merged from Master
2016-01-14 17:23:53 -08:00
Henry
3e7eb11d84
Regenerated bundles
2016-01-14 17:08:19 -08:00
Victor Woeltjen
69c5b110bf
[API Refactor] Move out non-global require config
2016-01-13 12:41:15 -08:00
Charles Hacskaylo
4f7ca98b60
Merge branch 'master' into nem468a.
...
Many tweaks to fix some issues with tree, labels and Inspector.
Conflicts:
platform/commonUI/edit/res/templates/elements.html
platform/commonUI/general/res/sass/search/_search.scss
platform/commonUI/general/res/sass/tree/_tree.scss
platform/commonUI/general/res/templates/object-inspector.html
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/snow/res/css/theme-snow.css
platform/search/res/templates/search.html
2016-01-11 13:29:26 -08:00
Victor Woeltjen
0036974c60
Merge remote-tracking branch 'github/master' into open450b
...
Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469
Conflicts:
platform/commonUI/general/bundle.json
2016-01-08 15:36:10 -08:00
Victor Woeltjen
cec197f888
[API Refactor] Remove bundle.json files
2016-01-08 15:32:18 -08:00
Victor Woeltjen
de53247d56
[API] Convert JSON bundles to imperative form
2016-01-07 15:08:08 -08:00
Henry
a6ecda9cab
Resolved conflict
2016-01-06 14:06:28 -08:00
Charles Hacskaylo
33b1c1689c
[Frontend] Added classes for no-collapse indicator
...
open #304
Added classes string and related classes to ClockIndicator;
2015-12-11 15:49:50 -08:00
Henry
39b3e6c4a9
[Edit Mode] Limit context menu options available for objects in edit mode
...
[Edit Mode] Edit mode on objects that do not have a view supporting editing should edit properties instead. #320
2015-12-09 18:14:17 -08:00
Victor Woeltjen
8077cdb834
[Clocks/Timers] Make $scope available
...
...to methods of TimerController
2015-12-09 12:41:29 -08:00
Victor Woeltjen
7871af07c4
[Clocks/Timers] Fix parent constructor invocations
2015-12-09 12:40:21 -08:00
Victor Woeltjen
714ae3b9dc
[Clocks/Timers] Update remaining classes
...
Complete code style changes for Clocks/Timers.
2015-12-09 12:39:01 -08:00
Victor Woeltjen
27fa56d838
[Clocks/Timers] Update code style for controllers
2015-12-09 12:33:11 -08:00
Victor Woeltjen
e30a82432d
[Clocks/Timers] Update code style for actions
...
https://github.com/nasa/openmctweb/issues/209
2015-12-09 12:17:32 -08:00
Henry
268a2c2427
Merged from master
2015-11-25 09:04:11 -08:00
Charles Hacskaylo
50134bbc7f
[Frontend] Theming and cleanups in Clocks and Timers
...
open #208
Also converted timer to use flexbox layout;
2015-11-20 16:19:27 -08:00
Victor Woeltjen
5274923c49
[Licenses] Add license headers
...
...to sources for Clocks/Timers and Timelines, as noted in
review nasa/openmctweb#207
2015-11-05 12:45:51 -08:00
Victor Woeltjen
ddb567aeb5
[Clocks/Timers] Declare dependency of moment-duration-format
...
...to ensure that moment is loaded first, such that
the plugin can correctly install itself.
nasa/openmctweb#204
2015-10-23 15:46:47 -07:00
Victor Woeltjen
307047d3ac
[Clocks/Timers] Remove namespacing from specs
...
WTD-1239
2015-10-23 13:44:39 -07:00
Victor Woeltjen
96f72b3765
[Clocks] Add license, change keys
...
Un-namespace keys in clock plugin, and add licensing
info for moment-duration-format. WTD-1239
2015-09-14 16:52:56 -07:00
Victor Woeltjen
c932e953bc
[Plugins] Bring over timeline, clock plugins
...
WTD-1239
2015-09-14 16:45:41 -07:00
