ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-05-07 11:08:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,017 Commits 1,004 Branches 217 Tags
Commit Graph

5 Commits

Author SHA1 Message Date
Charles Hacskaylo
69f4b4975e Merge branch 'open-master' into open1170b 
Conflicts:
	platform/commonUI/general/res/sass/plots.scss
	platform/commonUI/inspect/src/InfoConstants.js
	platform/features/imagery/src/policies/ImageryViewPolicy.js
	platform/features/static-markup/res/markup.html
 2015-06-18 09:55:26 -07:00
Charles Hacskaylo
1587e66d9e [Frontend] Added local zoom/reset controls 
WTD-1222
Refactored scss in plots-main slightly;
Removed unused sass/plots.scss;
 2015-06-08 15:24:17 -07:00
Charles Hacskaylo
03252aac1b [Frontend] Ported over all /platform changes from warp1222 
WTD-1222
 2015-06-08 13:50:54 -07:00
Charles Hacskaylo
6fe6aacc38 Added open source comment 2015-06-03 10:25:37 -07:00
Charles Hacskaylo
b022babedb Adding static-markup bundle. 2015-06-03 10:23:49 -07:00