ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-24 23:36:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,493 Commits 989 Branches 212 Tags 191 MiB
28a2a5b92a
Commit Graph

1493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Hale
db920a7b5c [Browse] Starting tests 
Created new test files for the additions. #33.
 2015-07-02 12:50:48 -07:00
Sarah Hale
a582375e61 [Browse] Style 
All modified code follows style guides. #33.
 2015-07-02 12:38:32 -07:00
Sarah Hale
2524c75505 [Browse] Menu arrow works 
The menu arrow now displays a context menu
when clicked. #33.
 2015-07-02 12:36:35 -07:00
Sarah Hale
c08f972ab4 [Browse] Menu action called correctly 
Both the menu gesture and the menu arrow now
correctly call the menu action. #33.
 2015-07-02 11:57:03 -07:00
Sarah Hale
809a6e457c Merge branch 'master' of https://github.com/nasa/openmctweb into open33 2015-07-02 11:33:07 -07:00
Sarah Hale
30d8c1647c [Browse] Right click works 
Right clicking for a context menu now
works again. #33.
 2015-07-02 11:30:45 -07:00
Sarah Hale
861b4781fe Merge branch 'open33' of https://github.com/slhale/openmctweb into open33 2015-07-02 10:59:04 -07:00
Sarah Hale
4e6301edb4 [Browse] Fixed multiple clicks 
Fixed having multiple calls to ContextMenuGesture. #33.
 2015-07-02 10:58:19 -07:00
Sarah Hale
b965c48ff2 [Browse] Fixed multiple clicks 
Fixed having multiple calls to ContextMenuGesture. #33.
 2015-07-02 10:54:43 -07:00
Sarah Hale
3edd967e27 [Browse] Changed action key 
Changed the key for the context menu action from
'contextMenu' to 'menu'. #33.
 2015-07-02 10:30:45 -07:00
Sarah Hale
bb80b2175c [Browse] Gesture calling action 
The context menu gesture (attempts) to call the
context menu action. The menu arrow still fails
to call. #33.
 2015-07-02 09:36:19 -07:00
Sarah Hale
e9989ae00d [Browse] Some progress 
Still doesn't work.
 2015-07-01 14:32:49 -07:00
Dave
d343d38037 Merge remote-tracking branch 'upstream/master' 2015-07-01 13:30:08 -07:00
Victor Woeltjen
4c77dd6a69 Merge pull request #42 from nasa/reload-bundles-on-pageload 
[Development] Reload bundle file with each request
 2015-07-01 13:19:21 -07:00
Victor Woeltjen
347da6c5c2 [Build] Bump version number 
Bump version number and restore snapshot status. WTD-823
 2015-07-01 13:13:14 -07:00
Victor Woeltjen
daf780a2b4 [Build] Bump version number 
Bump version number to close out Thebe, WTD-823.
 2015-07-01 12:54:36 -07:00
Charles Hacskaylo
fd98bdae4c [Frontend] Added $colorIconLink in _constants 
WTD-1404
 2015-07-01 10:07:47 -07:00
Charles Hacskaylo
793d39b969 [Frontend] CSS and font updates ONLY from open1423 
WTD-1404
CSS has error at this point due to missing $colorIconLink in _constants.scss;
(cherry picked from commit 2a032bf)
 2015-07-01 10:04:45 -07:00
Sarah Hale
9ad1c25d53 [Browse] Splitting up Menu Gesture 
Splitting up the context menu gesture's functionality into
separate context menu gesture and context menu actions.
The gesture watches for right-clicks, while the action
displays the menu. #33.
 2015-06-30 16:17:00 -07:00
Charles Hacskaylo
6a8cc6d9da [Frontend] Fixed line-height in .btn 
WTD-1404
 2015-06-30 16:07:55 -07:00
Charles Hacskaylo
9f38914faa [Frontend] Fixed styles that were breaking Create menu 
WTD-1404
 2015-06-30 16:01:53 -07:00
Charles Hacskaylo
f03a9bcc08 [Frontend] Merge mods for autoflow col width button 
WTD-1404
WTD-1411
 2015-06-30 15:51:22 -07:00
