ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-28 08:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,627 Commits 988 Branches 212 Tags 191 MiB
257a8e2e2d
Commit Graph

348 Commits

Author SHA1 Message Date
Victor Woeltjen
baccd005dc [Add] Update persistence capability spec 
...to reflect removal of cached domain object models.
 2016-03-21 15:08:27 -07:00
Victor Woeltjen
1e4ff5a73f [Add] Use cacheService from decorator spec 2016-03-21 15:05:28 -07:00
Victor Woeltjen
9f29382e18 [Add] Update spec for Instantiate 
...to reflect usage of a model cache for #770
 2016-03-21 15:04:07 -07:00
Victor Woeltjen
7eaffdc34a [Timeline] Don't suppress move during editing 
...to allow this action to be used to support Timeline
drag-and-drop.
 2016-03-21 11:42:33 -07:00
Victor Woeltjen
9c9db3c24f [Add] Remove obsolete variable reference 
The cache has been externalized to allow writing to it
upon domain object instantiation.
 2016-03-21 10:31:38 -07:00
Victor Woeltjen
3fe41575bd [Add] Add missing dependency 
...to support caching of domain objects created during edit mode.
 2016-03-21 10:31:09 -07:00
Victor Woeltjen
17faf000b0 [Add] Cache models on instantiation 
...to remove need for Edit to persist these immediately, which in
turn causes #770 and #678
 2016-03-21 10:20:14 -07:00
Charles Hacskaylo
3258342783 [Frontend] Further cleanups to form elements 
#700
#689
#740
Removed _selects.scss and moved classes
into _controls.scss;
Reorg'd _controls;
Moved classes into _elems.scss;
Added and fixed cssclass defs in multiple
bundle.js files to allow better field widths
in overlay dialogs;
Fixed overlay custom scrollbar colors;
Fixed alignment of required glyphs in forms;
 2016-03-16 14:40:06 -07:00
Victor Woeltjen
8b5a425da6 [Build] Restore erroneously-removed variable 2016-03-04 13:03:41 -08:00
Victor Woeltjen
d6ec7e9ab8 [Build] Remove unused variables from specs 
...to satisfy JSHint.
 2016-03-04 12:56:14 -08:00
Victor Woeltjen
65095d18f2 [Build] Remove partial global declarations 2016-03-04 11:43:55 -08:00
Victor Woeltjen
a1a7b2b8ce [Build] Remove unused variables 
...to satisfy JSHint
 2016-03-04 11:41:48 -08: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
494212a448 Merge pull request #653 from nasa/open499 
[Notifications] #499 All notifications now dismissable by default.
 2016-03-01 14:50:56 -08:00
Henry
747a98d130 Addressed issues from code review 2016-02-29 18:42:48 -08:00
Victor Woeltjen
0a5097a945 Merge pull request #642 from nasa/open460 
[Build] Move to npm-based build
 2016-02-08 12:21:01 -08:00
Henry
5292b27e7d [Notifications] #499 All notifications now dismissable by default. 
jslint
 2016-02-05 17:51:31 -08:00
Victor Woeltjen
73324ce338 [Build] Update run-time licenses 
Update licensing info shown in run-time Licenses page
available form About dialog.
 2016-02-03 17:32:16 -08:00
Victor Woeltjen
aebae27391 [Tests] Remove suite.json files 
Remove obsolete suite.json files; #482
 2016-02-02 09:35:50 -08:00
Victor Woeltjen
c3f819fa8c [Build] Begin adding build info 2016-01-28 17:08:02 -08:00
Victor Woeltjen
3a4f6a7229 [Build] Update dependency references 
...to reflect movement of third-party libraries to
bower_components.
 2016-01-28 11:18:57 -08:00
Victor Woeltjen
7a160a0a98 [Build] Remove third-party libraries 2016-01-28 11:13:11 -08:00
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
Victor Woeltjen
64607b8e56 [Creation] Remove errant comments 2015-11-06 15:47:33 -08:00
Victor Woeltjen
cb432051dc [Creation] Tweak lazy initialization approach 2015-11-06 14:32:47 -08:00
Victor Woeltjen
c184a9ce7c [Creation] Complete rename of capability 2015-11-06 14:31:26 -08:00
Victor Woeltjen
62e2114349 [Creation] Move test cases 
Move test cases from instantiation capability over to
instantiate service.
 2015-11-06 14:30:39 -08:00
