ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 05:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
dbf196e014
openmct/platform
History
Victor Woeltjen dbf196e014 Merge remote-tracking branch 'github/master' into open477 
Resolve conflicts to complete merge of #477

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
2016-01-27 12:53:46 -08:00
..
commonUI Merge remote-tracking branch 'github/master' into open477 2016-01-27 12:53:46 -08:00
containment Regenerated bundles 2016-01-14 17:08:19 -08:00
core Fixed Outstanding issues from merge 2016-01-14 18:51:53 -08:00
data [Structure] Add platform structure 2014-10-27 18:18:50 -07:00
entanglement [Copy] #497 Removed extraenuous persist call 2016-01-22 11:32:20 -08:00
execution Regenerated bundles 2016-01-14 17:08:19 -08:00
features Merge remote-tracking branch 'github/master' into open477 2016-01-27 12:53:46 -08:00
forms Fixed failing MCTToolbarSpec 2016-01-14 19:22:33 -08:00
framework Merge remote-tracking branch 'github/master' into open477 2016-01-27 12:53:46 -08:00
identity Regenerated bundles 2016-01-14 17:08:19 -08:00
persistence Regenerated bundles 2016-01-14 17:08:19 -08:00
policy Regenerated bundles 2016-01-14 17:08:19 -08:00
representation Fixing bundle load issues 2016-01-14 17:32:59 -08:00
search Regenerated bundles 2016-01-14 17:08:19 -08:00
status Regenerated bundles 2016-01-14 17:08:19 -08:00
telemetry Regenerated bundles 2016-01-14 17:08:19 -08:00
README.md [Structure] Add platform structure 2014-10-27 18:18:50 -07:00

README.md

This directory contains all bundles for the Open MCT Web platform, as well as the framework which runs them.