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

[Actions] Test error handling

2015-11-09 16:18:35 -08:00

capabilities

[Persistence] Update failing spec

2015-11-10 12:33:52 -08:00

identifiers

[Persistence] Test IdentifierProvider

2015-11-10 13:15:24 -08:00

models

[Persistence] Update failing spec

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

objects

[Creation] Use instantiate from objectService

2015-11-06 14:23:34 -08:00

services

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

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

types

Fixed jslint error

2015-11-17 15:03:17 -08:00

views

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

suite.json

[Persistence] Test Identifier parsing

2015-11-10 13:11:21 -08:00