fc0bfa77db
Merge remote-tracking branch 'github-open/open141' into open141-integration
2015-10-09 09:52:35 -07:00
8093fcbda1
Merge remote-tracking branch 'github-open/open139c' into open-master
2015-10-09 09:42:22 -07:00
5520d90984
[Generic Search] Remove comments
...
Per code review, nasa/openmctweb#165
2015-10-05 09:57:46 -07:00
0d1f3bf87a
[Throttle] Update spec
...
Conflicts:
platform/features/layout/test/FixedControllerSpec.js
2015-09-30 15:48:17 -07:00
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
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
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
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
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
6bd8e7a47c
Merge remote-tracking branch 'github/master' into open1515
2015-09-24 11:17:13 -07:00
70bc17c79f
Merge remote-tracking branch 'github-open/open97' into open-master
2015-09-23 13:44:48 -07:00
411a4ebfbf
Merge remote-tracking branch 'github/master' into mobile
2015-09-17 16:41:13 -07:00
cc3b0ecfca
Merge branch 'open-master' into mobile
...
Merge in latest from master branch into mobile branch
2015-09-17 16:40:48 -07:00
d92ae4d508
[Core] Add tests for 'contextualize'
2015-09-17 14:06:22 -07:00
bc4c7feb6c
[Core] Update spec for CompositionCapability
...
...to reflect changes to separate out contextualization
of domain objects
2015-09-17 13:57:20 -07:00
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
190f5fd0ea
[Time Conductor] Update failing specs
...
WTD-1515
2015-09-16 15:23:08 -07:00
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
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
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
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
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
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
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
ba6e542d08
[Persistence] Load models from multiple spaces
2015-09-02 11:28:15 -07:00
d3d94d67ea
[Composition] Use composition.add from LinkService
2015-09-02 09:16:58 -07:00
b9d8b124ff
[Composition] Use composition.add from link action
2015-09-02 09:08:47 -07:00
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
8a5c61e2e6
Merge remote-tracking branch 'upstream/master' into mobile
2015-09-01 14:50:45 -07:00
c3efb29dfc
[Metadata] Fix whitespace
2015-09-01 11:31:42 -07:00
e4d136d345
[Persistence] Update spec
...
Update spec for persistence capability to reflect changes for
nasa/openmctweb#92
2015-08-28 15:46:06 -07:00
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
def5e17bb8
[Mobile] Merge
...
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
2015-08-26 14:07:52 -07:00
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
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
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
f1ca9ff15e
Merge remote-tracking branch 'origin/open1334' into open1416
2015-08-24 11:55:27 -07:00
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
c118234bbf
[Style] Brace after if criteria
2015-08-19 13:55:02 -07:00
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
5e4dcc1e35
[Code Style] Fix typo
...
Fix typo in JSDoc annotation, WTD-1482
2015-08-11 14:53:45 -07:00
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
b7765ff388
[Code Style] Use prototypes in platform
...
WTD-1482
2015-08-11 12:57:31 -07:00
a77920bd18
[Code Style] Use prototypes in Browse bundle
...
WTD-1482.
2015-08-10 11:52:23 -07:00
a7a1ac70e5
[JSDoc] Remove obsolete module references
...
WTD-1482.
2015-08-07 12:14:40 -07:00
31eb366e7f
[JSDoc] Add namespace docs
...
WTD-1482.
2015-08-07 12:13:15 -07:00
eaaa1a19ca
[JSDoc] Remove obsolete module references
...
WTD-1482
2015-08-07 11:55:38 -07:00
c08a460d30
[JSDoc] Add annotations
...
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
cb56bbe569
[Documentation] Fix JSDoc syntax errors
2015-07-21 14:30:00 -07:00
cc470f671a
[Core] Test missing model decorator
...
WTD-1334.
2015-06-30 10:14:26 -07:00