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
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
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
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
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
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
Shivam Dave
93ba4ce715
[Windowing] Unit Test
...
Added Unit test adjustments for
the change in urlService (addition
of a separate function for getting
the url for a location, used by browse
controller. WTD 23.
2015-06-25 10:10:13 -07:00
Victor Woeltjen
70f5a001ee
Merge remote-tracking branch 'nasa/open1341' into open1345
2015-06-25 10:06:18 -07:00
Sarah Hale
c6405c50df
Merge branch 'master' of https://github.com/nasa/openmctweb into open18
2015-06-25 10:00:21 -07:00
Sarah Hale
1961ba20c0
Fixing merge
...
Re-added the tests.
2015-06-25 09:59:52 -07:00
Victor Woeltjen
d3ff49b90b
Merge remote-tracking branch 'nasa/open1319' into open1320
2015-06-25 09:59:23 -07:00
Sarah Hale
288692f57c
Fixing merge
...
Re-added the event list controller.
2015-06-25 09:57:43 -07:00
Sarah Hale
a993ee6126
Fixing conflicts
2015-06-25 09:48:09 -07:00
Shivam Dave
ca6f44f7b6
[Windowing] URL Fix
...
The URL malformation was caused by the same
function returning the view and index path for
both the newtab window and the browse controller
window. As a result, the BrowseController now only
uses a path that excludes the view and index paths,
like before the UrlService was added. Another,
separate function uses this url for the location
and includes the view and index paths for new
tabs, in order to maintain the current view. WTD 23.
2015-06-25 09:47:58 -07:00
Sarah Hale
163b210fbb
[Events] Real-time telemetry version
...
Creating an additional event list which can handle real
time data, not historical data. #18 .
2015-06-25 09:39:29 -07:00
Sarah Hale
f6298c162c
[Events] Real-time telemetry version
...
Creating an additional event list which can handle real
time data, not historical data. #18 .
2015-06-25 09:27:24 -07:00
Victor Woeltjen
25d3a4d8c2
Merge remote-tracking branch 'nasa/open1323' into open1324
2015-06-25 09:25:42 -07:00
Victor Woeltjen
9ac6abe78f
Merge remote-tracking branch 'nasa/open980' into open1342
2015-06-25 09:07:27 -07:00
Charles Hacskaylo
9f137513d9
Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341
2015-06-24 19:25:27 -07:00
Charles Hacskaylo
19748ba17c
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
Re-rendered css file;
2015-06-24 18:56:38 -07:00
Charles Hacskaylo
52a7bd1033
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
2015-06-24 18:55:15 -07:00
Charles Hacskaylo
e357df2fe5
[Dev/Frontend] Cherry-picking platform changes from warp1341
...
WTD-1341
2015-06-24 18:52:52 -07:00
Sarah Hale
d2fe71d82b
[Events] Fixed tabs
...
Removed tabs from EventListController and replaced
with spaces. #18 .
2015-06-24 17:08:03 -07:00
