Charles Hacskaylo
9811443c71
Merge branch 'master' into open117
2015-09-23 15:54:48 -07:00
Victor Woeltjen
7dc13dab66
[Readme] Add link to node-canvas
2015-09-23 14:37:49 -07:00
Victor Woeltjen
e67a2e63cf
[Readme] Add notes on building documentation
...
Add notes to README about building documentation; in
particular, document the need to install libcairo.
2015-09-23 13:59:05 -07:00
Pete Richards
6ce4ce6ada
Merge remote-tracking branch 'github-open/open139-1' into open-master
2015-09-23 13:51:55 -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
f3aceb1644
Merge pull request #118 from nasa/open95b
...
Review and integrate open95b into master
2015-09-23 13:06:42 -07:00
Victor Woeltjen
056b0c8c5b
[Fixed Position] Use spaces instead of tabs
...
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
2015-09-23 12:59:04 -07:00
Victor Woeltjen
fa60d62039
[Entanglement] Simplify test case
...
...per review feedback from nasa/openmctweb#98
2015-09-23 12:49:04 -07:00
Victor Woeltjen
082122ddec
[Entanglement] Move policyService.allow.andReturn
...
...to locations where the specified return value
can be more closely correlated to the relevant
test cases. nasa/openmctweb#98
2015-09-23 12:46:23 -07:00
Victor Woeltjen
6dbccd5000
[Entanglement] Update test cases around error-throwing
...
...per code review feedback, nasa/openmctweb#97
2015-09-23 12:43:03 -07:00
Charles Hacskaylo
fb0861f256
[Config] Fixed image URLs in ImageTelemetry.js;
...
open #95b
2015-09-23 09:57:19 -07:00
Victor Woeltjen
dbe1875e70
[Themes] Resolve conflicts
...
Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:12:44 -07:00
Victor Woeltjen
97892869ae
[Entanglement] Move composition check up
...
Move check for composition up higher in the sequence of
if-blocks in the validation step of linking; remove
fallback to [] for undefined composition, which is no
longer necessary as a consequence of this.
nasa/openmctweb#98
2015-09-22 15:53:27 -07:00
Victor Woeltjen
8db334e45b
Revert "[LinkService] Reorder/refactor validation"
...
This reverts commit c17269ba8b
2015-09-22 15:51:15 -07:00
Victor Woeltjen
4743833f7c
[Entanglement] Verify revalidation
...
Verify that move/copy/link revalidate when performed and
throw errors when moving/copying/linking would be invalid.
nasa/openmctweb#98
2015-09-22 15:49:22 -07:00
Victor Woeltjen
6996883b85
[Entanglement] Update specs
...
Update specs for move/copy/link services to account
for re-validation at time an action is performed.
nasa/openmctweb#98
2015-09-22 15:42:39 -07:00
Victor Woeltjen
119403e71c
[Entanglement] Throw errors if validation is skipped
...
...per feedback from nasa/openmctweb#98
2015-09-22 14:39:15 -07:00
Victor Woeltjen
ff24f06475
[Entanglement] Add JSDoc
...
...per feedback from nasa/openmctweb#98
2015-09-22 14:10:06 -07:00
Victor Woeltjen
597b18af1c
[LinkService] Amend test cases
...
Remove redundant test case; modify composition-checking
test case to expose correct capability information.
In response to feedback from nasa/openmctweb#98
2015-09-22 14:07:46 -07:00
Pete Richards
aba0969312
Merge branch 'mobile-integration' into open-master
2015-09-22 13:53:22 -07:00
Victor Woeltjen
b4a2bfd727
[LinkService] Change variable name
...
...based on feedback from nasa/openmctweb#98
2015-09-22 13:50:10 -07:00
Pete Richards
2040304980
Merge remote-tracking branch 'github-open/open19' into open-master
2015-09-22 13:49:41 -07:00
Victor Woeltjen
55362f6b26
[LinkService] Clarify comment
...
Clarify comment, based on feedback from nasa/openmctweb#98
2015-09-22 13:48:11 -07:00
Pete Richards
8611926533
Merge remote-tracking branch 'github-open/open113' into open-master
2015-09-22 13:45:04 -07:00
Victor Woeltjen
c17269ba8b
[LinkService] Reorder/refactor validation
...
Reoder validation to consider the composition capability
first; refactor to express as a single expression to clarify
validation logic (explicitly say 'and' instead of implying
it with control flow.)
Based on feedback from nasa/openmctweb#98
2015-09-22 13:37:56 -07:00
Victor Woeltjen
56ccf29cfe
[Persistence] Include timestamp on creation
...
Include a persisted timestamp when an object is first
created. nasa/openmctweb#139
2015-09-22 11:32:18 -07:00
Pete Richards
8b7a94dcf8
[Style] Remove unused variables, excess whitespace
...
Clean up unused variables and excess whitespace to match style guide.
2015-09-22 11:14:55 -07:00
Pete Richards
3e5d294a28
[SCSS] Fixed typo
...
Changed tmpBorder mixin to specify '@include' instead of '@iclude'. This
does not change the output CSS which means the tmpBorder mixin is not
used anywhere and could be removed.
2015-09-22 10:57:30 -07:00
Pete Richards
480da3476e
Merge branch 'mobile' into mobile-integration
2015-09-22 10:55:43 -07:00
Charles Hacskaylo
54334a8906
[Frontend] Setting default theme for open back to espresso
...
open #95b
Also removed unused COMPILE.scss file;
2015-09-21 14:26:50 -07:00
Charles Hacskaylo
c9b2f5804d
[Frontend] Minor tweaks to sizing of controls
...
open #95b
View switcher and plot control buttons now made small
when object is in a frame context in a Layout;
2015-09-21 14:24:19 -07:00
Victor Woeltjen
0c1f77cfab
[Mobile] Collapse tree on click
...
Collapse tree any time a user does an action in the
tree that would select an object; don't only do this
on navigation changes, because this fails to detect
occasions where user clicks the already-navigated-to
object.
2015-09-21 10:53:45 -07:00
Victor Woeltjen
ae4313253c
[Mobile] Test mct-device
2015-09-18 16:47:50 -07:00
Victor Woeltjen
1e6c4732f1
[Mobile] Consolidate BrowseTreeController
...
Make mobile variant of BrowseTreeController the regular version
of that controller; Browse mode has a dependency on mobile by
way of the mct-device directive anyway.
2015-09-18 15:55:58 -07:00
Victor Woeltjen
884d36ad6d
[Mobile] Test BrowseTreeController variants
2015-09-18 15:49:55 -07:00
Victor Woeltjen
24586ae378
[Mobile] Remove BackArrowController
...
Remove BackArrowController; behavior can be implemented
in template.
2015-09-18 15:29:55 -07:00
Victor Woeltjen
cf97b30084
[Mobile] Add empty specs
2015-09-18 15:21:23 -07:00
Victor Woeltjen
e86e61c2ac
[Mobile] Fix test setup error
...
Use correct user agent strings for iPhone/iPad
(these had been reversed in the spec.)
2015-09-18 15:12:48 -07:00
Victor Woeltjen
b163b45a5e
[Framework] Update spec
...
Update spec to verify that app.controller et al
are not called multiple times with the same key.
2015-09-18 15:10:21 -07:00
Victor Woeltjen
d236fd10c3
[Framework] Move registration-tracking
...
Move registration-tracking for Angular built-ins such that
these are correctly tracked at the instance level.
2015-09-18 15:02:32 -07:00
Victor Woeltjen
befa66a9e2
[Mobile] Remove obsolete test cases
...
...for functionality that has been moved out of TreeNodeController.
2015-09-18 14:54:37 -07:00
Victor Woeltjen
5a1c83fca8
[Mobile] Update spec for AgentService
2015-09-18 14:53:14 -07:00
Victor Woeltjen
88bb213162
[Mobile] Move spec for AgentService
2015-09-18 14:34:14 -07:00
Victor Woeltjen
ad552511c1
Merge pull request #134 from nasa/open124
...
Review and integrate open124
2015-09-18 13:49:06 -07:00
Charles Hacskaylo
65368ed0c3
[Config] Removed non-functional config options from Create dialogs;
...
open #124
Removed "Default view" and "Display title by default" from
Panel configs;
2015-09-18 13:43:29 -07:00
Victor Woeltjen
bf05e55d02
[Mobile] Use mct-device in tree nodes
2015-09-18 12:25:51 -07:00
Victor Woeltjen
c057ba38a5
[Mobile] Add mct-device directive
...
Add directive which can be used to include certain elements
only on specific devices.
2015-09-18 12:13:37 -07:00
Victor Woeltjen
70bcb723ef
[Mobile] Small tweaks/bug fixes
...
Small tweaks/fixes (use appropriate variable names etc) for
refactoring mobile support classes.
2015-09-18 12:13:05 -07:00
Victor Woeltjen
4c5808c8c9
[Mobile] Move mobile-specific behavior to template
2015-09-18 11:01:54 -07:00
Victor Woeltjen
fa186a1556
[Mobile] Update agentService usages
2015-09-18 10:07:27 -07:00