Victor Woeltjen
cca1928b82 [Creation] Use instantiate from objectService 
Use instantiate from DomainObjectProvider, to remove redundant
code around DomainObject instantiation.
 2015-11-06 14:23:34 -08:00
Victor Woeltjen
81b136eab1 [Creation] Use instantiate service 
...from instantiation capability.
 2015-11-06 14:15:22 -08:00
Victor Woeltjen
d059116782 [Creation] Rename creation capability 
...to instantiation, to distinguish from creation (which
typically includes persistence.)
 2015-11-06 14:07:53 -08:00
Victor Woeltjen
bdc99950c6 [Creation] Add instantiate service 
...to allow insantiating domain objects completely
externally from any other domain object. Desired by
code review feedback for nasa/openmctweb#255.
 2015-11-06 13:56:12 -08:00
Victor Woeltjen
06436bb876 [Creation] Use identifierService 
...from CreationCapability.
 2015-11-06 13:10:51 -08:00
Victor Woeltjen
d8f3f0f430 [Persistence] Expose IdentifierService 2015-11-06 13:05:27 -08:00
Victor Woeltjen
177c1874b9 [Persistence] Add identifierService 2015-11-06 13:03:54 -08:00
Victor Woeltjen
d69cf6c6fe [Persistence] Parse out key 
When an identifier is a space-key pair, parse out the key before
persisting.
 2015-11-05 17:58:16 -08:00
Victor Woeltjen
822b4ae96f [Persistence] Report space by identifier 2015-11-05 17:26:48 -08:00
Victor Woeltjen
99f3b986b6 [Creation] Retain space prefix 
Retain space prefix from a parent when creating a new domain object,
if there is a space prefix.
 2015-11-05 17:25:39 -08:00
Victor Woeltjen
fd4c1ea747 [Persistence] Retain original id 
...after parsing out space and key, to aid in assembling
the result of getModels as an object where IDs are keys.
 2015-11-05 17:22:05 -08:00
Victor Woeltjen
944a5a7424 [Persistence] Update JSDoc 2015-11-05 17:16:53 -08:00
Victor Woeltjen
dda2c89a58 [Persistence] Update bunde definition 
...to reflect removal of 'additional persistence spaces'; parse
these out of identifiers instead.
 2015-11-05 17:13:19 -08:00
Victor Woeltjen
c8cfbf5281 [Persistence] Refactor model loading 
...such that ids are only parsed for space/key pairs once.
 2015-11-05 17:11:24 -08:00
Victor Woeltjen
9f383ab101 [Persistence] Parse space from id 
Parse spaces from domain object identifiers, if these have
been specified.
 2015-11-05 17:04:55 -08:00
Victor Woeltjen
3741a02d2a [Creation] Test CreationCapability 2015-11-05 16:15:12 -08:00
Victor Woeltjen
f14cad4a39 [Creation] Add JSDoc 2015-11-05 16:05:29 -08:00
Victor Woeltjen
3f26be885e [Creation] Move uuid 
...into core, since it is used by the Creation capability.
 2015-11-05 15:24:57 -08:00
Victor Woeltjen
7ab318d57b [Creation] Fix method invocation 2015-11-05 15:21:47 -08:00
Victor Woeltjen
474afdf8ef [Creation] Expose creation capability 
...adding usage of  to avoid circular dependencies.
 2015-11-05 15:08:52 -08:00
Victor Woeltjen
3f4ccd93ab [Creation] Add creation capability 
...allowing domain objects to be instantiated in-memory
without persisting them. nasa/openmctweb#215
 2015-11-05 15:05:54 -08:00
Henry
3e7264d6b8 Initial implementation of virtual panel 2015-10-27 17:38:31 -07:00
Pete Richards
fc0bfa77db Merge remote-tracking branch 'github-open/open141' into open141-integration 2015-10-09 09:52:35 -07:00
Pete Richards
8093fcbda1 Merge remote-tracking branch 'github-open/open139c' into open-master 2015-10-09 09:42:22 -07:00
Victor Woeltjen
5520d90984 [Generic Search] Remove comments 
Per code review, nasa/openmctweb#165
 2015-10-05 09:57:46 -07:00
Victor Woeltjen
0d1f3bf87a [Throttle] Update spec 
Conflicts:
	platform/features/layout/test/FixedControllerSpec.js
 2015-09-30 15:48:17 -07:00
