3480809129
Merge remote-tracking branch 'origin/open629'
2016-06-14 10:44:58 -07:00
0aebecfbb0
Merge pull request #987 from nasa/anim-to-edit-709
...
[Frontend] Animation added to transition from browse to edit mode
2016-06-13 13:31:49 -07:00
f167022eea
Changed logic of persisted check slightly
2016-06-02 10:26:38 +01:00
76edba1014
[Frontend] Mods to Edit button
...
fixes #709
- Changed title and style of main Edit button;
- Updated EditItem.js protractor ID accordingly;
2016-06-01 19:19:58 -07:00
b1266abf01
[Edit] Fixed issue with cancel action throwing an error. Fixes #979
2016-06-01 10:41:01 +01:00
eda1f23df9
[Edit Mode] #629 rewriting disabled tests
2016-05-26 11:38:12 -07:00
f1113fda24
[Frontend] New message for unsaved changes warning
...
open #747
2016-05-26 09:04:40 -07:00
7501f679f7
[Style] Fixed style issues introduced by #954
2016-05-25 12:10:39 -07:00
32d7187db6
Relocated creation package to edit bundle
2016-05-24 17:08:12 -07:00
96af931c0b
Modified EditActionPolicy to prevent editing of table views unless object is a table type
2016-05-23 16:48:31 -07:00
eff46b076c
[New Edit Mode] #628 Removed duplicate logic from Create Action
2016-05-23 15:03:20 -07:00
b6502e9ea1
[New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController
2016-05-20 14:12:24 -07:00
9861e63589
[Code Style] Run fixstyle on merged changes
2016-05-20 13:09:16 -07:00
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
ad5691142e
[Code Style] Rename shadowing variables
2016-05-20 13:05:32 -07:00
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
fa77139077
[Code Style] Run gulp fixstyle
...
...to apply code style settings from #142 .
2016-05-19 11:29:13 -07:00
54a0de4a08
[New Edit Mode] #636 Removed edit concerns from DropGesture
2016-05-13 17:59:43 -07:00
d08cdfba49
Fixed linting issues
2016-05-12 16:50:19 -07:00
ffacf6e1ae
Resolved residual merge issue
2016-05-12 16:18:48 -07:00
69c4c3a2c8
Added tests
2016-05-12 16:14:42 -07:00
c305fba0a7
Modified dirty function
2016-05-12 16:14:42 -07:00
44f4a82fa1
Resolved merge conflicts
2016-05-12 16:14:31 -07:00
5bf750c90c
Fixed creation
2016-05-12 16:11:57 -07:00
836b5db8cf
Reviewed edit mode checking
2016-05-12 16:11:57 -07:00
1753a5473c
Resolved merge conflicts
2016-05-12 16:11:52 -07:00
d00e13e4ee
Resolved merge conflicts
2016-05-12 16:09:53 -07:00
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
