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
|
f1e81c359e
|
[Persistence] Satisfy JSHint
|
2016-05-19 12:17:20 -07:00 |
|
Victor Woeltjen
|
ac3706dfb6
|
[Persistence] Don't expect persist calls in specs
|
2016-05-19 11:50:12 -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 |
|
Victor Woeltjen
|
ac5ac8d34e
|
[Build] Remove boilerplate from scripts
No longer necessary after JSHint configuration.
|
2016-03-04 10:46:38 -08:00 |
|
Victor Woeltjen
|
5274923c49
|
[Licenses] Add license headers
...to sources for Clocks/Timers and Timelines, as noted in
review nasa/openmctweb#207
|
2015-11-05 12:45:51 -08:00 |
|
Victor Woeltjen
|
307047d3ac
|
[Clocks/Timers] Remove namespacing from specs
WTD-1239
|
2015-10-23 13:44:39 -07:00 |
|
Victor Woeltjen
|
96f72b3765
|
[Clocks] Add license, change keys
Un-namespace keys in clock plugin, and add licensing
info for moment-duration-format. WTD-1239
|
2015-09-14 16:52:56 -07:00 |
|
Victor Woeltjen
|
c932e953bc
|
[Plugins] Bring over timeline, clock plugins
WTD-1239
|
2015-09-14 16:45:41 -07:00 |
|