Henry
1fef6b30b7
Merge branch 'open338' into rems_data
2015-12-03 18:41:50 -08:00
Henry
461cc59b3e
#338 changed isLink check to check whether location is set
2015-12-03 18:41:13 -08:00
Henry
c038ccd0d2
Removed unused parameter
2015-12-03 18:24:38 -08:00
Henry
57efe4e0d1
Removed UUID reference
2015-12-03 17:10:28 -08:00
Henry
6aa77ff468
#338 fixed failing test
2015-12-03 16:41:06 -08:00
Henry
f8099550bd
[Copy] #338 updated code style in CreationPolicy
2015-12-03 16:22:45 -08:00
Henry
96249e6bcc
Removed redundant line in test spec
2015-12-03 15:51:27 -08:00
Henry
6e391098a3
Fixed jslint error
2015-12-03 15:32:26 -08:00
Henry
e16b156d1d
Merge branch 'open338' into rems_data
2015-12-03 15:28:25 -08:00
Henry
baec0f9719
#338 added new test case for creation of links when object type is not createable
2015-12-03 15:28:07 -08:00
Henry
1f6284257e
Merge branch 'open338' into rems_data
2015-12-03 14:48:02 -08:00
Henry
6aab9f4e34
Added test for linking
2015-12-03 14:47:42 -08:00
Henry
734e979c94
#338 Fixed failing tests after refactor
2015-12-03 12:49:54 -08:00
Henry
16bf800257
Merge branch 'open338' into rems_data
2015-12-02 19:19:08 -08:00
Henry
3b427c31a2
Fixed error with not properly referenced
2015-12-02 19:18:50 -08:00
Henry
7fad2f6f2e
Merge branch 'open338' into rems_data
2015-12-02 19:10:33 -08:00
Henry
cee0ecf0ef
Removed use of composition and mutation because they trigger the search indexer too early and it tries to retrieve objects that have not been persisted yet
2015-12-02 19:10:10 -08:00
Henry
8e3c5db3bf
#338 fixed incorrect 'allow' function specification in CreationPolicy
2015-12-02 14:14:04 -08:00
Henry
11d8daf3ed
#338 Fixed incorrect specification of CreationPolicy in bundle.json
2015-12-02 14:07:08 -08:00
Henry
9953e16415
#338 Copy now using target persistence space
2015-12-02 14:06:22 -08:00
Henry
fe600de0f7
[Copy] #338 added CreationPolicy and appropriate tests, amended CreateActionProvider, and updated existing tests
2015-12-02 11:28:49 -08:00
Henry
73ca30e654
Merged changes from Master
2015-12-01 10:44:42 -08:00
Victor Woeltjen
c8d77bc2db
[Entanglement] Allow cross-space linking
...
Allow links across spaces; only disallow move or copy.
Addresses WTD-1587
2015-11-30 15:27:10 -08:00
Victor Woeltjen
3fd4304de1
Merge pull request #345 from nasa/open32
...
[Layout] Layout rebuilds after resize/reposition #32
2015-11-27 09:59:01 -08:00
Henry
db7224486c
[Layout] Layout rebuilds after resize/reposition - Fixed potential race condition #32
2015-11-25 19:11:29 -08:00
Henry
424953c894
[Layout] Layout rebuilds after resize/reposition #32
...
- Refactored layoutPanels member function, and updated tests.
- Changed $scope.$watch to $scope.$watchCollection
2015-11-25 15:32:33 -08:00
Henry
6d0f3c7faa
[Layout] Layout rebuilds after resize/reposition #32
...
Refactored layoutPanels method
Fixed JSLint errors
fixed failing tests
2015-11-25 15:30:33 -08:00
Victor Woeltjen
434a52ded3
[Build] Bump version number
...
...to begin work for new sprint.
2015-11-25 14:11:53 -08:00
Victor Woeltjen
2ec906e2d4
[Build] Remove snapshot status
...
Remove snapshot status in preparation to bump version number
at end of sprint Banks.
2015-11-25 14:10:48 -08:00
Henry
c84de00e80
[Layout] Layout rebuilds after resize/reposition #32
2015-11-24 21:51:10 -08:00
Victor Woeltjen
15ec9df538
Merge pull request #327 from nasa/open208b
...
[Timelines] Bring over CSS
2015-11-23 10:38:02 -08:00
Victor Woeltjen
d6e2895666
Merge pull request #257 from nasa/open245b
...
[Persistence] Support multiple persistence spaces
2015-11-21 07:13:54 -08:00
Victor Woeltjen
7974ffdda2
Merge remote-tracking branch 'github/master' into open245b
...
...in preparation to complete merge nasa/openmctweb#257
Conflicts:
platform/entanglement/src/actions/CopyAction.js
platform/entanglement/src/actions/LinkAction.js
platform/entanglement/src/actions/MoveAction.js
2015-11-21 07:05:51 -08:00
Victor Woeltjen
d5858622ba
[Persistence] Fix grammar in JSDoc
...
...and add some explanation of METHOD_DEFAULTS.
2015-11-21 06:59:12 -08:00
Victor Woeltjen
9656e09066
[Documentation] Clarify identifier syntax
...
...in plain English, for the humans.
Per code review in nasa/openmctweb#257
2015-11-21 06:52:19 -08:00
Victor Woeltjen
096fee8b6d
Merge remote-tracking branch 'github/master' into open208b
...
Conflicts:
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/snow/res/css/theme-snow.css
2015-11-21 06:42:45 -08:00
Victor Woeltjen
0635e7c38e
[Timeline] Disambiguate datetime control
...
Timeline uses a custom date-time control on creation;
use a distinct key for this to avoid a naming collision
with platform's datetime. Addresses abnormal behavior
identified in nasa/openmctweb#208
2015-11-20 17:26:43 -08:00
Victor Woeltjen
845b1dcd6f
Merge pull request #321 from nasa/open169
...
Review and integrate open169
2015-11-20 17:13:39 -08:00
Victor Woeltjen
2e959e8503
Revert "[Mobile] Deploy via CircleCI"
...
This reverts commit 49b3d67272
2015-11-20 17:09:37 -08:00
Victor Woeltjen
e6c9cbf0cd
[Persistence] Clarify JSDoc
...
Per code review feedback, nasa/openmctweb#257
2015-11-20 17:08:39 -08:00
Charles Hacskaylo
fd3059b380
[Frontend] Final cleanups, tweaks; Refactored s-icon-btn
...
open #208
Unit tested in both themes;
.s-icon-btn refactored slightly to focus on usage
as an icon-only element, removed overlap designations
with .s-btn in markup;
Colors normalized for theming;
Code cleanup;
2015-11-20 16:47:04 -08:00
Charles Hacskaylo
5a7349117a
[Frontend] Cleanups to Timeline tabular label elements
...
open #208
Colors normalized for theming;
2015-11-20 16:27:26 -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
Charles Hacskaylo
3854df27d8
[Frontend] Styling on Timeline zoom buttons
...
open #208
Fixed in both themes;
2015-11-20 15:42:08 -08:00
Charles Hacskaylo
fc53dbd8a4
[Frontend] Themes added to Timelines
...
open #208
Espresso and Snow now supported; bulk of
work done except for minor cleanups, like zoom
buttons; Dragging not working currently in Timelines;
2015-11-20 15:23:08 -08:00
akhenry
fb0ba0cff9
Merge pull request #323 from nasa/open251
...
Review and integrate open251
2015-11-20 13:30:24 -08:00
akhenry
573e5608fc
Merge pull request #319 from nasa/open-status-tracking
...
[Status] Add status tracking
2015-11-20 13:18:09 -08:00
Victor Woeltjen
37a7c2b1df
Merge pull request #309 from nasa/open308
...
[Workers] Allow web workers to be shared
2015-11-20 11:40:26 -08:00
Victor Woeltjen
38274728f6
[Workers] Update JSDoc
...
...per review feedback, nasa/openmctweb#309
2015-11-20 11:12:29 -08:00
Victor Woeltjen
49b3d67272
[Mobile] Deploy via CircleCI
...
...to enable testing of changes for nasa/openmctweb#169 .
2015-11-20 11:05:25 -08:00
