ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 14:07:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,699 Commits 989 Branches 212 Tags 191 MiB
04b8326900
Commit Graph

3675 Commits

Author SHA1 Message Date
Victor Woeltjen
53974bd69a Merge branch 'subobject-selection-1126' into api-1124b 
Conflicts:
	bower.json
	index.html
	main.js
	src/openmct.js
 2016-09-29 10:54:08 -07:00
Victor Woeltjen
ed8d331cd3 [API] Merge in latest from master 2016-09-29 10:47:52 -07:00
Victor Woeltjen
7d950d067c Merge pull request #1194 from hudsonfoo/open1184 
[Frontend] Add notes property to all item types
 2016-09-27 15:28:49 -07:00
Victor Woeltjen
db41f6e64f [Selection] Obey priority order 2016-09-23 15:19:16 -07:00
Andrew Henry
e3e7bd27e9 Merge pull request #1203 from nasa/open1202 
[Frontend] Removed Export buttons from objects when in a Layout
 2016-09-23 10:20:47 -07:00
Andrew Henry
f6ed0e8ab6 Merge pull request #1178 from hudsonfoo/open1168 
[Frontend] Delay visibility of progress bar
 2016-09-23 10:10:09 -07:00
Henry
98f387b605 [Edit Mode] Renamed function from EditAction.cancel() to EditAction.finish() 2016-09-22 17:34:53 -07:00
Henry
275dda820b Merge branch 'mct588comm' of https://github.com/BogdanAlexandru/openmct into BogdanAlexandru-mct588comm 2016-09-22 17:33:42 -07:00
Henry
7a94efccbf [Edit Mode] Fixed spelling mistake, moved variable declaration 2016-09-22 11:04:04 -07:00
Charles Hacskaylo
3c72eea9ef [Frontend] Removed export buttons from objects when in layout 
Fixes #1202
CSS modded
 2016-09-22 10:41:14 -07:00
Henry
3548cde9c4 [Edit Mode] Fixed issue with save dialog not being displayed for new objects after mutation. Fixes 1080 2016-09-21 16:12:09 -07:00
Alex M
0c27a5f361 [Edit] Remove CreationService dep from SaveAs 2016-09-19 23:52:30 +03:00
Alex M
abfabc85b5 [Edit] Fix edit-action-buttons indent 2016-09-19 20:41:50 +03:00
Alex M
e08704e6d3 [Edit] Make checkstyle happy 2016-09-19 20:39:54 +03:00
Alex M
f60fc2ebad [Edit] EditorCapability.finish returns domainObj 2016-09-19 20:33:12 +03:00
Alex M
b50278e92f [Edit] Remove mocked unused UrlService 2016-09-19 20:22:46 +03:00
David Hudson
56267095cb [Forms] Add style for small textareas 
Issue #1184. This allows for a generically sized text area in forms. I am
anticipating some potential feedback on this given the approach and the sizing
I chose may or may not be ideal for your requirements.
 2016-09-18 01:47:07 +09:00
David Hudson
f9ce27def3 [Frontend] Add attributes for storing notes 
Issue #1184
 2016-09-18 01:27:12 +09:00
David Hudson
4429e847e8 [Properties] Add notes field to all item types 
Issue #1184
 2016-09-18 01:18:26 +09:00
David Hudson
56e321f6d9 [Forms] Add textarea template 
Issue #1184
 2016-09-18 01:18:02 +09:00
David Hudson
e135ed26f0 [Frontend] Shorten overlay fade duration 
Issue #1168
 2016-09-17 16:36:55 +09:00
David Hudson
48b25fe842 [Formatting] Remove double negative logic 
Issue #1168
 2016-09-17 16:32:26 +09:00
Alex M
5ef6617062 [Edit] Rename action to Save and Finish Editing 2016-09-17 01:05:46 +03:00
Alex M
ae89dcd62d [Edit] Make single save button use mct-control 2016-09-17 00:39:49 +03:00
steven mirecki
f9597fe799 Merge branch 'master' of https://github.com/nasa/openmct 2016-09-16 17:16:35 -04:00
smirecki
0ec27350e0 Update TimelineTickController.js 
One correction by @akhenry, "region, not reign".
 2016-09-16 16:50:11 -04:00
Alex M
2a2e9ef99d [Edit] Make linter happy 2016-09-16 03:24:00 +03:00
Alex M
1446b16e77 [Edit] Using spy objects as save action mocks 2016-09-16 03:15:10 +03:00
Alex M
f03003b366 [Edit] Fix CreateActionSpec 2016-09-15 23:18:53 +03:00
Alex M
d3db26499c [Edit] CreateAction needs to perform("save-as") 2016-09-15 23:14:12 +03:00
Alex M
d1f67fd8b9 [Edit] Introduce dropdown Save menu 
And fix style issues in SaveAsActionSpec
 2016-09-15 22:40:02 +03:00
Alex M
31ee92b711 [Edit] Remove editor.cancel from SaveActionSpec 2016-09-15 20:39:02 +03:00
Alex M
1ea7fa3084 [Edit] SaveAsAction tests cover save and finish 2016-09-15 20:28:29 +03:00
Alex M
d8dc3c8445 Merge branch 'master' into mct588comm 2016-09-14 19:50:19 +03:00
Alex M
0be84a4e51 [Edit] CreateAction closes editor after save 2016-09-13 23:59:28 +03:00
Alex M
d87ed1414e [Edit] Update EditorCapability comments 2016-09-13 22:36:27 +03:00
Alex M
4382745012 [Edit] Final two actions now use finish() 2016-09-13 22:35:11 +03:00
Alex M
79b16ddda6 [Edit] SaveAs now calls finish() 2016-09-13 21:24:20 +03:00
David Hudson
6c9bd0b510 Merge branch 'master' of github.com:nasa/openmct into open1168 2016-09-13 16:39:31 +09:00
David Hudson
2740b6f957 [Frontend] Add optional delay parameter to dialog service 
Issue #1168
 2016-09-13 16:36:25 +09:00
David Hudson
ea35395d7e Merge branch 'master' of github.com:nasa/openmct into open1168 2016-09-13 02:47:16 +09:00
David Hudson
bad901a162 [Typo] Add reference to self 
Issue #967
 2016-09-12 17:06:23 +09:00
David Hudson
bb34528a86 [Testing] Add tests to ensure correct image type 
Issue #967
 2016-09-12 17:00:28 +09:00
David Hudson
487ec7907c [Formatting] Fix missing space 
Issue #967
 2016-09-12 16:59:39 +09:00
David Hudson
3093ab8067 [Testing] Convert blob to proper format. Inject FileReader. 
Issue #967
 2016-09-12 16:58:21 +09:00
David Hudson
0f1d685ae6 Merge branch 'master' of github.com:nasa/openmct into open967 2016-09-12 15:46:04 +09:00
David Hudson
24cb72e5b5 [Frontend] Delay visibility of progress bar 
Resolves #1168
 2016-09-12 15:28:04 +09:00
Andrew Henry
4c6ca58c95 Merge pull request #1157 from TypicalFooBar/843 
[Context Menu] New Tab button available in edit mode. #843
 2016-09-11 21:21:49 -07:00
David Hudson
d62989bc5d [Formatting] Rename export image service key 
Issue #1164
 2016-09-10 03:18:46 +09:00
David Hudson
8e39da6726 [Formatting] Rename export image service key 
Issue #1164
 2016-09-10 03:12:00 +09:00