Henry
44f4a82fa1
Resolved merge conflicts
2016-05-12 16:14:31 -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
Pete Richards
f3b265bdd5
Merge branch 'master' into open671
2016-05-09 10:19:24 -07:00
Victor Woeltjen
433d26e703
[Persistence] Remove persistence usage from Remove action
2016-04-26 16:53:12 -07:00
Henry
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
Andrew Henry
6cb9619fbe
Merge pull request #829 from nasa/open630
...
[Edit mode] Simplify SaveAction
2016-04-14 16:11:49 -07:00
Henry
8c3616da32
Addressed code review points
2016-04-14 16:04:15 -07:00
Henry
26e368f52d
[Edit mode] Simplify SaveAction
2016-04-12 14:40:19 -07:00
Henry
7f108c3b24
[Edit Mode] #635 Removed Edit-related concerns from ContextMenuGesture
2016-04-11 15:39:35 -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
Victor Woeltjen
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
Victor Woeltjen
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
Victor Woeltjen
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
Henry
670c06103f
[Edit Mode] Rebased over master
2016-03-02 11:45:15 -08:00
Henry
f192544be3
Addressing issues from code review
2016-03-02 11:10:49 -08:00
Henry
65ca78d8aa
Added missing dependency on
2016-03-02 11:00:08 -08:00
Henry
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
Henry
549dfab5aa
[Edit Mode] #627 remove edit concerns from browse controller
2016-03-02 10:55:18 -08:00
Victor Woeltjen
bf1fa0ac4c
[Templates] Include templates using text plugin
...
Resolves #673
2016-02-26 13:07:50 -08:00
Victor Woeltjen
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
Victor Woeltjen
8c602025d4
[Create] Avoid navigation warning
...
...when navigating to a clone created via Save As.
2016-02-10 11:59:17 -08:00
Henry
3e7eb11d84
Regenerated bundles
2016-01-14 17:08:19 -08:00
