ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 15:02:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,114 Commits 989 Branches 212 Tags 191 MiB
8f9308de01
Commit Graph

4114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry
0c6b4a5a23 [Tables] Fix to correct sorting in realtime tables 2016-04-11 12:57:27 -07:00
Henry
20672ad028 [Tables] #801 Documented MctTable directive 2016-04-11 12:55:56 -07:00
Henry
99ba9edb95 Merged 
Resolved merge conflicts

Resolved merge conflicts
 2016-04-11 12:55:53 -07:00
Henry
23a8c305c1 [Table] #798 Simplified markup, moved styles to external stylesheet 2016-04-11 12:23:36 -07:00
Victor Woeltjen
934eb13813 [Build] Remove obsolete jslint tags 
ES5 mode is enabled by default in JSHint, tags no longer necessary per
https://github.com/nasa/openmct/pull/724#discussion_r55095722
 2016-04-08 16:54:01 -07:00
Victor Woeltjen
a224711dce [Build] Move JSHint config to .jshintrc 
...to allow code editors etc to pick up on rules, per
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
 2016-04-08 16:37:37 -07:00
Victor Woeltjen
c1ae68b565 [Build] Change unused to vars 
To allow placeholder arguments in method signatures, per
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
 2016-04-08 16:32:17 -07:00
Victor Woeltjen
9351285182 [Build] Remove obsolete argument from spec 
...to reflect changes associated with JSHint configuration,
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
 2016-04-08 16:31:01 -07:00
Victor Woeltjen
aa45e53440 [Build] Revert setTimeout changes 
Restore usage of setTimeout (instead of the Angular-wrapped version) per
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
 2016-04-08 16:29:49 -07:00
Victor Woeltjen
f6a9c90cef [Build] Use native bind 
...in CouchPersistenceProvider and ElasticPersistenceProvider, per
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
 2016-04-08 16:25:32 -07:00
Victor Woeltjen
0b11ddbcfd [Build] Satisfy JSHint 
Restore globals lost during removal due to merge, remove unused
variables and use threequals in new scripts.
 2016-04-08 16:22:40 -07:00
Victor Woeltjen
5088453712 [Build] Remove use strict, global 
Remove usages of use strict and global declarations that are
no longer necessary with JSHint configuration, from files
added/changed since #724
 2016-04-08 16:11:12 -07:00
Victor Woeltjen
5e44bfc6c7 Merge branch 'master' into open671 
Conflicts:
	main.js
	platform/commonUI/edit/src/policies/EditableMovePolicy.js
	platform/commonUI/general/src/directives/MCTTree.js
	platform/commonUI/general/src/ui/ToggleView.js
	platform/core/src/actions/ActionCapability.js
	platform/core/test/models/CachingModelDecoratorSpec.js
	platform/core/test/services/InstantiateSpec.js
	platform/features/events/bundle.js
	platform/features/events/src/DomainColumn.js
	platform/features/events/src/EventListController.js
	platform/features/events/src/EventListPopulator.js
	platform/features/events/src/RangeColumn.js
	platform/features/events/src/directives/MCTDataTable.js
	platform/features/events/src/policies/MessagesViewPolicy.js
	platform/features/events/test/DomainColumnSpec.js
	platform/features/events/test/EventListControllerSpec.js
	platform/features/events/test/EventListPopulatorSpec.js
	platform/features/events/test/RangeColumnSpec.js
	platform/features/events/test/policies/MessagesViewPolicySpec.js
	platform/features/rtevents/bundle.js
	platform/features/rtevents/src/DomainColumn.js
	platform/features/rtevents/src/RTEventListController.js
	platform/features/rtevents/src/RangeColumn.js
	platform/features/rtevents/src/directives/MCTRTDataTable.js
	platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
	platform/features/rtevents/test/DomainColumnSpec.js
	platform/features/rtevents/test/RTEventListControllerSpec.js
	platform/features/rtevents/test/RangeColumnSpec.js
	platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
	platform/features/rtscrolling/bundle.js
	platform/features/rtscrolling/src/DomainColumn.js
	platform/features/rtscrolling/src/NameColumn.js
	platform/features/rtscrolling/src/RTScrollingListController.js
	platform/features/rtscrolling/src/RangeColumn.js
	platform/features/scrolling/src/DomainColumn.js
	platform/features/scrolling/src/RangeColumn.js
	platform/features/scrolling/src/ScrollingListController.js
	platform/features/scrolling/src/ScrollingListPopulator.js
	platform/features/scrolling/test/DomainColumnSpec.js
	platform/features/scrolling/test/RangeColumnSpec.js
	platform/features/scrolling/test/ScrollingListControllerSpec.js
	platform/features/scrolling/test/ScrollingListPopulatorSpec.js
	platform/features/table/src/directives/MCTTable.js
	platform/features/table/test/controllers/TelemetryTableControllerSpec.js
	platform/representation/src/gestures/DropGesture.js
	platform/telemetry/src/TelemetryFormatter.js
	test-main.js
 2016-04-08 16:08:19 -07:00
