433dd87e51
Resolved merge conflicts
2016-05-12 16:07:39 -07:00
cf9eb3f602
Resolved Merge conflicts, removed previously deleted files
2016-05-12 16:05:27 -07:00
bd686790dc
Resolved merge conflicts
2016-05-12 16:03:19 -07:00
e5ef7c0c22
Resovled merge conflicts
2016-05-12 15:58:17 -07:00
3ca9d21bbd
Merge remote-tracking branch 'origin/open663'
2016-05-09 10:33:39 -07:00
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
f3b265bdd5
Merge branch 'master' into open671
2016-05-09 10:19:24 -07:00
11cfb6e1b8
[Edit] Elements pool filtering displays more consistent results
2016-04-21 10:42:50 -07:00
06436c488a
[Edit Mode] #794 Modified policy to show remove action in context for non-editable domain object types
2016-04-18 19:05:46 -07:00
6cb9619fbe
Merge pull request #829 from nasa/open630
...
[Edit mode] Simplify SaveAction
2016-04-14 16:11:49 -07:00
8c3616da32
Addressed code review points
2016-04-14 16:04:15 -07:00
26e368f52d
[Edit mode] Simplify SaveAction
2016-04-12 14:40:19 -07:00
519a9333ab
Updated tests
2016-04-11 17:10:35 -07:00
2fe7ba982f
Added 'Open in New Tab' to context menu in edit mode
2016-04-11 17:06:37 -07:00
7f108c3b24
[Edit Mode] #635 Removed Edit-related concerns from ContextMenuGesture
2016-04-11 15:39:35 -07:00
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
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
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
8f4f0cb78e
Merge pull request #785 from nasa/open677_cleanup
...
[Timelines] #677 Removed temporary markup
2016-04-05 12:24:58 -07:00
650ef9bfa4
[Timelines] #677 Removed temporary markup
2016-03-23 11:27:40 -07:00
31d8c9a48f
[Timeline] Allow linking during edit
...
...in cases where it is safe to do so (specifically, when the
linked-to object has already been persisted.)
2016-03-22 12:04:50 -07:00
007741b4e7
[Timeline] Add move policy
...
...to restore suppression of Move for objects being edited
(relaxed for the specific case of moving one object being
edited into another object being edited, for use in Timelines.)
2016-03-21 12:07:19 -07:00
a4c5854561
[Frontend] Bug fixing
...
open #729
open #498
Fixed markup to use proper CSS classes
to allow tree items in Inspector Elements to
ellipsize properly, and to apply scroll regions
to the proper elements;
2016-03-10 14:33:01 -08:00
134452582c
[Build] Remove/qualify for-in usages
2016-03-04 13:10:23 -08:00
d6ec7e9ab8
[Build] Remove unused variables from specs
...
...to satisfy JSHint.
2016-03-04 12:56:14 -08:00
a1a7b2b8ce
[Build] Remove unused variables
...
...to satisfy JSHint
2016-03-04 11:41:48 -08:00
c00d77dcb1
[Build] Relocate operators
...
...in multi-line expressions, to satisfy JSHint.
2016-03-04 11:02:57 -08:00
56a91dfbaf
[Build] Use not-threequals operator
...
...to satisfy JSHint
2016-03-04 10:58:23 -08:00
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
670c06103f
[Edit Mode] Rebased over master
2016-03-02 11:45:15 -08:00
7b5218c5ba
[Edit Mode] #627 Fixed failing tests
...
Removed reference to defunct NavigationServiceDecorator
Removed virtual panels from drop gesture
2016-03-02 11:12:41 -08:00
f192544be3
Addressing issues from code review
2016-03-02 11:10:49 -08:00
2cc2c6a9d3
[Edit Mode] #627 removed edit concerns from browse controllers and markup
...
Fixed elements not appearing in edit mode
Fixed failing tests
2016-03-02 11:05:23 -08:00
65ca78d8aa
Added missing dependency on
2016-03-02 11:00:08 -08:00
2f036a89e4
Refactoring out regions
2016-03-02 11:00:08 -08:00
fa46d31ac2
[Edit Mode] #627 slightly modified edit representer to detect newly created objects
...
Added some comments, renamed controller variable in markup
Removed edit references from BrowseController
2016-03-02 10:57:05 -08:00
549dfab5aa
[Edit Mode] #627 remove edit concerns from browse controller
2016-03-02 10:55:18 -08:00
183bd9793c
Merge branch 'open677'
2016-03-01 11:33:31 -08:00
bf1fa0ac4c
[Templates] Include templates using text plugin
...
Resolves #673
2016-02-26 13:07:50 -08:00
53c60ee64f
[Timelines] #677 Applied fix to prevent editing of timelines in browse mode
...
Fixed failing test
2016-02-11 21:52:05 -08:00
0bdf05e61c
[Create] Always allow cloning self
...
Always allow cloning the newly-created object itself
when saving a newly-created domain object.
2016-02-10 13:49:15 -08:00
3146660833
[Create] Utilize filtering during clone
2016-02-10 13:46:19 -08:00
c43929f1c6
[Create] Add specificity to check
...
Explicitly check if an object has a persistence timestamp
at all (avoids false-positives due to falsiness of zero.)
2016-02-10 12:07:45 -08:00
88750d92ef
[Create] Remove unused code, dependencies
2016-02-10 12:05:01 -08:00
8c602025d4
[Create] Avoid navigation warning
...
...when navigating to a clone created via Save As.
2016-02-10 11:59:17 -08:00
5604120d55
[Create] Use duplicate at end of Save
...
...for unpersisted objects. Ensures that they share the
persistence space of their parent. #656 .
2016-02-10 11:42:35 -08:00
668c02f278
[Edit Mode] Added ability to clear all dirty cache
2016-02-09 19:29:55 -08:00
b0e4947bf0
Merge pull request #500 from nasa/open480
...
[New Edit Mode] Adding sub objects to Timelines
2016-02-08 11:59:54 -08:00
aebae27391
[Tests] Remove suite.json files
...
Remove obsolete suite.json files; #482
2016-02-02 09:35:50 -08:00
cd2b19eb1e
[New Edit Mode] Fixed failing tests, and added new test in CreateWizard
...
[New Edit Mode] #480 fixed JSLint errors
[New Edit Mode] #480 do not show locator for sub objects
[New Edit Mode] Modified persistence in SaveAction
Removed redundant variable
Fixed Failing Test
Fixed JSLint errors
Improved some documentation
2016-01-21 12:01:38 -08:00
