ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 06:03:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,055 Commits 989 Branches 212 Tags 191 MiB
ed519d89d7
Commit Graph

4055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
ed519d89d7 [Timeline] Log errors during CSV export 
#751
 2016-05-25 10:35:29 -07:00
Victor Woeltjen
0e4f6185b8 Merge branch 'master' into csv-export-update-751 
Conflicts:
	platform/features/timeline/bundle.js
 2016-05-25 10:29:56 -07:00
Pete Richards
05b4f5401e Merge remote-tracking branch 'origin/open890' 2016-05-25 10:19:11 -07:00
Pete Richards
2330f1d135 Merge remote-tracking branch 'origin/open907' 2016-05-25 10:06:55 -07:00
Pete Richards
ff92d3acab Merge remote-tracking branch 'origin/open889' into open922 2016-05-25 09:55:09 -07:00
Henry
6c1412784b [Example] REMS heirarchy appear as links 2016-05-20 17:11:07 -07:00
Victor Woeltjen
5b6ea600ba Merge pull request #930 from nasa/open633 
[New Edit Mode] #633 Remove Editing workflow concerns from FixedController, LayoutController
 2016-05-20 16:10:46 -07:00
Henry
fd9d766913 Defer resolution of scope in DropGesture 2016-05-20 15:15:18 -07:00
Henry
b6502e9ea1 [New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController 2016-05-20 14:12:24 -07:00
Andrew Henry
25a2321578 Merge pull request #927 from nasa/jscs-rebase-142 
[Code Style] Enforce code style
 2016-05-20 14:03:27 -07:00
Andrew Henry
6fb36374f6 Merge pull request #942 from nasa/persist-graph-toggles-908 
[Timeline] Persist resource graph toggles
 2016-05-20 13:27:41 -07:00
Victor Woeltjen
9861e63589 [Code Style] Run fixstyle on merged changes 2016-05-20 13:09:16 -07:00
Victor Woeltjen
bce5643994 Merge branch 'master' into jscs-rebase-142 
Conflicts:
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/representation/src/MCTRepresentation.js
 2016-05-20 13:07:58 -07:00
Victor Woeltjen
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
Victor Woeltjen
e468080373 [Code Style] Disallow outer shadowing 
031a46aa8e (commitcomment-17561082)
 2016-05-20 11:38:36 -07:00
Victor Woeltjen
c98c36753c Merge pull request #944 from nasa/open943 
[Build] Ignore gh-pages from circle-ci
 2016-05-20 10:54:01 -07:00
Victor Woeltjen
1419ff86e8 Merge pull request #946 from nasa/open636 
[New Edit Mode] #636 Removed edit concerns from DropGesture
 2016-05-20 10:52:11 -07:00
Henry
601bc03ba2 [New Edit Mode] #636 Modified EditAndCompose action to rely on a slightly refactored EditActionPolicy to remove folder specific logic 2016-05-20 10:42:17 -07:00
Victor Woeltjen
ea454d65bb Merge pull request #945 from nasa/open634 
[New Edit Mode] #634 Removed edit concerns from MctRepresentation
 2016-05-20 10:06:50 -07:00
Henry
776586ae25 [New Edit Mode] #634 Removed edit concerns from MctRepresentation 2016-05-19 17:09:56 -07:00
Henry
78bf804e02 [Build] Ignore gh-pages from circle-ci 2016-05-19 15:31:16 -07:00
Victor Woeltjen
2a4004fd5b [Timeline] Test mct-representation ordering 
Verify that a configuration object has been added to scope before
changing templates. #908
 2016-05-19 15:09:57 -07:00
Victor Woeltjen
b5229d7786 [Timeline] Commit changes on toggle 
#908
 2016-05-19 15:06:06 -07:00
Victor Woeltjen
20ecf168f2 [Timeline] Change ordering in mct-representation 
...such that the configuration property is available in scope
when a view is first instantiated. #908
 2016-05-19 15:00:12 -07:00
Victor Woeltjen
dc348f33c5 Merge pull request #940 from nasa/openmct-website 
[Website] Fixed failed circle.yml command
 2016-05-19 14:18:55 -07:00
Henry
b7cfaf6b63 Fixed failed circle.yml command 2016-05-19 13:52:58 -07:00
Victor Woeltjen
34d5bc4f28 Merge pull request #939 from nasa/openmct-website 
[Website] #901 Automate build process
 2016-05-19 13:24:22 -07:00
Henry
e4b192001f Changed circle.yml to go back to command-based deployment to heroku as cannot use 'heroku' deployment support and commands in the same deployment descriptor 2016-05-19 12:14:42 -07:00
Henry
516b8c9e38 [Website] #901 Automate build process - Updated build SHA 2016-05-19 11:39:08 -07:00
Victor Woeltjen
f9631ff4c5 [Code Style] Fix style missed by gulp fixstyle 
...and remove an unnecessary comment, too.
 2016-05-19 11:29:41 -07:00
Victor Woeltjen
fa77139077 [Code Style] Run gulp fixstyle 
...to apply code style settings from #142.
 2016-05-19 11:29:13 -07:00
Victor Woeltjen
f12b9704d9 Merge branch 'master' into jscs-rebase-142 2016-05-19 11:28:16 -07:00
Henry
edb158f2d3 [Website] Added push to website repo 2016-05-19 10:44:58 -07:00
Henry
b2c6db6207 Changed circleci.yml 2016-05-19 10:44:58 -07:00
Henry
bcdd835275 [Website] Automate site build process 2016-05-19 10:44:57 -07:00
Victor Woeltjen
5b4952d4c6 Merge pull request #923 from nasa/open921 
[Examples] #921 changed text in event generator example
 2016-05-18 17:12:06 -07:00
Victor Woeltjen
de43aa81be Merge pull request #838 from nasa/open824_rebase 
[Edit] #824 - Remove EditableDomainObject
 2016-05-18 17:01:24 -07:00
Henry
5eff4e45c9 [Tutorials] #907 Updated tutorials to use new bundle registration mechanism 2016-05-17 17:24:32 -07:00
Henry
70a13a75d5 Updating tutorials 2016-05-17 13:22:15 -07:00
Andrew Henry
dcf26d3863 Merge pull request #937 from nasa/open929 
R&I open929: Label context arrow always visible; frame dragging in label area
 2016-05-16 16:10:33 -07:00
Charles Hacskaylo
a729edd399 [Frontend] Label context arrows now always visible 
open #929
- Also enable frame dragging in title area when
editing in Layout;
- CSS and markup changes;
 2016-05-16 12:00:29 -07:00
Victor Woeltjen
69cc1086df Merge pull request #924 from nasa/open889b 
[Popup] Add method to jqlite mocks
 2016-05-16 10:14:52 -07:00
Victor Woeltjen
18fa9aeaf6 [Build] Bump version number, add -SNAPSHOT 
...to begin sprint Huxley,
https://github.com/nasa/openmct/milestones/Huxley
 2016-05-16 09:36:59 -07:00
Victor Woeltjen
96892722a4 [Build] Remove SNAPSHOT status 
...to close sprint https://github.com/nasa/openmct/milestones/Herbert
 2016-05-16 09:27:24 -07:00
Henry
54a0de4a08 [New Edit Mode] #636 Removed edit concerns from DropGesture 2016-05-13 17:59:43 -07:00
Henry
a11dba88b2 [New Edit Mode] #634 Removed edit concerns from MctRepresentation 2016-05-12 20:23:33 -07:00
Henry
d08cdfba49 Fixed linting issues 2016-05-12 16:50:19 -07:00
Victor Woeltjen
031a46aa8e [Code Style] Add JSHint rules 
Add JSHint rules to complement allowing multiple var statements,
https://github.com/nasa/openmct/issues/142#issuecomment-212187972

[Code Style] Require one decl per var

[Code Style] Don't require separate var decls

...but allow them (for compatibility with existing code style)

[Code Style] Allow var decl after start of scope

[Code Style] Enforce codestyle during verify task
 2016-05-12 16:32:17 -07:00
Henry
ffacf6e1ae Resolved residual merge issue 2016-05-12 16:18:48 -07:00
Henry
69c4c3a2c8 Added tests 2016-05-12 16:14:42 -07:00