Charles Hacskaylo
2054dd8497 [Frontend] Removed pulse effect from pause-play button 
WTD-1404
WTD-1412
(cherry picked from commit 1b9521a)
 2015-06-30 15:47:15 -07:00
larkin
5c3ccb9ee0 [Development] Reload bundle file with each request 
Reload the bundle file from disk when requested, re-applying any
includes or excludes that were specified on the command line.

Allows a developer to make changes to bundles.json without having to
restart the server for them to take effect.
 2015-06-30 15:24:52 -07:00
Sarah Hale
4840345524 [Browse] Stopped multiple broadcasts 
Stopped the menu arrow from making multiple
broadcasts of contextmenu. #33.
 2015-06-30 15:22:10 -07:00
Charles Hacskaylo
9b26a896d3 [Frontend] Fixes for dropdown menu click issues 
WTD-1404
WTD-1379
Context menu and view switcher menu fixed;
Removed <a> with <li> and put ng-click on <li>
 2015-06-30 14:12:24 -07:00
Charles Hacskaylo
06cf199872 [Frontend] Styling for context-available arrow 
WTD-1404
WTD-1422
 2015-06-30 13:35:21 -07:00
Sarah Hale
917d98bd3e [Browse] Created Menu Arrow 
Created a menu-arrow respresentation. #33.
 2015-06-30 13:33:40 -07:00
Sarah Hale
7b4ef142f5 [Browse] Fixed tree nodes 
Realized that this refers to a previously hidden arrow
at the main title at the top of the page. Reverted the
changes done to the tree nodes. #33.
 2015-06-30 13:32:25 -07:00
Charles Hacskaylo
344aa8acc8 [Frontend] Adding initialization CSS defs for new mct-split-pane 
WTD-1404
WTD-1399
 2015-06-30 13:26:15 -07:00
Charles Hacskaylo
9d25e3081f [Frontend] Edit mode refactored to use new mct-split-pane 
WTD-1404
WTD-1399
 2015-06-30 13:23:56 -07:00
Shivam Dave
73241efdc8 [Fix] Fixes bundle 
Changes the persistance to the example
version.
 2015-06-30 13:20:46 -07:00
Sarah Hale
57eefd7316 [Browse] Context menu gesture called 
The context menu gesture is called when the user clicks
the arrow next to the title of a domain object. This does
not yet display the context menu. It also does not yet
distinguish between edit and browse mode. #33.
 2015-06-30 11:18:56 -07:00
Charles Hacskaylo
c24a459f66 [Frontend] Plot legend minor cleanups 
WTD-1404
WTD-1386
 2015-06-30 10:38:10 -07:00
Charles Hacskaylo
abef44f37d [Frontend] Moved browse mode splitter settings to CSS file 
WTD-1404
WTD-1399
 2015-06-30 10:37:19 -07:00
Charles Hacskaylo
af2ca49b23 [Frontend] Added top right resize corner 
WTD-1404
WTD-1376
 2015-06-30 09:27:56 -07:00
Charles Hacskaylo
8ee28c3918 [Frontend] Removed z-index on hover 
WTD-1404
WTD-1383
 2015-06-30 09:00:06 -07:00
Charles Hacskaylo
29b91193fb [Frontend] New ? icon in symbols font 
WTD-1404
WTD-1402
 2015-06-30 08:50:06 -07:00
Victor Woeltjen
5f80fcabc6 [Imagery] Clear background image 
Clear background image on change, WTD-1407.
 2015-06-29 18:49:36 -07:00
Victor Woeltjen
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
Victor Woeltjen
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
Victor Woeltjen
1c4cca3f91 Merge branch 'open1392b' into open-master 2015-06-29 16:30:48 -07:00
Victor Woeltjen
ef77ca91e7 Merge branch 'open1363' into open-master 2015-06-29 16:27:10 -07:00
Victor Woeltjen
970698c77b Merge remote-tracking branch 'nasa/open1392' into open1392b 
Conflicts:
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
 2015-06-29 16:09:01 -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