Victor Woeltjen
|
185567cf29
|
[Licenses] Update copyright year to 2017
Fixes #1517
|
2017-04-05 14:52:46 -07:00 |
|
Victor Woeltjen
|
766e94ed62
|
Merge remote-tracking branch 'origin/master' into persist-on-mutation-825b
Conflicts:
platform/core/src/capabilities/PersistenceCapability.js
|
2016-07-25 16:30:49 -07:00 |
|
Henry
|
c8898ac6aa
|
[Documentation] Updated copyright statement. Fixes #1081
|
2016-07-12 16:55:57 -07:00 |
|
Victor Woeltjen
|
264896c264
|
Merge branch 'master' into persist-on-mutation-825
Conflicts:
platform/commonUI/edit/src/actions/RemoveAction.js
platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
platform/commonUI/edit/test/actions/RemoveActionSpec.js
platform/entanglement/src/services/LinkService.js
platform/features/timeline/src/controllers/drag/TimelineDragHandler.js
platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDecorator.js
platform/features/timeline/test/controllers/drag/TimelineDragHandlerSpec.js
platform/features/timeline/test/controllers/swimlane/TimelineSwimlaneDropHandlerSpec.js
|
2016-05-20 14:26:39 -07:00 |
|
Victor Woeltjen
|
9861e63589
|
[Code Style] Run fixstyle on merged changes
|
2016-05-20 13:09:16 -07:00 |
|
Victor Woeltjen
|
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 |
|
Victor Woeltjen
|
e3208187bf
|
Merge branch 'master' into persist-on-mutation-825
Conflicts:
platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
|
2016-05-20 10:59:54 -07:00 |
|
Henry
|
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 |
|
Henry
|
54a0de4a08
|
[New Edit Mode] #636 Removed edit concerns from DropGesture
|
2016-05-13 17:59:43 -07:00 |
|