Commit Graph

25 Commits

Author SHA1 Message Date
Victor Woeltjen
1a88c9a651 Merge remote-tracking branch 'origin/master' into persist-on-mutation-825 2016-10-07 11:27:58 -07:00
steven mirecki
e751461194 Typo corrections, I avoided making changes to words that have regional spelling differences. 2016-09-03 09:16:54 -04: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
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
d6ec7e9ab8 [Build] Remove unused variables from specs
...to satisfy JSHint.
2016-03-04 12:56:14 -08: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
bwyu
c2d7996785 Merge remote-tracking branch 'origin/open929' into open-master 2015-03-13 16:21:08 -07:00
bwyu
6575291e3e Merge remote-tracking branch 'origin/open788' into open-master 2015-03-10 12:41:08 -07:00
Victor Woeltjen
d7e962e4b1 [Edit] Update tests
Update tests for Edit mode bundle to include the
general-purpose selection API, WTD-929.
2015-03-03 18:43:26 -08: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
Victor Woeltjen
1e76264d82 [Edit] Avoid extra commits
Avoid issuing extra commit calls from the Edit toolbar;
this can cause disruption of state from other views (such
as Fixed Position), WTD-881.
2015-02-24 09:47:00 -08:00
Victor Woeltjen
59ff539bfb [Fixed Position] Update specs for coverage
Update specs to restore code coverage after changes for WTD-881.
2015-02-24 09:18:00 -08:00
Victor Woeltjen
8452b2ab12 [Fixed Position] Update specs
Update failing specs after changes for WTD-881.
2015-02-24 09:07:57 -08:00
Victor Woeltjen
307fbe2151 [Edit] Update EditToolbar spec
Update EditToolbar spec to reflect changes for WTD-881.
2015-02-23 19:47:56 -08:00
Victor Woeltjen
8c653d39d7 [Edit] Update specs
Update specs for toolbars in Edit mode to reflect
changes for WTD-879.
2015-02-19 12:44:00 -08:00
Victor Woeltjen
3916968544 [Edit] Add EditToolbarRepresenter spec
Add tests for representer which mediates between view's
selection and toolbar contents, WTD-878.
2015-02-17 15:47:18 -08:00
Victor Woeltjen
5dc72b15c2 [Edit] Implement EditToolbar
Implement EditToolbar (sufficient to satisfy spec) which will
construct an mct-toolbar-friendly form structure based on both
the current selection and the view's defined toolbar structure.
WTD-878.
2015-02-17 13:47:14 -08:00
Victor Woeltjen
8f14f4e5eb [Edit] Add spec for toolbar
Add spec for class that will convert toolbar definition
provided by views to suitable input for mct-toolbar, WTD-878.
2015-02-17 12:58:36 -08:00