2ca3c6ea93
[Layout] Use consistent whitespace
...
Use consistent whitespace in array literals, WTD-1424.
2015-08-04 10:00:44 -07:00
a4c704a5a2
[Layout] Ensure minimum frame size
...
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
2015-08-03 12:18:49 -07:00
deed95d8d1
[Plot] Don't allocate charts for empty plots
...
Don't allocate WebGL charts for empty plots, WTD-1444.
2015-07-17 09:13:20 -07:00
e400f211c4
Merge remote-tracking branch 'nasa/open1404' into open1427
...
Merge in preparation for review/integration, WTD-1427
Conflicts:
platform/commonUI/general/res/templates/containers/accordion.html
2015-07-15 13:45:37 -07:00
af2ca49b23
[Frontend] Added top right resize corner
...
WTD-1404
WTD-1376
2015-06-30 09:27:56 -07:00
5f80fcabc6
[Imagery] Clear background image
...
Clear background image on change, WTD-1407.
2015-06-29 18:49:36 -07:00
397a545482
[Plot] Expand range to give margin for points
...
Expand range to give some margin for points near the edge,
WTD-1406.
2015-06-29 18:08:03 -07:00
fa8095d5bc
Merge branch 'open-master' into open1317limits2
...
WTD-1405
Conflicts:
platform/features/layout/res/templates/elements/telemetry.html
2015-06-29 17:30:33 -07:00
0b4aa730f4
Merge pull request #30 from slhale/open26
...
[Events] Create tests for real time version
2015-06-29 15:42:33 -07:00
87f982b03e
Merge remote-tracking branch 'nasa/open-master' into open-master
2015-06-29 15:10:02 -07:00
29283e4fb5
Merge branch 'open1233' into open-master
2015-06-29 15:09:40 -07:00
cc64412d78
Merge remote-tracking branch 'origin/open1344' into open-1348
2015-06-29 14:58:27 -07:00
52cf918d08
Merge remote-tracking branch 'origin/open1317' into open-1346
2015-06-29 14:44:24 -07:00
2ab3932ce1
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-29 14:43:19 -07:00
f816b5018a
[Events] Style
...
Removed unused variables. #26 .
2015-06-29 13:15:56 -07:00
ebbac233aa
Merge branch 'open1373' into open-master
2015-06-29 13:15:43 -07:00
b91b197f5b
[Events] Comments
...
Removed todo comment. #26 .
2015-06-29 13:14:51 -07:00
14694c675b
[Events] All tests work
...
All of the tests for the RT Events are working. #26 .
2015-06-29 13:13:05 -07:00
56c3e72d32
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-29 13:10:46 -07:00
6616dedf63
[Events] Controller test correction
...
Test for the RT Event List controller now
actually works. #26 .
2015-06-29 13:09:15 -07:00
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
84345caf7d
[Style] Convert tabs to spaces
2015-06-29 11:51:28 -07:00
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
d120c8b139
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-29 09:10:23 -07:00
762f4d59fc
[Layout] Disallow folders
...
Disallow layouts in folders, WTD-1373.
2015-06-27 12:43:32 -07:00
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
d729cfcd3e
Merge remote-tracking branch 'origin/open1329' into open1343
2015-06-26 15:13:21 -07:00
f9782f1f45
Merge remote-tracking branch 'origin/open1273' into open-1340
2015-06-26 15:03:19 -07:00
41e75d7494
[Events] EventListController test
...
Test for the Event List controller now works. #26 .
2015-06-26 14:59:04 -07:00
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
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
f681d07643
Merge branch 'open-master' into open1233
2015-06-26 11:50:48 -07:00
750d3f473e
[Events] Starting tests
...
Starting to write tests for the real
time messages view. #26 .
2015-06-25 15:04:53 -07:00
bf8b0bae03
Merge branch 'master' of https://github.com/nasa/openmctweb into open18
2015-06-25 14:51:18 -07:00
42361aff25
Merge branch 'master' of https://github.com/nasa/openmctweb into open26
2015-06-25 14:50:32 -07:00
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
510597a51a
[Scrolling List] Show limits in RT scrolling list
...
Show limits in a real-time scrolling list view,
WTD-1317.
2015-06-25 12:56:22 -07:00
dddc2f976e
Merge branch 'open1223' into open1317limits
...
Conflicts:
platform/features/layout/res/templates/elements/telemetry.html
2015-06-25 12:48:02 -07:00
e17b6c5a92
Merge branch 'open-master' into open1317limits
2015-06-25 12:45:03 -07:00
bd5ba48270
Merge remote-tracking branch 'github/master' into open-master
2015-06-25 12:05:34 -07:00
3df12788f9
Merge remote-tracking branch 'nasa/open1341' into open1345
2015-06-25 11:53:13 -07:00
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
61fe77cc17
[Drag-Drop] Add test cases
...
Add test cases for avoiding redundant drop handling,
WTD-1233.
2015-06-25 11:35:18 -07:00
6f3d6ec12f
[Drag-Drop] Prevent redundant drops
...
Mark default as prevented and check for prevention of
default when handling mctDrop events (which allow
views to follow up on drop gestures by positioning
objects within themselves) avoiding redundant drops
into embedded views. WTD-1233.
2015-06-25 11:27:58 -07:00
a3f3f5bb27
Merge remote-tracking branch 'origin/open1170' into open-1318
2015-06-25 11:06:44 -07:00
482f355a08
[Fixed Controller] Stop tracking bounds
...
Stop tracking size of a fixed position view; no longer
necessary now that background grid is handled by CSS.
Change made in the context of WTD-1344.
2015-06-25 11:00:15 -07:00
9e55befb2a
[Fixed Controller] Add test cases
...
Add test cases for updating position of elements in
a fixed position view, WTD-1344.
2015-06-25 10:58:01 -07:00
4279c9e4bf
[Fixed Position] Remove obsolete cell styles
...
Remove obsolete cell style calculations; background
grid is handled by CSS now. Changed in the context of
WTD-1344.
2015-06-25 10:48:49 -07:00
791504584d
[Fixed Position] Update positions when grid size changes
...
Update positions of elements in a fixed position
view when grid size changes (e.g. when switching
from one domain object to another.) WTD-1344.
2015-06-25 10:45:50 -07:00
70f5a001ee
Merge remote-tracking branch 'nasa/open1341' into open1345
2015-06-25 10:06:18 -07:00