Pete Richards
c591ade479 Merge remote-tracking branch 'origin/781' 2016-04-06 10:35:40 -07:00
Victor Woeltjen
8f4f0cb78e Merge pull request #785 from nasa/open677_cleanup 
[Timelines] #677 Removed temporary markup
 2016-04-05 12:24:58 -07:00
Victor Woeltjen
e87280aa15 Merge pull request #821 from nasa/show-selected-color 
[Control] Color input shows selected color
 2016-04-05 12:20:14 -07:00
Pete Richards
e0a2d02d23 [Control] Color input shows selected color 
Update color input to show selected color when expanded.
 2016-04-05 11:57:45 -07:00
Victor Woeltjen
ddc241c0d0 [Documentation] Add Version Guide 
Migrate relevant information from existing version guide;
add instructions for incrementing versions per #725
 2016-04-05 11:55:15 -07:00
Victor Woeltjen
73012233b8 [Build] Bump version number 
...to begin sprint Heinlein,
https://github.com/nasa/openmct/milestones/Heinlein
 2016-04-04 09:33:58 -07:00
Victor Woeltjen
339916ccd4 [Build] Remove SNAPSHOT status 
...to tag end of release Gibson,
https://github.com/nasa/openmct/milestones/Gibson
 2016-04-04 09:32:21 -07:00
Victor Woeltjen
70acef6905 [Instantiation] Ensure new models have modified timestamp 
...to avoid https://github.com/nasa/openmct/issues/745#issuecomment-204561163
 2016-04-01 14:27:26 -07:00
Victor Woeltjen
da09ffd3fa [Persistence] Don't evict models on persist 
https://github.com/nasa/openmct/issues/745#issuecomment-204559209
 2016-04-01 13:38:13 -07:00
Pete Richards
5b98da6681 Merge pull request #807 from nasa/timeline-model-717 
[Timeline] Add default values to model
 2016-04-01 10:10:15 -07:00
Andrew Henry
2040abb768 Merge pull request #808 from nasa/revert-open-793 
Revert "Merge remote-tracking branch 'origin/open793'"
 2016-03-31 16:37:18 -07:00
Pete Richards
d35fccbbe8 Revert "Merge remote-tracking branch 'origin/open793'" 
This reverts commit f49552779a, reversing
changes made to e068173f3e.
 2016-03-31 16:30:35 -07:00
Victor Woeltjen
06c6832676 [Timeline] Add default values to model 
Add default values to model, such that editing which occurs
before user supplies these properties does not cause errors
to occur. Directly addresses #717, indirectly addresses
remaining errant behavior associated with #790.
 2016-03-31 15:46:56 -07:00
