Andrew Henry
3701fd75dd
Finished first pass of tutorials
2015-10-13 13:54:24 -07:00
Andrew Henry
d787e84fd4
Updated tutorials
2015-10-13 13:54:24 -07:00
Andrew Henry
1922e1e241
Finished developer guide
...
Fixed date of modification
2015-10-13 13:54:24 -07:00
Andrew Henry
e52f53b7ff
Fixed markdown
2015-10-13 13:54:24 -07:00
Andrew Henry
d1be256691
Reverted gendocs changes
2015-10-13 13:54:12 -07:00
Henry
82ae9e72c1
Integrated notifications list
2015-10-09 14:17:55 -07:00
Pete Richards
c703714cb3
Merge remote-tracking branch 'github-open/open115b' into open-master
2015-10-09 13:50:27 -07:00
Victor Woeltjen
b48a07cd3e
Merge pull request #168 from nasa/mct80
...
[Plot] Dates show 1970 when there is no data
2015-10-09 13:40:04 -07:00
Pete Richards
8c29c8ed0e
Merge remote-tracking branch 'github-open/open151' into open-master
2015-10-09 13:38:20 -07:00
Henry
85300d3743
Refactored DialogService a little
2015-10-09 11:57:47 -07:00
Victor Woeltjen
5763511ec8
[Time Conductor] Update specs
...
Update specs to reflect merge of latest from master into
topic branch for nasa/openmctweb#115 , domain selector.
2015-10-09 11:17:57 -07:00
Victor Woeltjen
2accf21518
[Time Conductor] Add missing semicolon
...
...to pass code style checks.
2015-10-09 11:08:02 -07:00
Victor Woeltjen
28c42fcd4c
[Time Conductor] Fix merge issues
...
Fix merge issues not addressed during conflict resolution.
2015-10-09 11:06:41 -07:00
Henry
fe3e3325e1
Merge branch 'open170' into open155
2015-10-09 11:00:09 -07:00
Henry
2b97d61d6c
Further integration work
2015-10-09 10:59:36 -07:00
Victor Woeltjen
1efa97e6f5
Merge remote-tracking branch 'github/master' into open115b
...
Conflicts:
platform/features/conductor/src/ConductorRepresenter.js
2015-10-09 10:32:43 -07:00
Victor Woeltjen
756f728865
Merge remote-tracking branch 'github/open1515' into open-master
2015-10-09 10:11:11 -07:00
Victor Woeltjen
d8276c532b
Merge remote-tracking branch 'github/master' into open115b
...
Merge in latest from master into topic branch for
nasa/openmctweb#115
Conflicts:
platform/features/conductor/src/ConductorRepresenter.js
platform/features/conductor/src/ConductorTelemetrySeries.js
platform/features/conductor/src/TimeConductor.js
platform/features/conductor/test/ConductorRepresenterSpec.js
platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
2015-10-09 10:04:15 -07:00
Pete Richards
fc0bfa77db
Merge remote-tracking branch 'github-open/open141' into open141-integration
2015-10-09 09:52:35 -07:00
Pete Richards
12c6e53939
Merge remote-tracking branch 'github-open/open157' into open-master
2015-10-09 09:47:23 -07:00
Victor Woeltjen
4f716ad5c5
Merge pull request #162 from nasa/open117
...
Review and integrate open117
2015-10-09 09:44:48 -07:00
Pete Richards
8093fcbda1
Merge remote-tracking branch 'github-open/open139c' into open-master
2015-10-09 09:42:22 -07:00
Pete Richards
0ea5721f76
Merge remote-tracking branch 'github-open/open-readme-cairo' into open-master
2015-10-09 09:38:32 -07:00
Victor Woeltjen
d902943552
[Time Conductor] Satisfy JSLint
...
...in preparation to merge pull request nasa/openmctweb#162
2015-10-09 09:36:57 -07:00
Victor Woeltjen
5f7c8ccadb
Merge remote-tracking branch 'github/master' into open117b
2015-10-09 09:35:07 -07:00
Victor Woeltjen
520d17f9db
[Time Conductor] Test span constraints
...
Verify that inner and outer spans do not become zero when
user input might otherwise cause this.
2015-10-09 09:29:01 -07:00
Victor Woeltjen
7532db5f49
[Time Conductor] Add test cases
...
Add test cases to TimeRangeController; testing existing functionality
in the context of nasa/openmctweb#151
2015-10-09 07:58:10 -07:00
Victor Woeltjen
ebd8fdeee3
[Time Conductor] Enforce inner minimums on outer changes
2015-10-09 07:32:46 -07:00
Charles Hacskaylo
954fdd5906
[Frontend] Sanding/positioning and Cancel button added to Messasges dialog
...
open #159
open #170
Added Cancel button to Messages dialog in DialogService.js;
Important tweaks to layout of messages to allow
bottom-bar to align to bottom in singleton dialog view;
Revised status colors in theme's constants files;
2015-10-08 19:10:26 -07:00
Victor Woeltjen
f738f84075
[Time Conductor] Enforce minimum outer span
2015-10-08 16:02:47 -07:00
Victor Woeltjen
cc19a0acba
[Time Conductor] Enforce minimum inner span
...
nasa/openmctweb#151 .
2015-10-08 15:51:23 -07:00
Henry
8267058487
Begun integration of Notifications framework with Charles' code
2015-10-08 15:08:26 -07:00
Henry
4a913376ac
Merge branch 'open170' into open155
2015-10-08 13:57:25 -07:00
Henry
5ff3c71523
Fixed the Banner Controller which was not returning reference to controller
2015-10-08 13:56:59 -07:00
Henry
ba614fe2d6
Trying to sort out error
2015-10-08 13:46:42 -07:00
Henry
5e713f279b
Moved some more vars
2015-10-08 13:18:47 -07:00
Henry
df590107cb
Moved some more vars
2015-10-08 13:17:12 -07:00
Henry
fc8630dbc6
Moved some vars
2015-10-08 13:15:31 -07:00
Henry
12a94f828a
Added some more semicolons
2015-10-08 13:14:30 -07:00
Charles Hacskaylo
0e840ae003
[Frontend] Messages major work
...
open #159
open #170
CSS, markup and JS test files initially complete;
Templates renamed for consistency;
message-type icons styled;
Added severity constant "alert";
TO-DO: check refactored CSS against mobile,
see what's broken;
2015-10-08 13:09:41 -07:00
Henry
e1e5919f68
Added some semicolons
2015-10-08 13:08:43 -07:00
Henry
b2cd66bd5d
Merged in charles' changes
2015-10-08 11:26:31 -07:00
Henry
af1fa6e77a
added semicolons to test spec
2015-10-08 11:13:32 -07:00
Henry
5ff90f7254
Added more tests, some refactoring
2015-10-08 11:03:48 -07:00
Charles Hacskaylo
0ca9e5c952
[Frontend] Message list initially working
...
open #159
open #170
Thank you @akhenry;
launchMessages function added to DialogLaunchController.js;
New message-list.html template;
message.html is now its own include;
blocking-message.html renamed to
overlay-blocking-message.html;
2015-10-08 09:37:43 -07:00
Charles Hacskaylo
dbcad51325
[Frontend] Tiny mod to dialog-launch.html
...
open #159
open #170
2015-10-07 21:32:34 -07:00
Charles Hacskaylo
8ee93d9603
[Frontend] Tweaks to dialog-launch; added ui-symbols
...
open #159
open #170
2015-10-07 18:26:11 -07:00
Charles Hacskaylo
ac59df9595
[Frontend] Added type-icon to message dialogs
...
open #159
open #170
Percent complete added to progress-bar.html;
Refined overlay height;
2015-10-07 17:56:25 -07:00
Charles Hacskaylo
182eff977c
[Frontend] Dialog and overlay layout/positioning mods
...
open #159
open #170
Restructured overlay size and positioning approach
for better flexibility;
Getting new dialogs and the overlay to
play nicely in mobile context;
2015-10-07 16:36:55 -07:00
Henry
3af23b7bc5
Added test cases for notification service
2015-10-07 14:30:19 -07:00
