Victor Woeltjen
|
ef77ca91e7
|
Merge branch 'open1363' into open-master
|
2015-06-29 16:27:10 -07:00 |
|
Victor Woeltjen
|
0b4aa730f4
|
Merge pull request #30 from slhale/open26
[Events] Create tests for real time version
|
2015-06-29 15:42:33 -07:00 |
|
Victor Woeltjen
|
87f982b03e
|
Merge remote-tracking branch 'nasa/open-master' into open-master
|
2015-06-29 15:10:02 -07:00 |
|
Victor Woeltjen
|
29283e4fb5
|
Merge branch 'open1233' into open-master
|
2015-06-29 15:09:40 -07:00 |
|
larkin
|
cc64412d78
|
Merge remote-tracking branch 'origin/open1344' into open-1348
|
2015-06-29 14:58:27 -07:00 |
|
larkin
|
52cf918d08
|
Merge remote-tracking branch 'origin/open1317' into open-1346
|
2015-06-29 14:44:24 -07:00 |
|
Sarah Hale
|
2ab3932ce1
|
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
|
2015-06-29 14:43:19 -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 |
|
Victor Woeltjen
|
66f8ee7194
|
[Common UI] Fix min/max bounds of mct-split-pane
WTD-1363. Use correct dimension (width or height)
when determining maximum splitter position.
|
2015-06-29 11:54:40 -07:00 |
|
larkin
|
84345caf7d
|
[Style] Convert tabs to spaces
|
2015-06-29 11:51:28 -07:00 |
|
Victor Woeltjen
|
b524dc451f
|
[Common UI] Remove unused function
Remove obsolete function from mct-split-pane, WTD-1363
|
2015-06-29 11:27:48 -07:00 |
|
Charles Hacskaylo
|
c262fe814c
|
[Frontend] Added pointer-events: none
WTD-1363?
|
2015-06-29 11:08: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 |
|
Victor Woeltjen
|
8c5b497377
|
[Common UI] Tweak mct-split-pane
Tweak mct-split-pane for use in timeline; particularly,
improve synchronization between views. WTD-1363.
|
2015-06-27 11:59:18 -07:00 |
|
Victor Woeltjen
|
a0d5a1a196
|
[Common UI] Get split pane width from elements
WTD-1363.
|
2015-06-27 10:46:42 -07:00 |
|
Victor Woeltjen
|
c79b018c84
|
[Common UI] Remove obsolete checks
Remove obsolete minimum/maximum checks, WTD-1363.
|
2015-06-27 10:40:05 -07:00 |
|
Victor Woeltjen
|
a1eb15db77
|
[Common UI] Change min/max width handling in splitter
In split pane, obey the min-width and max-width style properties
of first element within the pane. WTD-1363.
|
2015-06-27 10:35:49 -07:00 |
|
Victor Woeltjen
|
72c812cdaa
|
[Common UI] Enforce split pane min/max
WTD-1363.
|
2015-06-26 16:30:39 -07:00 |
|
Victor Woeltjen
|
39372ea9ca
|
[Common UI] Use mct-split-pane in Browse
WTD-1363.
|
2015-06-26 16:21:20 -07:00 |
|
Victor Woeltjen
|
0ee76421e0
|
[Common UI] Add mct-splitter
WTD-1363.
|
2015-06-26 15:59:16 -07:00 |
|
Victor Woeltjen
|
243c832c25
|
[Common UI] Add mct-split-pane
Add mct-split-pane directive, to simplify adding splitters.
WTD-1363.
|
2015-06-26 15:32:37 -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 |
|
Victor Woeltjen
|
286ac5628b
|
[Drag-Drop] Check for default prevented correctly
Check for defaultPrevented property instead of trying
to check nonexistent method isDefaultPrevented(); for
WTD-1354 in the context of WTD-1233.
|
2015-06-26 11:53:45 -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 |
|
Victor Woeltjen
|
f681d07643
|
Merge branch 'open-master' into open1233
|
2015-06-26 11:50:48 -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 |
|