Victor Woeltjen
1cf23c7ad6
[Documentation] Rename development cycle
...
...as it will no longer be the index of the process
category as information about testing is added.
2015-11-24 10:57:52 -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
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
de59f191b8
[Frontend] Relocating files
...
open #208
Moving initial files into new positions, based
on Victor's work in #242 ;
2015-11-20 09:14:07 -08:00
Charles Hacskaylo
3d3b250536
Merge remote-tracking branch 'github/master' into open208
2015-11-20 08:38:19 -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
Henry
b06a38da2f
Fixed incorrect case
2015-11-19 13:17:14 -08:00
Henry
f45e236281
#286 Fixed issues with composition not surviving through create wizard
2015-11-19 13:11:01 -08:00
Victor Woeltjen
0fa6cbfc18
[API] Propose contextual DI
2015-11-19 13:02:03 -08:00
Henry
2e2b18eaa5
[Edit Mode Prototype] Create button initiates edit-mode immediately #286
2015-11-19 10:33:44 -08:00
Charles Hacskaylo
ee86209166
Merge branch 'open278' of https://github.com/nasa/openmctweb into open278
2015-11-18 17:29:18 -08:00
Charles Hacskaylo
9f5729dbbc
Merge remote-tracking branch 'github/master' into open278
2015-11-18 17:28:31 -08:00
Charles Hacskaylo
de9e41818b
[Frontend] File cleanup
...
open #199
open #278
Comments and empty CSS classes removed;
2015-11-18 17:27:56 -08:00