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
|
9b273bc148
|
[Persistence] Don't expect persist calls in EditRepresenter spec
|
2016-05-19 11:52:58 -07:00 |
|
Victor Woeltjen
|
fa77139077
|
[Code Style] Run gulp fixstyle
...to apply code style settings from #142.
|
2016-05-19 11:29:13 -07:00 |
|
Henry
|
44f4a82fa1
|
Resolved merge conflicts
|
2016-05-12 16:14:31 -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
|
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 |
|
Melanie Lean
|
53c60ee64f
|
[Timelines] #677 Applied fix to prevent editing of timelines in browse mode
Fixed failing test
|
2016-02-11 21:52:05 -08:00 |
|
Victor Woeltjen
|
10863514cb
|
[Licenses] Add license headers
WTD-1051.
|
2015-05-13 16:43:30 -07:00 |
|
Victor Woeltjen
|
0d5a849a41
|
[Edit] Restructure source folder
Restructure sources associated with Edit mode; work on
WTD-788 has increased number of sources here so more
organization is useful.
|
2015-02-26 17:06:30 -08:00 |
|