Commit Graph

413 Commits

Author SHA1 Message Date
2e7f23a766 [Search] Results list displayed
After searching, a results list is displayed.
The list is composed of grid-items.
2015-07-10 14:48:15 -07:00
6d1cb85a07 [Search] Not case sensitive
Search is no longer case sensitive.
2015-07-10 14:20:04 -07:00
b5756d2b99 [Search] Items list updating
The search results now updates the items
list when called to make sure that it gets
all of the recently added items.
2015-07-10 12:53:12 -07:00
efba0f0236 [Search] Search results by name
doSearch() does search by getting each
object's name. Still buggy.
2015-07-10 12:44:07 -07:00
4e39c4f900 [Search] Finds root folder
The search controller will now search from
the root folder (My Items) even when the view
is initiated from a folder inside of the tree.
2015-07-10 10:32:58 -07:00
e339ee1dd1 [Search] Asynchronous recursion
The list creation now sucessfully goes 1 level
deep into the tree for objects. Still needs
more work to delve into subfolders.
2015-07-09 14:40:52 -07:00
94b306e129 [Search] Listify filetree
SearchController now attempts to convert the filetree
into a list format. Still needs to be modified to be
asynchronous.
2015-07-09 11:16:55 -07:00
32eaf3893a [Search] Display search items
The search view now very rudimentarily displays
some 'search-item's.
2015-07-08 16:20:12 -07:00
845b9a2faa [Search] Fixed comments 2015-07-08 15:34:09 -07:00
5870248617 [Search] Search framework
Created a basic framework for a search
view. It consists of a search bar and
a results list.
2015-07-08 15:32:20 -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