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

4021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Woeltjen
1e03f22086 [Persistence] Don't expect persist calls in spec 2016-05-19 11:46:50 -07:00
Victor Woeltjen
360fdeaec8 [Persistence] Don't expect persist calls in spec 2016-05-19 11:44:26 -07:00
Victor Woeltjen
d5914dfde9 [Persistence] Remove caching of persistence capability 
...as this no longer needs to be invoked directly.
 2016-05-19 11:42:58 -07:00
Victor Woeltjen
d3f2a24267 Merge branch 'master' into persist-on-mutation-825 
Conflicts:
	platform/core/src/capabilities/PersistenceCapability.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
 2016-05-19 11:41:08 -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
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
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
d08cdfba49 Fixed linting issues 2016-05-12 16:50:19 -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
Henry
c305fba0a7 Modified dirty function 2016-05-12 16:14:42 -07:00
Henry
44f4a82fa1 Resolved merge conflicts 2016-05-12 16:14:31 -07:00
Henry
5bf750c90c Fixed creation 2016-05-12 16:11:57 -07:00
Henry
836b5db8cf Reviewed edit mode checking 2016-05-12 16:11:57 -07:00
Henry
1753a5473c Resolved merge conflicts 2016-05-12 16:11:52 -07:00
Henry
d00e13e4ee Resolved merge conflicts 2016-05-12 16:09:53 -07:00
Henry
4b786d3536 Removed sysouts 2016-05-12 16:09:08 -07:00
Henry
e6bbc3442b Resolved merge conflicts 2016-05-12 16:09:02 -07:00
Henry
433dd87e51 Resolved merge conflicts 2016-05-12 16:07:39 -07:00
Henry
cf9eb3f602 Resolved Merge conflicts, removed previously deleted files 2016-05-12 16:05:27 -07:00
Henry
bd686790dc Resolved merge conflicts 2016-05-12 16:03:19 -07:00
Henry
e5ef7c0c22 Resovled merge conflicts 2016-05-12 15:58:17 -07:00
Victor Woeltjen
116c6e57ed Merge pull request #918 from nasa/rt-updates-910 
[Table] Remove length check when updating visible rows
 2016-05-11 14:07:27 -07:00
Victor Woeltjen
a39ce566d1 Merge pull request #920 from nasa/open909 
Review and integrate open909: fix for Timeline Resource Graph labels
 2016-05-11 13:38:45 -07:00
Henry
671ba66354 [Examples] #921 changed text in event generator example 2016-05-11 12:35:44 -07:00
Henry
a5ba72582c [Examples] #921 changed text in event generator example 2016-05-11 12:24:24 -07:00
Charles Hacskaylo
a58fe1f81c [Frontend] Modified .tick-labels in Timelines 
open #909
- Changed markup to not use plot .tick-label class;
- Changed CSS accordingly;
- Fixed alignment (clipped bottom value) by
refactoring to use flex-box layout for tick labels;
 2016-05-10 20:41:52 -07:00
Andrew Henry
3727b287a1 Merge pull request #902 from nasa/open898 
[documentation] #898 updated stylesheet reference
 2016-05-10 18:27:09 -07:00
Victor Woeltjen
c448753bab [Table] Remove length check when updating visible rows 
While the number of visible rows may not have changed, their
contents may have; returning early here results in #910.
 2016-05-10 15:20:22 -07:00
Andrew Henry
46e1347dc8 Merge pull request #906 from nasa/use-heroku-integration 
[Build] Use Circle's heroku integration for deploy
 2016-05-09 10:53:28 -07:00
Pete Richards
f5539ec678 [Build] Use Circle's heroku integration for deploy 
Use circle's heroku integration to deploy to ensure that we deploy
a full clone of the repo and not a shallow clone, prevents build
failure in master branch.
 2016-05-09 10:46:17 -07:00
Victor Woeltjen
9ed28a4a37 Merge pull request #900 from nasa/open899 
#899 updated circle.yml to deploy to live_demo and remove doc generation
 2016-05-09 10:37:47 -07:00
Pete Richards
3ca9d21bbd Merge remote-tracking branch 'origin/open663' 2016-05-09 10:33:39 -07:00
Pete Richards
61683800cc [Style] Update style to reflect new jshint config 
Update style to match new jshint config

https://github.com/nasa/openmct/issues/671
 2016-05-09 10:33:26 -07:00
Pete Richards
4c74391137 Merge remote-tracking branch 'origin/open836' 2016-05-09 10:25:25 -07:00
Pete Richards
f3b265bdd5 Merge branch 'master' into open671 2016-05-09 10:19:24 -07:00
Henry
ab6ef22363 #898 updated stylesheet reference 2016-05-08 10:46:59 -07:00
Henry
09d1c2cd4b #899 updated circle.yml to deploy to live_demo and remove doc generation 2016-05-06 19:44:26 -07:00
Victor Woeltjen
d6aa31e4aa Merge pull request #893 from nasa/open885 
#885 added command line option --directory -D to specify base directory
 2016-05-06 10:19:44 -07:00
Victor Woeltjen
3efaa3b1cb Merge pull request #894 from nasa/open892 
#892 Removed browser warning
 2016-05-06 09:51:36 -07:00
Victor Woeltjen
2fe9698ea8 Merge pull request #891 from nasa/fix-clickaway-888 
[General] remove dupe, debounce inputs
 2016-05-06 09:49:13 -07:00
Henry
1cdeccc7a7 #885 added command line option --directory -D to specify base directory 2016-05-05 21:58:31 -07:00
Henry
00433f02bc #892 Removed browser warning 2016-05-05 21:45:18 -07:00
Pete Richards
7fad4e9ea1 [General] remove dupe, debounce inputs 
Remove duplicate ClickAwayController implementation that was obscuring actual
implementation.  Debounce clickaway action in case toggle is invoked in a
click handler.

Resolves https://github.com/nasa/openmct/issues/888
 2016-05-05 18:25:37 -07:00
Andrew Henry
c6d326bbbc Merge pull request #879 from nasa/table-headers-809 
[Table] Fix headers in firefox
 2016-05-05 13:29:03 -07:00
Andrew Henry
d60bc08843 Merge pull request #878 from nasa/open-mct-not-web-816 
[Branding] Change name to Open MCT in docs
 2016-05-05 13:21:13 -07:00
Andrew Henry
3d62cba1b3 Merge pull request #859 from nasa/remove-examples-825 
[Examples] Move examples out of main.js
 2016-05-05 13:05:41 -07:00