Victor Woeltjen 7974ffdda2 Merge remote-tracking branch 'github/master' into open245b ...

...in preparation to complete merge nasa/openmctweb#257

Conflicts:
	platform/entanglement/src/actions/CopyAction.js
	platform/entanglement/src/actions/LinkAction.js
	platform/entanglement/src/actions/MoveAction.js

2015-11-21 07:05:51 -08:00

..

actions

Merge remote-tracking branch 'github/master' into open245b

2015-11-21 07:05:51 -08:00

capabilities

[Entanglement] Add license headers

2015-10-19 12:08:49 -07:00

policies

[Persistence] Test cross-space policy

2015-11-10 13:29:12 -08:00

services

[UI] Progress indicator for pending operations - Refactoring for code clarity

2015-11-05 17:32:52 -08:00

ControlledPromise.js

[Test] add a synchronous controlled promise for testing

2015-08-06 14:53:59 -07:00

DomainObjectFactory.js

[Licenses] Add License Headers

2015-06-11 14:22:18 -07:00

suite.json

[Persistence] Test cross-space policy

2015-11-10 13:29:12 -08:00