Victor Woeltjen
ddb5837145
Merge branch 'master' into open460
2016-01-29 11:44:38 -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
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
Pete Richards
be7827d6f8
Merge remote-tracking branch 'open/open445' into open-master
2016-01-22 11:47:05 -08:00
Victor Woeltjen
c2207fe7ce
[Plot] Use reverse filter for range ticks too
2016-01-15 13:14:33 -08:00
Victor Woeltjen
a94e99af70
[Plot] Use reverse filter for plot ticks
...
...to remove CSS-related reversal from scripts
2016-01-15 13:09:05 -08:00
Henry
193c7e3db2
[New Edit Mode] Fixed failing Time Conductor Test
2016-01-14 19:57:06 -08:00
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
Henry
3f5a8cb2be
[New Edit Mode] Disabled time conductor tests which are failing
2016-01-14 16:12:44 -08:00
Henry
d78bd9fd51
Merged from master
2016-01-14 15:16:02 -08:00
Henry
826d39a749
[New Edit Mode] Fixed logic in EditActionPolicy to use positive logic
2016-01-14 15:02:22 -08:00
akhenry
88f8925d17
Merge pull request #469 from nasa/open450b
...
[API Refactor] Imperatively register bundles
2016-01-14 09:41:04 -08:00
Charles Hacskaylo
442229fd42
Merge branch 'master' of https://github.com/nasa/openmctweb into open445
...
Conflicts:
platform/features/plot/res/templates/plot.html
2016-01-13 16:01:02 -08:00
Charles Hacskaylo
a7a707595c
[Frontend] Fixes to CSS for Chrome Linux
...
open #445
Mods and simplifications to wait-spinner classes;
Simplification and cleanup in plot.html to use loading
class instead of hide/show DOM element;
2016-01-13 13:54:00 -08:00
Victor Woeltjen
69c5b110bf
[API Refactor] Move out non-global require config
2016-01-13 12:41:15 -08:00
Charles Hacskaylo
8c325eb1b1
[Frontend] Mods to allow plot tick labels to ellipsis to left
...
open #337
Still fixing code due to circleci fail in pull request;
2016-01-13 10:11:14 -08:00
Charles Hacskaylo
5e628b1a25
[Frontend] Mods to allow plot tick labels to ellipsis to left
...
open #337
Still fixing code due to circleci fail in pull request;
2016-01-13 10:05:30 -08:00
Charles Hacskaylo
f8114ba6b6
[Frontend] Mods to allow plot tick labels to ellipsis to left
...
open #337
Fixing code due to circleci fail in pull request;
2016-01-12 18:23:30 -08:00
Charles Hacskaylo
a10f895904
[Frontend] Mods to allow plot tick labels to ellipsis to left
...
open #337
Fixing code due to circleci fail in pull request;
2016-01-12 18:20:52 -08:00
Charles Hacskaylo
9b59fd7eae
[Frontend] Mods to allow plot tick labels to ellipsis to left
...
open #337
Tick label strings are now reversed in their char order in
PlotTickGenerator.js, then reversed again via CSS in
_plots-main.scss. This forces the browser to clip the label
at the left 'start' side, rather than the end, resulting in
the least significant portion of the label getting clipped.
2016-01-12 18:04:09 -08:00
Charles Hacskaylo
8dd36d426c
[Frontend] Refactoring local controls hide and show
...
open #342
Now using CSS hover on pertinent plot areas;
Refining of select styling, tweaks for Firefox Linux;
Tweaks to local-control positioning in plots;
Changed *-options controls to use length > 1
instead of > 0;
2016-01-12 15:54:56 -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
Charles Hacskaylo
898dd557e5
[Frontend] Refactor to use s-status-editing instead of ng-class
...
open #468
Remove ng-class statements in favor of upstream .s-status-editing;
Restructure CSS accordingly;
NOTE: because edit.html has NOT been changed,
changes here will cause old edit mode to no longer display properly.
Don't integrate this CSS with old edit mode!
2016-01-08 16:11:00 -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
Henry
b20488e77d
Merged conflict
2016-01-06 14:05:40 -08:00
Victor Woeltjen
a49deb5ab1
Merge remote-tracking branch 'github/master' into open116
...
Merge in latest from master into topic branch for
https://github.com/nasa/openmctweb/issues/116
Conflicts:
platform/features/layout/test/FixedControllerSpec.js
platform/features/plot/test/PlotControllerSpec.js
2015-12-30 10:15:05 -08:00
Victor Woeltjen
9b63a63efc
Merge pull request #379 from nasa/open1337
...
[Limits] Add test cases for limits
2015-12-30 10:11:27 -08:00
Victor Woeltjen
2358541d91
[Time Conductor] Update RangeColumn spec
...
Update RangeColumn spec. Changes appear to have been related
to limits (WTD-1337), but making changes in the context of
updating tests for time conductor,
https://github.com/nasa/openmctweb/issues/116
2015-12-30 10:10:23 -08:00
Victor Woeltjen
38b5756d8d
[Time Conductor] Verify plot bounds retention
...
Verify that the domain axis of a plot retains bounds from
the time conductor, instead of doing its default behavior
of fitting to the data.
2015-12-30 10:04:04 -08:00
Victor Woeltjen
c436bcce0a
[Time Conductor] Test updated fixed position behavior
...
Verify interactions from FixedControllers on events
issued by the time conductor.
2015-12-30 09:29:24 -08:00
Henry
cf73f3a0c4
Moved gesture from individual views up to browse-object.html for now to resolve #423
2015-12-11 16:42:05 -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
49579378dd
[New Edit Mode] Fixed positioning of dropped objects #386
2015-12-09 09:51:00 -08:00
Henry
b5c741c911
Merge branch 'master' into open199
2015-12-08 15:42:37 -08:00
Victor Woeltjen
038322e9aa
[Layout] Update raw positions on drop
...
When handling a drop into the layout, store the panel's
new position to the LayoutController's internal table of
raw positions (in addition to writing it to the configuration.)
Avoids https://github.com/nasa/openmctweb/issues/384
2015-12-08 15:08:30 -08:00
Henry
18607e9404
Merged from Master
2015-12-07 20:42:09 -08:00
Victor Woeltjen
258c5d95e6
[Limits] Test PlotLimitTracker
2015-12-07 12:58:56 -08:00
Victor Woeltjen
30a8ba5c11
[Limits] Test limit usage in PlotController
...
WTD-1337
2015-12-07 12:45:40 -08:00
Victor Woeltjen
33c372765f
[Limits] Test limit usage from Fixed Position
...
WTD-1337
2015-12-07 12:33:29 -08:00