Sarah Hale
2ab3932ce1
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-29 14:43:19 -07:00
larkin
52cf918d08
Merge remote-tracking branch 'origin/open1317' into open-1346
2015-06-29 14:44:24 -07:00
Sarah Hale
a8fdbdc98b
[Events] Changed bundles.json
...
Changed bundles.json so that rtevents are not
included by default. #26 .
2015-06-29 14:42:54 -07:00
Sarah Hale
f816b5018a
[Events] Style
...
Removed unused variables. #26 .
2015-06-29 13:15:56 -07:00
Victor Woeltjen
ebbac233aa
Merge branch 'open1373' into open-master
2015-06-29 13:15:43 -07:00
Sarah Hale
b91b197f5b
[Events] Comments
...
Removed todo comment. #26 .
2015-06-29 13:14:51 -07:00
Sarah Hale
14694c675b
[Events] All tests work
...
All of the tests for the RT Events are working. #26 .
2015-06-29 13:13:05 -07:00
Sarah Hale
56c3e72d32
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-29 13:10:46 -07:00
Sarah Hale
6616dedf63
[Events] Controller test correction
...
Test for the RT Event List controller now
actually works. #26 .
2015-06-29 13:09:15 -07:00
larkin
38ad8058e8
Merge remote-tracking branch 'origin/open1223' into open-1338
...
Resolve merge conflicts due to whitespace changes.
2015-06-29 12:08:16 -07:00
larkin
84345caf7d
[Style] Convert tabs to spaces
2015-06-29 11:51:28 -07:00
Sarah Hale
4c6b3c7a13
[Events] Policy test correction
...
The view policy test for real time Messages
actually now works. #26 .
2015-06-29 09:56:59 -07:00
Sarah Hale
d120c8b139
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-29 09:10:23 -07:00
Victor Woeltjen
762f4d59fc
[Layout] Disallow folders
...
Disallow layouts in folders, WTD-1373.
2015-06-27 12:43:32 -07:00
Victor Woeltjen
12b34b5d58
Merge pull request #27 from shivamndave/open25
...
Addresses #25
2015-06-27 12:26:15 -07:00
Victor Woeltjen
a752a21bf8
Merge branch 'open-master' into open1388
2015-06-27 12:17:45 -07:00
larkin
e582092844
[Comments] Add missing space
2015-06-26 15:23:22 -07:00
Sarah Hale
4e03d7b29b
[Events] RT Messages policy test
...
The view policy test for real time Messages
now works. #26 .
2015-06-26 15:17:17 -07:00
larkin
d729cfcd3e
Merge remote-tracking branch 'origin/open1329' into open1343
2015-06-26 15:13:21 -07:00
larkin
f9782f1f45
Merge remote-tracking branch 'origin/open1273' into open-1340
2015-06-26 15:03:19 -07:00
Sarah Hale
41e75d7494
[Events] EventListController test
...
Test for the Event List controller now works. #26 .
2015-06-26 14:59:04 -07:00
Sarah Hale
95f9d783d3
[Events] Column tests working
...
Tests for the domain and range columns now work
for the real time event list. #26 .
2015-06-26 14:23:41 -07:00
Victor Woeltjen
f8f2019dad
Merge remote-tracking branch 'nasa/open1322' into open1388
2015-06-26 13:25:12 -07:00
Shivam Dave
d42abfef98
[Addressability] Comments
...
Added comments to the slight change in Browse
Controller and BrowseObjectController. WTD 25.
2015-06-26 12:58:16 -07:00
Shivam Dave
bd57064ca3
Merge remote-tracking branch 'upstream/master' into open25
2015-06-26 12:52:30 -07:00
Shivam Dave
2e716bdbe3
[Addressability} Unit Test
...
Completed unit tests to accomodate
for url path check prior to setting
the current . WTD 23.
2015-06-26 12:51:25 -07:00
Victor Woeltjen
2161707954
Merge pull request #24 from shivamndave/open23
...
Addresses #23
2015-06-26 12:41:43 -07:00
Shivam Dave
3de4473159
[Addressability] Re-Edit Bug
...
Fixed re-edit but by implementing
what Victor said in issue #25 . Adding
check on /browse/ part of url and then
changing route works WTD 23.
2015-06-26 11:52:03 -07:00
Shivam Dave
cd70ed6f94
Merge remote-tracking branch 'upstream/master' into open23
2015-06-26 11:44:11 -07:00
Victor Woeltjen
c655b16f9e
Merge pull request #22 from slhale/open18
...
Open18
2015-06-26 11:44:04 -07:00
Charles Hacskaylo
fce327a398
[Dev/Frontend] New symbol added to symbols font
...
WTD-1322
Platform-only commit;
(cherry picked from warp1322 commit 7254013)
2015-06-25 15:17:08 -07:00
Sarah Hale
750d3f473e
[Events] Starting tests
...
Starting to write tests for the real
time messages view. #26 .
2015-06-25 15:04:53 -07:00
Shivam Dave
2a347f1596
[Windowing] urlService
...
Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
2015-06-25 14:53:52 -07:00
Sarah Hale
bf8b0bae03
Merge branch 'master' of https://github.com/nasa/openmctweb into open18
2015-06-25 14:51:18 -07:00
Sarah Hale
42361aff25
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-25 14:50:32 -07:00
Shivam Dave
193df4fde3
[Windowing] Excess function
...
Removed extra function from
urlService. WTD 23.
2015-06-25 14:37:01 -07:00
Sarah Hale
c98a381a42
[Events] Created RT Messages
...
Created a real-time version of the Messages view called
RT Messages.
Additionally, fixed the MessagesViewPolicy test. #18 .
2015-06-25 14:36:14 -07:00
Shivam Dave
3d0e0af7f2
[Windowing] Remove variable
...
Excess variable used for CancelAction's
ReturnToBrowse. WTD 23.
2015-06-25 14:28:38 -07:00
Shivam Dave
5ba0f9d7a1
Merge remote-tracking branch 'upstream/master' into open23
2015-06-25 14:08:46 -07:00
Shivam Dave
3a371483ab
[Windowing] urlService
...
Added the urlService to the unit
tests for the cancel and save buttons
also removed unused services. WTD 23.
2015-06-25 14:07:02 -07:00
Shivam Dave
6d28add055
[Windowing] urlService
...
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
2015-06-25 13:16:15 -07:00
larkin
270cb48db0
Merge remote-tracking branch 'origin/open1256' into open-1336
2015-06-25 12:44:23 -07:00
larkin
ffc2d98914
Merge remote-tracking branch 'origin/open1241' into open-1335
2015-06-25 12:35:19 -07:00
Victor Woeltjen
bd5ba48270
Merge remote-tracking branch 'github/master' into open-master
2015-06-25 12:05:34 -07:00
Victor Woeltjen
3df12788f9
Merge remote-tracking branch 'nasa/open1341' into open1345
2015-06-25 11:53:13 -07:00
Charles Hacskaylo
685e384858
[Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection
...
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
2015-06-25 11:46:15 -07:00
larkin
abaca86290
Merge remote-tracking branch 'origin/open1291' into open-1330
2015-06-25 11:30:33 -07:00
larkin
6c3aeb2784
[Comments] Comment matches exported name
2015-06-25 11:19:01 -07:00
larkin
a3f3f5bb27
Merge remote-tracking branch 'origin/open1170' into open-1318
2015-06-25 11:06:44 -07:00
Shivam Dave
fd6459394a
[Windowing] urlService
...
Changed folder location of
services and therefore urlService
to general/src/ instead of being in
browse/src/. WTD 23.
2015-06-25 10:38:39 -07:00