Pete Richards
f49552779a Merge remote-tracking branch 'origin/open793' 2016-03-31 14:14:08 -07:00
Henry
200a426f17 [Tables] Addressed style concerns from code review 2016-03-31 12:56:29 -07:00
Pete Richards
e068173f3e Merge remote-tracking branch 'origin/move-copy-policy-792' 2016-03-31 12:49:06 -07:00
Victor Woeltjen
4441e88769 Merge pull request #803 from nasa/drag-drop-688 
[Firefox] Invoke preventDefault on drop
 2016-03-31 11:02:26 -07:00
Victor Woeltjen
254a944d7a [Firefox] Invoke preventDefault on drop 
...such that Firefox does not try to treat drop as a new URL
to navigate to. Addresses #688 and #527
 2016-03-31 10:34:24 -07:00
Henry
0c00061cbc Added mutation listener 2016-03-31 10:26:34 -07:00
Andrew Henry
dee0613b81 Merge pull request #800 from nasa/timeline-reorder-789 
[Timeline] Fix reordering behavior in timelines
 2016-03-31 09:39:17 -07:00
Andrew Henry
6b6bada700 Merge pull request #788 from nasa/open445b 
Review and integrate open445b
 2016-03-31 09:36:03 -07:00
Victor Woeltjen
530b940a64 [Timeline] Fix reordering 
Fix reordering behavior when dragging-and-dropping within timelines;
addresses #789.
 2016-03-29 19:46:30 -07:00
Victor Woeltjen
e23bf5ed39 [Entanglement] Test CopyPolicy 2016-03-29 19:26:18 -07:00
Victor Woeltjen
6ecea9950d [Entanglement] Test MovePolicy 2016-03-29 19:22:22 -07:00
Victor Woeltjen
4816dddf41 [Entanglement] Wire in copy/move policies 
#792
 2016-03-29 13:14:08 -07:00
Victor Woeltjen
cae775f9bc [Entanglement] Add policies for Copy and Move 
...to ensure that these are only performed on creatable and
mutable targets, respectively.
 2016-03-29 13:10:35 -07:00
Henry
a4b79cdb5b [Tables] #793 Added fix for tables not appearing on refresh 
Fixed failing tests
 2016-03-28 17:48:01 -07:00
Henry
012a38cccd [Tables] Fix for table columns not being populated 2016-03-28 17:31:10 -07:00
Charles Hacskaylo
a01f7ddd2d [Frontend] Refinements to .loading and related 
#445
Markup enhanced in wait-node.html;
More wait-spinner constants added;
Normalized appearance between tree-based
.loading and .s-status-pending;
Fixed .s-status-pending to work now that
mct-representation is gone from tree;
 2016-03-24 15:10:22 -07:00
Charles Hacskaylo
e7e91e21fc [Frontend] Markup and CSS for loading tree items 
#445
New wait-spinner constants;
Markup fixed in wait-node.html;
Styles for .loading when applied to
.tree-item.wait-node;
Changed from percent-of-parent-
width sizing of spinner to fixed size;
 2016-03-24 15:10:02 -07:00
Pete Richards
cbea842c8b Merge branch 'timeline-highlight-767' 2016-03-24 13:33:56 -07:00
Pete Richards
cc5d14deec Merge branch '755a' 2016-03-24 13:21:59 -07:00
Pete Richards
4c5217d646 [Style] Standardize indentation 2016-03-24 13:20:49 -07:00
Pete Richards
5e54b193ca [Style] remove unnecessary parenthesis 
See comment https://github.com/nasa/openmct/pull/782/files#r57380540
 2016-03-24 13:14:53 -07:00
Pete Richards
cd7ff8ad85 Merge remote-tracking branch 'origin/timestamps-776' 2016-03-24 13:09:32 -07:00
Pete Richards
fa5d59bff8 Merge branch 'timeline-save-770b' 2016-03-24 13:06:53 -07:00
Pete Richards
ddbb72b88a [CacheService] Don't track ids twice 
Track whether an object is in the cache based on whether it is
in the cache instead of utilizing a separate object for tracking
contents of cache.

See comment on https://github.com/nasa/openmct/pull/773/files
 2016-03-24 12:57:53 -07:00