Victor Woeltjen
b632926d8e [Search] Fix mutation.listen 
Update mutation.listen to match previous variable
names changes related to nasa/openmctweb#141.
 2015-09-30 13:09:55 -07:00
Victor Woeltjen
ef527df381 [Time Conductor] Fix throttle bug 
Fix a timing/ordering issue in throttle which
allowed some throttled invocations to be ignored.
WTD-1515
 2015-09-29 18:37:44 -07:00
Victor Woeltjen
c2868a4573 [Time Conductor] Allow arguments for throttled functions 
WTD-1515. Ensures that bounds passed in from
the time controller get appropriately captured.
 2015-09-29 18:37:44 -07:00
Victor Woeltjen
866c8882ca [Search] Listen on a global mutation topic 
Listen on a global mutation topic to remove the need to retain
listeners per domain object.
 2015-09-29 11:50:30 -07:00
Victor Woeltjen
f5a4a370f9 [Persistence] Add persisted timestamp 
...to any domain object models loaded from persistence
which do not have one. The presence of this timestamp
is necessary for the persistence capability to determine
whether an object should be created or updated when a
request to persist is made. nasa/openmctweb#139.
 2015-09-25 11:47:59 -07:00
Victor Woeltjen
6bd8e7a47c Merge remote-tracking branch 'github/master' into open1515 2015-09-24 11:17:13 -07:00
Pete Richards
70bc17c79f Merge remote-tracking branch 'github-open/open97' into open-master 2015-09-23 13:44:48 -07:00
Victor Woeltjen
411a4ebfbf Merge remote-tracking branch 'github/master' into mobile 2015-09-17 16:41:13 -07:00
Victor Woeltjen
cc3b0ecfca Merge branch 'open-master' into mobile 
Merge in latest from master branch into mobile branch
 2015-09-17 16:40:48 -07:00
Victor Woeltjen
d92ae4d508 [Core] Add tests for 'contextualize' 2015-09-17 14:06:22 -07:00
Victor Woeltjen
bc4c7feb6c [Core] Update spec for CompositionCapability 
...to reflect changes to separate out contextualization
of domain objects
 2015-09-17 13:57:20 -07:00
Victor Woeltjen
a233856bac [Core] Separate out contextualize 
Separate out contextualize function to facilitate
reuse from entanglement bundle. nasa/openmctweb#84
 2015-09-17 13:15:42 -07:00
Victor Woeltjen
190f5fd0ea [Time Conductor] Update failing specs 
WTD-1515
 2015-09-16 15:23:08 -07:00
Victor Woeltjen
071368c3b9 [Time Conductor] Fix throttle bug 
Fix a timing/ordering issue in throttle which
allowed some throttled invocations to be ignored.
WTD-1515
 2015-09-16 11:04:07 -07:00
Victor Woeltjen
f776561303 [Time Conductor] Allow arguments for throttled functions 
WTD-1515. Ensures that bounds passed in from
the time controller get appropriately captured.
 2015-09-16 10:18:57 -07:00
Victor Woeltjen
ecf7f4b235 [Info Bubble] Remove ID 
Don't show domain object id in info bubble; this is not
useful information to non-developers. (For developers,
this information can be retrieved from the URL by
navigating to a domain object.) WTD-1252
 2015-09-11 16:29:20 -07:00
Victor Woeltjen
f17410a85b [Capabilities] Avoid erroneous logging 
Fix logic error which caused an inaccurate warning to
be logged when capabilities are overridden by priority.
Addresses #49.
 2015-09-11 11:38:22 -07:00
Victor Woeltjen
17e9e87a2b [Composition] Test composition.add 
Add test case to verify the behavior of the add method
of the composition capability.
 2015-09-02 11:56:37 -07:00
Victor Woeltjen
b2649de649 [Composition] Update specs 
Update specs for changes to the return value of
composition.add, nasa/openmctweb#97
 2015-09-02 11:45:52 -07:00
Victor Woeltjen
b1238b0c96 [Composition] Return newly-contextualized object 
After adding to composition, return the newly-contextualized
object; this is regularly used by other services.
 2015-09-02 11:37:47 -07:00
Victor Woeltjen
ba6e542d08 [Persistence] Load models from multiple spaces 2015-09-02 11:28:15 -07:00
Victor Woeltjen
d3d94d67ea [Composition] Use composition.add from LinkService 2015-09-02 09:16:58 -07:00
Victor Woeltjen
b9d8b124ff [Composition] Use composition.add from link action 2015-09-02 09:08:47 -07:00
Victor Woeltjen
194bc41322 [Composition] Add an add method 
Add a method to add new objects to the composition of
another domain object. nasa/openmctweb#97
 2015-09-01 17:10:54 -07:00
