Henry
43e920d3b6
Reverted to local storage
2015-11-05 10:27:50 -08:00
Andrew Henry
3443780ac7
Improved commenting
2015-11-04 22:09:28 -08:00
Andrew Henry
8e85675732
Made changes to error reporting
2015-11-04 22:07:26 -08:00
Andrew Henry
2bdc95eb95
Restored MoveActionSpec.js and LinkActionSpec.js
2015-11-04 21:11:26 -08:00
Andrew Henry
f2efb07d93
Remove UUID path
2015-11-04 21:05:55 -08:00
Andrew Henry
863c3f1720
Fixed jslint issues
2015-11-04 20:48:22 -08:00
Andrew Henry
b73f9fc19e
Merged from master
2015-11-04 20:30:49 -08:00
Andrew Henry
10e711f717
Removed commented code
2015-11-04 20:26:24 -08:00
Andrew Henry
529dde57b9
Added test for notification to CopyActionSpec
2015-11-04 20:26:24 -08:00
Henry
7d1a1acc11
Adding tests for Copy Action
2015-11-04 20:26:23 -08:00
Henry
5e1b0f38b7
Migrated to using notifications and fixed tests
2015-11-04 20:26:23 -08:00
Andrew Henry
4e69ca50fb
Fixed blocking dialog
2015-11-04 20:26:23 -08:00
Andrew Henry
05481dcab5
reverted AbstractComposeAction
2015-11-04 20:26:23 -08:00
Andrew Henry
fa7131ad5c
Refactoring to use promises notifications
2015-11-04 20:26:23 -08:00
Henry
bd1c3cb7da
All test cases passing + added test cases for copy
2015-11-04 20:26:23 -08:00
Henry
cbd21212d1
Original tests that are still valid are passing
2015-11-04 20:26:23 -08:00
Henry
5cd458a733
Updating tests
2015-11-04 20:26:23 -08:00
Andrew Henry
2f90a89065
Fixed more failing tests
2015-11-04 20:26:23 -08:00
Henry
4312857fd4
Fixed failing tests
2015-11-04 20:26:22 -08:00
Andrew Henry
6c4c53dde7
Debugging test failures
2015-11-04 20:26:17 -08:00
Victor Woeltjen
2815d97682
Merge pull request #236 from nasa/open232
...
Review and integrate open232
2015-11-04 13:15:21 -08:00
Victor Woeltjen
ab01f64cea
Merge remote-tracking branch 'github/master' into open236
...
Resolve CSS conflicts for nasa/openmctweb#236
Conflicts:
platform/commonUI/general/res/sass/controls/_controls.scss
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/snow/res/css/theme-snow.css
2015-11-04 13:02:17 -08:00
Victor Woeltjen
15f9bc083c
Merge pull request #240 from nasa/open233b
...
[Inspector] Introduce inspector pane
2015-11-04 11:24:27 -08:00
Victor Woeltjen
1c4a4e475b
[Inspector] Simplify splitter communication
2015-11-04 10:53:23 -08:00
Victor Woeltjen
f7839b758d
Merge remote-tracking branch 'github/master' into open233b
...
Resolve conflicts on nasa/openmctweb#233
Conflicts:
platform/commonUI/general/bundle.json
platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json
platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
platform/commonUI/general/res/sass/_main.scss
platform/commonUI/general/res/sass/user-environ/_layout.scss
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/espresso/res/sass/_constants.scss
platform/commonUI/themes/snow/res/css/theme-snow.css
2015-11-04 09:28:19 -08:00
Charles Hacskaylo
2c7c7b90e6
Fixed JS var placement causing mvn to fail
...
open #90
open #233
2015-11-03 16:51:15 -08:00
Charles Hacskaylo
903778799f
Fixed missing window reference causing test to fail
...
open #90
open #233
2015-11-03 16:45:11 -08:00
Pete Richards
9523c918fb
Merge remote-tracking branch 'github-open/open182' into open-master
2015-11-03 15:52:14 -08:00
Charles Hacskaylo
09be19310b
Resolved CSS conflicts
...
open #90
2015-11-03 15:44:10 -08:00
Pete Richards
b8b9b1f79a
Merge remote-tracking branch 'github-open/open227' into open-master
2015-11-03 15:43:08 -08:00
Victor Woeltjen
4300338b9c
Merge pull request #186 from nasa/open155
...
[Notifications] Add notification infrastructure
2015-11-03 15:38:41 -08:00
Charles Hacskaylo
6a42d0c7a1
[Frontend] Put overflow: auto back onto .object-holder
...
open #232
2015-11-03 15:28:53 -08:00
Victor Woeltjen
0dccaab9cb
[Search] Declare UI components as templates
...
Declare Search UI components as templates instead of
representations so that they are not removed from the
DOM when no domain object is supplied. Fixes
nasa/openmctweb#234
2015-11-02 14:07:22 -08:00
Charles Hacskaylo
c8848b5788
[Frontend] Tweaked spacing in Inspector header
...
open #90
2015-11-02 13:39:15 -08:00
Victor Woeltjen
8d65335786
[Time Conductor] Remove check for domain existence
2015-11-02 12:31:40 -08:00
Victor Woeltjen
2d1faeba8c
[Time Conductor] Update FormatService JSDoc
2015-11-02 12:30:18 -08:00
Victor Woeltjen
cecc52f0a9
[Time Conductor] Update formatService usages
...
...to remove checks for unknown formats.
2015-11-02 12:28:46 -08:00
Victor Woeltjen
a1d765f271
[Time Conductor] Throw errors for unknown formats
...
Per code review, nasa/openmctweb#204
2015-11-02 12:23:13 -08:00
Charles Hacskaylo
fe12cdefc5
[Frontend] Added icon to Inspector header
...
open #90
and updated icon;
2015-11-02 11:27:56 -08:00
Charles Hacskaylo
648cdcc86e
Updated crosshair symbol for inspect
...
open #90
(cherry picked from commit 946a6d4
2015-11-02 11:08:00 -08:00
Charles Hacskaylo
f7588d57c2
[Frontend] Added crosshair symbol for inspect
...
prod-uisymbols
open #90
(cherry picked from commit 91a4138
2015-11-02 10:31:44 -08:00
Charles Hacskaylo
141a54cbd6
[Frontend] Tweaks in Inspector
...
open #90
Colors, spacing, properties layout mods;
2015-10-30 23:44:15 -07:00
Charles Hacskaylo
64c6ef6cfd
[Frontend] Tweaks in Inspector
...
open #90
Colors, spacing, properties layout mods;
Checked in mobile and snow theme;
2015-10-30 18:31:02 -07:00
Charles Hacskaylo
fe8d9f6717
[Frontend] Mobile and margin tweaks
...
open #90
Margin off of right scrollbar added for treeview
in desktop only;
Repositioned nav to parent arrow button in
object-browse-bar;
2015-10-30 17:22:41 -07:00
Charles Hacskaylo
c913f173e3
[Frontend] Safety merge of master; minor fixes
...
open #90
IN-PROGRESS
Merged in latest from github/master;
Fixed margins when in edit mode;
Fixed edit area not utilizing overflow: auto properly;
TO-DO: verify mobile is Ok;
2015-10-30 17:09:04 -07:00
Victor Woeltjen
ae928a138c
[Representation] Update compilation approach
...
Update compilation approach for templateLinker to more
closely resemble ng-include; minimizes likelihood of
subtle behavioral differences (e.g. incorrect size
selection for split pane)
2015-10-30 16:37:47 -07:00
Charles Hacskaylo
d926110b4e
Merge remote-tracking branch 'github/open155' into open155c
...
open #186
open #155
Re-rendering css;
2015-10-30 16:26:49 -07:00
Charles Hacskaylo
485e6a9de1
[wtf] Merge open155 > github/master
...
open #155
open #186
WTF yet again getting merge conflicts when remerging open155;
2015-10-30 16:24:20 -07:00
Charles Hacskaylo
1e6731e6f2
Merge open155 > github/master
...
open155
open186
Trying a third time to resolve conflicts between open155 and master;
2015-10-30 16:20:57 -07:00
Victor Woeltjen
454a63e1f1
[Representation] Destroy scopes before adding
...
Destroy representation scope before adding elements back into
the DOM; avoids having a momentary activation of watches and
listeners on those scopes before they are replaced with newly
compiled content for new scopes.
2015-10-30 16:18:01 -07:00
