ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 06:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,450 Commits 989 Branches 212 Tags 191 MiB
9a06325533
Commit Graph

4450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry
9a06325533 Merge branch 'master' into open933 2016-09-12 14:39:24 -07:00
Andrew Henry
4c6ca58c95 Merge pull request #1157 from TypicalFooBar/843 
[Context Menu] New Tab button available in edit mode. #843
 2016-09-11 21:21:49 -07:00
Henry
e639e056ba [Time Conductor] Fixing bugs found in smoke testing. Fixes #933 2016-09-09 18:51:47 -07:00
Victor Woeltjen
32e7f57a7c [Build] Accept future phantomjs versions 2016-09-08 13:48:53 -07:00
Victor Woeltjen
f7dfccb096 [Build] Depend on phantomjs-prebuilt 2.1.11 
...due to issues installing 2.1.12 on Linux. Fixes #1176.
 2016-09-08 13:41:51 -07:00
Henry
fbab890081 [Time Conductor] Switched conductor to mct-include rather than mct-representation to avoid warnings 2016-09-07 14:29:21 -07:00
Victor Woeltjen
5bde1de61b Merge pull request #1167 from nasa/open1166 
Review and integrate generalized control-bar styling for views
 2016-09-07 13:37:10 -07:00
Andrew Henry
06d229ea99 Merge pull request #1133 from charbelrami/markup 
[Frontend] Tweak markup
 2016-09-07 13:16:04 -07:00
Henry
d37dd52ee1 Merge branch 'master' into open933 2016-09-06 16:43:17 -07:00
Henry
7af5875dd5 [Time Conductor] #933 Fixed code style errors 2016-09-06 10:05:10 -07:00
Andrew Henry
c6eaa3d528 [Time Conductor] Adding tests and fixing failing ones. #933 2016-09-05 19:32:19 -07:00
Andrew Henry
58391de007 Merge pull request #1150 from aterribili/patch-1 
Add .swp to git ignore
 2016-09-05 09:58:28 -07:00
Andrew Henry
7b84febfde Merge pull request #1162 from ZachMoreno/patch-1 
[Documentation] Updated from OpenMCTWeb to OpenMCT
 2016-09-02 09:38:54 +01:00
Charles Hacskaylo
39dcb937d5 [Frontend] CSS and markup tweaks 
Fixes #1166
New control-bar height constant
Removed font-size definition in .l-view-section
 2016-09-01 20:09:38 -07:00
Charles Hacskaylo
55603b927f [Frontend] Generalized markup and CSS for control-bar 
Fixes #1166
New markup and CSS
MIgrated existing tabular views to use
new styles
 2016-09-01 19:37:36 -07:00
Victor Woeltjen
e35666bcc6 Merge pull request #1165 from nasa/subobjects1161 
Review and integrate initial styling for selectable sub-objects
 2016-09-01 12:23:37 -07:00
Charles Hacskaylo
725f8202ed Merge remote-tracking branch 'origin/master' into subobjects1161 2016-09-01 10:56:17 -07:00
Charles Hacskaylo
ee917b0e1d [Frontend] Initial styling for selectable styling 
Fixes #1161
New .s-selectable, .s-hover, .s-selected and .s-moveable classes
New supporting color constants
Markup in layouts, fixed position/panels updated
Removed old commented code
 2016-09-01 10:55:07 -07:00
Zachariah Moreno
76527b310d [Documentation] Revising to uphold standard naming convention of Open MCT 
🐙

# Author Checklist:

Changes appear to address issue? Y
Appropriate unit tests included? N/A - No code changes
Code style and in-line documentation are appropriate? N/A
Commit messages meet standards? Y
 2016-09-01 09:23:35 -07:00
Andrew Henry
73b4385578 Merge pull request #1160 from nasa/ksp1146 
[README] Add link to KSP plugin
 2016-09-01 15:59:16 +01:00
Zachariah Moreno
bb3af4eff7 🐙 Updated from OpenMCTWeb to OpenMCT 
minor change & please let me know if I can help with anything else
 2016-08-31 15:56:57 -07:00
Victor Woeltjen
68adea7b5a Merge pull request #1159 from raoulsullivan/squashed_proxy_parameters 
[proxyUrl] pass URL parameters to proxied URL
 2016-08-31 09:31:01 -07:00
Victor Woeltjen
40abd1ce6c Merge pull request #1153 from dhrubomoy/dhrubomoy-patch-1 
[Documentation] Fixed typos, grammars
 2016-08-30 15:19:26 -07:00
Victor Woeltjen
3a7e98ab84 Merge pull request #1155 from nasa/forms1118 
Review and integrate improved dialog layout
 2016-08-30 14:30:46 -07:00
Victor Woeltjen
6364bbc6b3 [Build] Restore SNAPSHOT status 
...to begin sprint Pratchett,
https://github.com/nasa/openmct/milestones/Pratchett
 2016-08-30 14:10:48 -07:00
Victor Woeltjen
fc7d2672db [Build] Remove SNAPSHOT status 
...to close sprint Orwell,
https://github.com/nasa/openmct/milestones/Orwell
 2016-08-30 14:01:28 -07:00
