Commit Graph

388 Commits

Author SHA1 Message Date
Pete Richards
78374f8241 Merge branch 'open401' 2016-03-01 10:37:12 -08:00
Pete Richards
bc6185f76d [Browse] Remove unused constant
https://github.com/nasa/openmctweb/issues/401
2016-03-01 10:36:30 -08:00
Victor Woeltjen
bf1fa0ac4c [Templates] Include templates using text plugin
Resolves #673
2016-02-26 13:07:50 -08:00
Victor Woeltjen
d3e274bfdd Merge branch 'master' into open401
Resolve conflicts for #416

Conflicts:
	platform/commonUI/browse/bundle.json
	platform/commonUI/browse/src/BrowseController.js
2016-02-22 14:27:21 -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
Victor Woeltjen
b0e4947bf0 Merge pull request #500 from nasa/open480
[New Edit Mode] Adding sub objects to Timelines
2016-02-08 11:59:54 -08:00
Victor Woeltjen
5d4ace64cb Merge pull request #625 from nasa/open491
[Create] #491 Apply default context root in Locator when none available from object
2016-02-05 17:30:22 -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
967f8c9151 [Build] Update remaining library references 2016-01-28 11:25:44 -08:00
Victor Woeltjen
84ecfd3527 [Build] Remove remaining files in libs 2016-01-28 11:21:08 -08:00
Henry
54653f3914 [Create] #491 Locator is not visible when creating a new object where selected object does not have location
Added additional test for default context

Fixed JSLint error
2016-01-21 16:35:18 -08:00
Henry
cd2b19eb1e [New Edit Mode] Fixed failing tests, and added new test in CreateWizard
[New Edit Mode] #480 fixed JSLint errors

[New Edit Mode] #480 do not show locator for sub objects

[New Edit Mode] Modified persistence in SaveAction

Removed redundant variable

Fixed Failing Test

Fixed JSLint errors

Improved some documentation
2016-01-21 12:01:38 -08:00
Henry
c65096f166 [New Edit Mode] Added AddAction, modified EditableDomainObject to properly wrap inherited functions, added new EditableInstantiationCapability 2016-01-20 18:49:39 -08:00
Charles Hacskaylo
2d44cf78f9 [Frontend] Fixed HTML and CSS for grid-item
open #486
Normalized grid-item to use similar HTML structure
as label template;
Fixed CSS accordingly.
2016-01-15 15:33:10 -08:00
Henry
7a563b80ee Fixing bundle load issues 2016-01-14 17:32:59 -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
Charles Hacskaylo
898dd557e5 [Frontend] Refactor to use s-status-editing instead of ng-class
open #468
Remove ng-class statements in favor of upstream .s-status-editing;
Restructure CSS accordingly;
NOTE: because edit.html has NOT been changed,
changes here will cause old edit mode to no longer display properly.
Don't integrate this CSS with old edit mode!
2016-01-08 16:11:00 -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
Victor Woeltjen
5bbbdd4e50 [API] Fix explicit implementation assignments 2016-01-07 15:01:57 -08:00
Victor Woeltjen
612dd7db2c [API] Expose browse through legacy registry 2016-01-06 17:54:56 -08:00
Henry
cf73f3a0c4 Moved gesture from individual views up to browse-object.html for now to resolve #423 2015-12-11 16:42:05 -08:00
Victor Woeltjen
43f6981ba1 [Browse] Test navigation when path is not found 2015-12-11 13:21:52 -08:00
Victor Woeltjen
b8206b8824 [Browse] Ensure selection at startup
...even when domain object identified by default path is
not found.
2015-12-11 13:18:25 -08:00
Victor Woeltjen
5f7f349f29 [Browse] Specify default selection in a constant
https://github.com/nasa/openmctweb/issues/401
2015-12-11 12:31:06 -08:00
Henry
ac379dbb3f [New Edit Mode] Create menu still visible when edit mode initiated by pressing create #407 2015-12-10 10:25:38 -08:00
Henry
5fd762fea9 Fixed problem with unload warning being shown when it shouldn't 2015-12-09 21:04:22 -08:00
Henry
322db5a0f5 Tweaked object creation 2015-12-09 20:57:23 -08:00
Henry
708aa7dcba Updated check for edit mode on create 2015-12-09 20:37:15 -08:00
Henry
2ca414d2a4 [New Edit Mode] Selecting 'Go To Original' from elements pool navigates without prompting user to save changes #396 2015-12-09 15:23:26 -08:00
Henry
856c61816c Go to original now shows prompt 2015-12-09 14:08:19 -08:00
Henry
6058e50216 JSLint fixes 2015-12-09 10:04:49 -08:00
Henry
aae8f1575d Disabled drop gesture on browse-object to prevent drop being triggered twice 2015-12-08 16:28:30 -08:00
Henry
4419a101d6 [New Edit Mode] #199 Disabled all failing tests 2015-12-08 15:15:54 -08:00
Henry
4b7287e51e Fixed JSLint errors 2015-12-08 14:51:25 -08:00
Henry
4fbf547bfc Corrected merge issues from Master 2015-12-08 14:07:32 -08:00
Henry
18607e9404 Merged from Master 2015-12-07 20:42:09 -08:00
Henry
f8099550bd [Copy] #338 updated code style in CreationPolicy 2015-12-03 16:22:45 -08:00
Henry
8e3c5db3bf #338 fixed incorrect 'allow' function specification in CreationPolicy 2015-12-02 14:14:04 -08:00
Henry
11d8daf3ed #338 Fixed incorrect specification of CreationPolicy in bundle.json 2015-12-02 14:07:08 -08:00
Henry
fe600de0f7 [Copy] #338 added CreationPolicy and appropriate tests, amended CreateActionProvider, and updated existing tests 2015-12-02 11:28:49 -08:00
Henry
6fb6f54cfa Fixed objects being dropped twice in fixed layout 2015-11-27 15:21:24 -08:00
Henry
c211f413aa [New Edit Mode] Add Elements pool to New Edit Mode #279 2015-11-25 10:40:37 -08:00
Henry
7849803a5d Fixed cancel and drop-initiated edit 2015-11-20 14:00:29 -08:00
Henry
50d83eaffb Merge remote-tracking branch 'origin/open278' into open278-proto 2015-11-19 14:50:01 -08:00
Henry
19d2970e0e Merge in "create button initiates edit mode" 2015-11-19 14:13:28 -08:00
Henry
a04b3f8a4b enabled toolbar in edit mode 2015-11-19 14:01:38 -08:00
Henry
f45e236281 #286 Fixed issues with composition not surviving through create wizard 2015-11-19 13:11:01 -08:00