226 Commits

Author	SHA1	Message	Date
Henry	66e827de2e	Fixed Outstanding issues from merge	2016-01-14 18:51:53 -08:00
Henry	032b2542f0	Merged from Master	2016-01-14 17:23:53 -08:00
Henry	3e7eb11d84	Regenerated bundles	2016-01-14 17:08:19 -08:00
Henry	f300b99b7b	[New Edit Mode] Code style fixes ... JSLint error	2016-01-14 15:55:02 -08:00
Henry	b4448020e4	JSLint	2016-01-14 15:12:15 -08:00
Henry	0741e2cf5e	Disabled failing tests	2016-01-14 15:11:19 -08:00
Victor Woeltjen	45142e03dc	[API Refactor] Move uuid dependency out of top-level	2016-01-13 12:33:22 -08:00
Victor Woeltjen	cec197f888	[API Refactor] Remove bundle.json files	2016-01-08 15:32:18 -08:00
Victor Woeltjen	de53247d56	[API] Convert JSON bundles to imperative form	2016-01-07 15:08:08 -08:00
Henry	0ce19ad75d	Disabled context menu for Location items in edit mode, and disabled context menu items for non-creatable objects	2015-12-10 17:39:56 -08:00
Henry	6058e50216	JSLint fixes	2015-12-09 10:04:49 -08:00
Henry	4419a101d6	[New Edit Mode] #199 Disabled all failing tests	2015-12-08 15:15:54 -08:00
Henry	18607e9404	Merged from Master	2015-12-07 20:42:09 -08:00
Henry	eb4959cf49	[persistence] #58 renamed alertService to notificationService	2015-12-04 10:45:49 -08:00
Henry	00f96c314a	[persistence] #58 added tests for notification on persistence error	2015-12-03 20:32:03 -08:00
Henry	20d9c7158e	Added jslint es5 mode	2015-12-01 22:40:50 -08:00
Henry	d8e319ebf8	Fixing jslint errors	2015-12-01 22:36:23 -08:00
Henry	a39cbbd917	Fixing jslint errors	2015-12-01 22:35:28 -08:00
Henry	8df27a1c05	Fixing jslint errors	2015-12-01 22:34:26 -08:00
Henry	26cf9c14f4	[Persistence] Errors in persistence (after creating/modifying objects) should be visible to user #58	2015-12-01 22:03:53 -08:00
Henry	268a2c2427	Merged from master	2015-11-25 09:04:11 -08:00
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
Henry	30e6980dc6	Merge branch 'master' into open199	2015-11-19 14:29:32 -08:00
Victor Woeltjen	a7f277b0d2	Merge pull request #317 from nasa/open316 ... [bug] TypeImpl.getInitialmodel should always return a fresh (ie. cloned) model.	2015-11-18 12:21:23 -08:00
Henry	5ced8e655d	[bug] #317 Added jsdoc note about performance	2015-11-18 12:14:00 -08:00
akhenry	4ed35cddde	Merge pull request #272 from nasa/open120 ... [Actions] Avoid suppression of context menus	2015-11-17 16:27:17 -08:00
Henry	40b21e35fd	Fixed jslint error	2015-11-17 15:03:17 -08:00
Henry	3a36389815	Fixed test	2015-11-17 14:45:10 -08:00
Henry	ba669f1395	Merge branch 'open316' into open199	2015-11-17 14:31:06 -08:00
Henry	b27b60aedc	Merge branch 'master' into open199	2015-11-17 14:30:57 -08:00
Henry	606667eb4d	[bug] TypeImpl.getInitialmodel should always return a fresh (ie. cloned) model. #316	2015-11-17 14:30:34 -08:00
akhenry	f9a7ca85ac	Merge pull request #273 from nasa/open231 ... [Core] Catch errors from listeners in topic	2015-11-12 16:51:50 -08:00
Charles Hacskaylo	608df8f7b8	Merging in latest github master; resolved conflicts	2015-11-10 16:13:46 -08:00
Victor Woeltjen	04ce2f985a	[Persistence] Add JSDoc ... Add JSDoc to classes added/modified to support multiple persistence spaces, nasa/openmctweb#245.	2015-11-10 14:16:07 -08:00
Victor Woeltjen	7c427e0b6e	[Persistence] Test IdentifierProvider	2015-11-10 13:15:24 -08:00
Victor Woeltjen	6cf8335f31	[Persistence] Test Identifier parsing ... ...and add empty spec for IdentifierProvider	2015-11-10 13:11:21 -08:00
Victor Woeltjen	76c1f5bfe9	[Persistence] Update spec for instantiate ... ...to reflect usage of identifierService.	2015-11-10 12:34:54 -08:00
Victor Woeltjen	33f88d30ed	[Persistence] Update bundle definition ... ...to reflect dependency on identifierService to interpret an object's persistence space based on its identifier.	2015-11-10 12:34:30 -08:00
Victor Woeltjen	ffdcbece56	[Persistence] Update failing spec ... ...to reflect changes to the persistence capability, utilizing the identifierService for consistent interpretation of spaces by id.	2015-11-10 12:33:52 -08:00
Victor Woeltjen	44eb723efb	[Persistence] Update failing spec ... ...for instantiation capability, to reflect usage of identifier parser in determining which space an object should belong to.	2015-11-10 12:26:59 -08:00
Victor Woeltjen	689f80bb23	[Persistence] Use identifierService from persistence ... User identifierService from the persistence capability, for consistent interpretation of spaces associated with domain object identifiers.	2015-11-10 12:21:53 -08:00
Victor Woeltjen	a2db98d275	[Persistence] Update failing spec ... ...to reflect changes to PersistedModelProvider	2015-11-10 12:12:11 -08:00
Victor Woeltjen	ad60b9225e	[Persistence] Clean up instantiation ... Fix typo to correctly reuse defined identifiers, remove unused dependency of instantiation capability.	2015-11-10 10:53:48 -08:00
Victor Woeltjen	e3e44f74d6	[Topic] Catch errors from listeners	2015-11-09 16:55:22 -08:00
Victor Woeltjen	acdd9622d2	[Topic] Add test case ... ...which specifies desired behavior for nasa/openmctweb#231.	2015-11-09 16:51:39 -08:00
Victor Woeltjen	066fd55590	[Actions] Test error handling	2015-11-09 16:18:35 -08:00
Victor Woeltjen	07179f7290	[Action] Catch errors ... Catch errors during action instantiation, to avoid suppressing whole context menus on single failures; nasa/openmctweb#120.	2015-11-09 15:42:19 -08:00
Victor Woeltjen	87684e0945	[Persistence] User identifierService from instantiate	2015-11-09 15:25:07 -08:00
Victor Woeltjen	1d13b245f9	[Persistence] Update bundle definition ... ...after merging latest changes from master branch into topic branch for nasa/openmctweb#245.	2015-11-09 15:21:41 -08:00
Victor Woeltjen	e31d9decdc	Merge remote-tracking branch 'github/master' into open245b ... Conflicts: docs/src/guide/index.md platform/core/src/capabilities/InstantiationCapability.js	2015-11-09 15:17:53 -08:00