Victor Woeltjen
3a25704f41 [README] Add link to KSP plugin 
Add link to David Hudson's Kerbal Space Program plugin from #1146,
along with other information about Examples relevant in that context.

Resolves #1064
 2016-08-30 13:55:41 -07:00
raoulsullivan
98486f718b [proxyUrl] pass URL parameters to proxied URL 
Addresses issue #1158

Passes query parameters on to proxyUrl proxied URL

remove the url parameter before passing

Naming convention for variables

Re-order code to reuse variable
 2016-08-30 19:55:18 +01:00
Derek Webb
a7f830177a [Context Menu] New Tab button available in edit mode. #843 2016-08-29 18:33:48 -04:00
Charles Hacskaylo
2c2d9c1bfe [Frontend] Updated test specs 
Fixes #1118
 2016-08-29 14:26:27 -07:00
Charles Hacskaylo
cc6b9d4099 [Frontend] Revised mobile styles for form layout 
Fixes #1118
 2016-08-29 14:14:52 -07:00
Charles Hacskaylo
1a284ac9dc [Frontend] Proper classes added to text input configs 
Fixes #1108
 2016-08-29 14:14:51 -07:00
Charles Hacskaylo
b48ca99119 [Frontend] Sanding on larger locator control 
Fixes #1118
 2016-08-29 14:14:51 -07:00
Charles Hacskaylo
2e8d021a6a [Frontend] Improve layout of "locator" 
Fixes #1118
Locator in Save In, Move, etc. dialog now
expands vertically to use as much vertical as
possible;
 2016-08-29 14:14:51 -07:00
Victor Woeltjen
5409e3d203 Merge pull request #1147 from TypicalFooBar/101 
[CommonUI] Info Bubbles allow user to copy text
 2016-08-29 13:19:24 -07:00
Dhrubomoy Das Gupta
c3d158584b [Documentation] Update ../process/testing/plan.md 
Clicking `Long-duration testing` was showing the right doc but wrong section due to typo in `procedures.md#long-duration-testng`. Fixed it, so now clicking `Long-duration testing` will take us to the right section.
 2016-08-29 12:23:21 -04:00
Dhrubomoy Das Gupta
6b8a2a7770 [Documentation] Update /docs/src/guide/index.md 
work flow -> workflow (one word)
domaiwn -> domain (typo)
pop up -> popup (one word)
 2016-08-29 12:12:59 -04:00
Dhrubomoy Das Gupta
cbb7ada63c [Documentation] Update APIRedesign_PeteRichards.md 
imperitive -> imperative
set up -> setup
compiliation -> compilation
 2016-08-29 12:01:11 -04:00
Dhrubomoy Das Gupta
fe00d3e501 [Documentation] Updated APIRedesign.md 
Contributer -> Contributor
effects -> affects (Effect is usually used as a noun. When an "s" is added, "effects" means personal belongings)
 2016-08-29 11:54:14 -04:00
Dhrubomoy Das Gupta
b8eeeaeede [Documentation] Updated /architecture/platform.md 
Changing following two words makes them a bit easier to read:
look­and­feel ->  look-­and-­feel
userfacing -> user-facing
 2016-08-29 11:41:38 -04:00
Dhrubomoy Das Gupta
dd4e20cfb5 [Documentation] Updated /architecture/index.md 
maintaing -> maintaining
 2016-08-29 11:30:36 -04:00
Andrew Henry
597d66782e Merge pull request #1135 from vankessel/open1117 
[Search] 'All' checked upon no filters. Fixes #1117
 2016-08-29 14:17:07 +01:00
Andrew Henry
01031de074 Merge pull request #1148 from dhrubomoy/patch-1 
[Documentation] Fixed typo
 2016-08-29 13:36:46 +01:00
Andrew Henry
1cc29be3d6 Merge pull request #1149 from BogdanAlexandru/tutorial-diff-fix 
[Documentation] Fix added lines in tutorial
 2016-08-29 13:29:04 +01:00
Kevin Van Kessel
6cbdaa442b [Search] Repurposed checkAll test. #1117 
Changed test to ensure checkAll and it's appropriate filter string are 
set whenever checkAll is changed.
Removed redundant line checking for a filter string of 'NONE' as this 
is no longer a possibility.
 2016-08-28 12:01:42 -07:00
Andrew Henry
ab9d92a01a Merge pull request #1145 from nasa/remove-protractor-348 
[Testing] Remove protractor hierarchy
 2016-08-28 17:50:38 +01:00
Andrew Henry
8aa3000fb1 Merge pull request #1134 from nasa/dep-vuln-1130 
[Build] Check dependencies for vulnerabilities
 2016-08-28 17:45:25 +01:00
Victor Woeltjen
64d8b5fcd1 [Build] Incluse NSP in verify tasks 2016-08-28 17:37:22 +01:00
Victor Woeltjen
05e88e5dcf [Build] Add NSP task 
...to check dependencies for known vulnerabilities.
 2016-08-28 17:37:21 +01:00
Victor Woeltjen
5a819a96de [Build] Add gulp-nsp dependency 
...to begin integrating checks for vulnerabilities in dependencies,
fixes #1130.
 2016-08-28 17:37:21 +01:00