Shivam Dave
8a5c61e2e6 Merge remote-tracking branch 'upstream/master' into mobile 2015-09-01 14:50:45 -07:00
Victor Woeltjen
c3efb29dfc [Metadata] Fix whitespace 2015-09-01 11:31:42 -07:00
Victor Woeltjen
e4d136d345 [Persistence] Update spec 
Update spec for persistence capability to reflect changes for
nasa/openmctweb#92
 2015-08-28 15:46:06 -07:00
Victor Woeltjen
620c0415cf [Persistence] Use create from persistence capability 
...when an object hasn't been previously persisted. This allows
for compatibility with persistence services which disallow
updates for nonexistent objects (which is not abnomal behavior.)
nasa/openmctweb#92
 2015-08-28 15:45:48 -07:00
Shivam Dave
def5e17bb8 [Mobile] Merge 
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
 2015-08-26 14:07:52 -07:00
Charles Hacskaylo
f80266b23f [Mobile] IN PROGRESS: Styling in forms, overlay and tree 
open #74
.section-header and form-row styles changed in forms/_elems.scss;
significant changes to overlay in mobile: full-screen, close button, more;
tree hover bg changed to use rgba(#fff, 0.1);
removed "Hide title by default" in core/bundle.json;
 2015-08-26 12:34:45 -07:00
Charles Hacskaylo
07d0706cd1 [Mobile] IN PROGRESS: 
open #74
Added name for "base" (unknown) type in core/bundle.json;
Fixes to grid-item .details element:
- ellipsize,
- type now displayed properly;
- number of items with correct plural syntax;
 2015-08-25 14:17:34 -07:00
Charles Hacskaylo
5184e08a5b [Mobile] IN PROGRESS: Tweak to TypeImpl to return glyph for unknown types 
open #74
Thanks Victor!;
 2015-08-24 16:45:55 -07:00
Pete Richards
f1ca9ff15e Merge remote-tracking branch 'origin/open1334' into open1416 2015-08-24 11:55:27 -07:00
Victor Woeltjen
f27e4d6e06 Merge branch 'open-master' into open1482c 
Merge in latest in preparation to merge; WTD-1482

Conflicts:
	platform/commonUI/browse/src/creation/CreationService.js
	platform/core/src/models/RootModelProvider.js
	platform/entanglement/src/services/LinkService.js
	platform/entanglement/src/services/MoveService.js
 2015-08-19 15:00:52 -07:00
Pete Richards
c118234bbf [Style] Brace after if criteria 2015-08-19 13:55:02 -07:00
Pete Richards
5c74365f4b [Root] Root model provider sets location 
Root model provider sets the location of roods so that the location
capability does not need special handling for this.
 2015-08-19 11:49:03 -07:00
Victor Woeltjen
5e4dcc1e35 [Code Style] Fix typo 
Fix typo in JSDoc annotation, WTD-1482
 2015-08-11 14:53:45 -07:00
Victor Woeltjen
c450c22ddd [Code Style] Satisfy JSLint 
Add missing semicolons etc. to satisfy JSLint after
changes for WTD-1482.
 2015-08-11 13:03:06 -07:00
Victor Woeltjen
b7765ff388 [Code Style] Use prototypes in platform 
WTD-1482
 2015-08-11 12:57:31 -07:00
Victor Woeltjen
a77920bd18 [Code Style] Use prototypes in Browse bundle 
WTD-1482.
 2015-08-10 11:52:23 -07:00
Victor Woeltjen
a7a1ac70e5 [JSDoc] Remove obsolete module references 
WTD-1482.
 2015-08-07 12:14:40 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs 
WTD-1482.
 2015-08-07 12:13:15 -07:00
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references 
WTD-1482
 2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
Pete Richards
cb56bbe569 [Documentation] Fix JSDoc syntax errors 2015-07-21 14:30:00 -07:00
Victor Woeltjen
cc470f671a [Core] Test missing model decorator 
WTD-1334.
 2015-06-30 10:14:26 -07:00
larkin
38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338 
Resolve merge conflicts due to whitespace changes.
 2015-06-29 12:08:16 -07:00
larkin
e582092844 [Comments] Add missing space 2015-06-26 15:23:22 -07:00