Henry
472f6fefd4
Merge branch 'open199' of https://github.com/nasa/openmctweb into open199
2015-11-30 17:59:13 -08:00
Henry
4f3c9f270b
[New Edit Mode Prototype] Hide edit button when in edit mode #350 . - Modified edit policy to hide edit button when in edit mode
2015-11-30 17:58:58 -08:00
Henry
833ef82e67
Modified edit policy to hide edit button when in edit mode
2015-11-30 17:45:46 -08:00
Henry
acb7d4b807
renamed variable
2015-11-30 09:35:44 -08:00
Henry
6fb6f54cfa
Fixed objects being dropped twice in fixed layout
2015-11-27 15:21:24 -08:00
Henry
9a42cb4f7e
Merge branch 'open277' into open199
2015-11-27 14:16:59 -08:00
Henry
b573b3a681
Amended change so that context menu only suppressed on navigation menu
2015-11-27 14:16:37 -08:00
Henry
6558461fda
Reverted changes after refactor
2015-11-27 13:05:55 -08:00
Henry
4b23e3fbcb
Refactored changes to ContextMenuGesture.js
2015-11-27 13:02:19 -08:00
Henry
988323bdbd
merged Open32
2015-11-25 14:59:47 -08:00
Henry
9eb8158c4e
[Edit Mode] Disallow context menu actions on tree items during edit mode. #277
2015-11-25 14:44:31 -08:00
Henry
75d4be290c
Merge branch 'open278-proto' into open199-merge
2015-11-25 11:27:08 -08:00
Henry
3b9cd5f1ac
Merge branch 'open279-proto' into open199-merge
2015-11-25 11:25:00 -08:00
Henry
64a7647ec3
#279 Added search filter support to elements pool
2015-11-25 11:20:58 -08:00
Henry
9ed10ba9da
Merge branch 'open279-proto' into open199-merge
2015-11-25 10:47:21 -08:00
Henry
c211f413aa
[New Edit Mode] Add Elements pool to New Edit Mode #279
2015-11-25 10:40:37 -08:00
Henry
268a2c2427
Merged from master
2015-11-25 09:04:11 -08:00
Henry
c84de00e80
[Layout] Layout rebuilds after resize/reposition #32
2015-11-24 21:51:10 -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
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
Henry
7849803a5d
Fixed cancel and drop-initiated edit
2015-11-20 14:00:29 -08:00
Henry
0263cf5407
Fixed cancel and drop-initiated edit
2015-11-20 13:59:32 -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
Henry
4f0f9e4104
Merge branch 'open-status-tracking' into open278
2015-11-20 11:28:06 -08:00
Henry
e6054b8252
#287 - modified to use s-status-editing, but CSS needed
2015-11-20 11:23:34 -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
Henry
a864c172d5
[Edit Mode Prototype] #278 Added visual indication of edit
2015-11-20 10:07:58 -08:00
Victor Woeltjen
400b992ec3
[Status] Revise API
...
Change method names, add a getter to status capability;
per code review feedback, nasa/openmctweb#319 .
2015-11-20 09:46:08 -08:00
Charles Hacskaylo
32815d8427
[Frontend] Markup and CSS fixes
...
open #251
Fixed markup and CSS to remove erroneously
applied "select" class;
Modified .select to not use overflow: hidden;
Better positioning for *-options elements;
2015-11-19 18:50:10 -08:00
Henry
10a44c026c
[Edit Mode] Visual indication of object being edited #278
2015-11-19 18:45:18 -08:00
Charles Hacskaylo
3e25d17702
[Mobile / Frontend] Modified media query device detection approach
...
open #169
Significant simplification of media query device detection
to focus on width only; tablet max-width and desktop
min-width modified to create gapless ranges;
2015-11-19 15:16:21 -08:00
Henry
9631d95a52
Merge remote-tracking branch 'origin/open-status-tracking' into open278-proto
2015-11-19 15:13:10 -08:00
Henry
4ea757faa5
Adding support for object status
2015-11-19 15:12:43 -08:00
Victor Woeltjen
b5d1118a3f
[Status] Document status capability
...
...in the developer guide. Includes a table for listing
status names and classes, per code review feedback,
nasa/openmctweb#319 .
2015-11-19 15:12:03 -08:00
Henry
50d83eaffb
Merge remote-tracking branch 'origin/open278' into open278-proto
2015-11-19 14:50:01 -08:00
Henry
30e6980dc6
Merge branch 'master' into open199
2015-11-19 14:29:32 -08:00
Victor Woeltjen
5b9e43f8ff
[Status] Test platform/status
2015-11-19 14:22:44 -08:00
Henry
19d2970e0e
Merge in "create button initiates edit mode"
2015-11-19 14:13:28 -08:00
Henry
a04b3f8a4b
enabled toolbar in edit mode
2015-11-19 14:01:38 -08:00
Victor Woeltjen
3ffa6f70aa
[Status] Add empty specs
2015-11-19 13:47:39 -08:00
Victor Woeltjen
0d07c3c289
[Status] Clean up classes when destroyed
2015-11-19 13:44:06 -08:00
Victor Woeltjen
29fdb6d641
[Status] Add JSDoc
2015-11-19 13:43:18 -08:00
