Victor Woeltjen
9435e75461
Merge remote-tracking branch 'slhale/open33' into open47b
...
Fix merge conflict in preparation to integrate nasa/openmctweb#47
Conflicts:
platform/commonUI/browse/res/templates/browse/object-header.html
2015-07-24 13:46:37 -07:00
larkin
12b8408bca
[Entanglement] Enable Entanglement
2015-07-22 15:32:20 -07:00
larkin
0fde10a818
[Continuous] Procfile uses localstorage
2015-07-22 11:00:18 -07:00
larkin
919ef2f991
[Persistence] Add localstorage persistence
2015-07-22 10:58:28 -07:00
Pete Richards
01a52b8af8
[Continuous] Deploy to heroku
2015-07-21 17:29:25 -07:00
Pete Richards
19b0b1aa66
[Continuous] Run via Procfile binds port
2015-07-21 17:27:17 -07:00
Pete Richards
808a79178b
[Continous] Build and publish documentation
2015-07-21 17:24:43 -07:00
Pete Richards
cb56bbe569
[Documentation] Fix JSDoc syntax errors
2015-07-21 14:30:00 -07:00
Pete Richards
e7e79f41a7
[Packaging] Create NPM Package
...
Create NPM package for OpenMCTWeb. Includes scripts
for hosting, running tests, and building documentation.
2015-07-21 14:29:07 -07:00
Victor Woeltjen
2e2e7ee876
Merge branch 'open1444b' into open-master
2015-07-17 11:05:25 -07:00
Victor Woeltjen
affd5f8d29
Merge branch 'open1426' into open-master
2015-07-17 10:56:09 -07:00
Victor Woeltjen
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
Victor Woeltjen
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
Victor Woeltjen
ea19bde1e7
[Telemetry] Provide empty series
...
Provide an empty series when a historical telemetry request
does not return anything for a given telemetry point.
Addresses WTD-1426.
2015-07-14 15:51:13 -07:00
shale
aa091a9d26
[Browse] Update tests
...
Removed reference to destroy() in the
context menu action test. #33 , #47 .
2015-07-14 13:53:00 -07:00
shale
1455e5d8b5
[Browse] Removed destroy functions
...
Removed destroy functions from menu arrow
controller and contetxt menu action as
suggested. #33 , #47 .
2015-07-14 13:25:25 -07:00
shale
d1b55bd43e
Merge branch 'master' of https://github.com/nasa/openmctweb into open33
2015-07-14 13:20:37 -07:00
Victor Woeltjen
a2fd9357d8
Merge pull request #48 from slhale/open46
...
[Edit] No more useless tooltips
2015-07-14 12:00:10 -07:00
Sarah Hale
9e6d84a1d5
[Edit] No more tooltips
...
Changed the attribute of 'title' on mct-container
to 'label'. This made the tooltips in Edit mode
dissapear. #46 .
2015-07-07 11:14:45 -07:00
Sarah Hale
b2a23ee968
[Browse] Tests completed
...
Completed the menu arrow controller test. All
tests are now completed. #33 .
2015-07-07 09:28:01 -07:00
Sarah Hale
e3a96eff8d
[Browse] Fixed clicking on menu
...
Previously any click on the context menu would
close the context menu rather than doing the
appropriate action. This is now fixed. The menu
only closes when a click happens not on the
menu. #33 .
2015-07-02 15:34:11 -07:00
Sarah Hale
2b67ae42bf
[Browse] Gesture and action tests
...
The menu gesture and the menu action tests
are completed. #33 .
2015-07-02 14:00:54 -07:00
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
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