openmct

mirror of https://github.com/nasa/openmct.git synced 2025-02-01 00:45:41 +00:00

History

slhale 7e837c266d Merge branch 'master' of https://github.com/nasa/openmctweb into open73

Conflicts:
	platform/commonUI/browse/res/templates/browse.html

2015-08-25 14:59:13 -07:00

commonUI

Merge branch 'master' of https://github.com/nasa/openmctweb into open73

2015-08-25 14:59:13 -07:00

containment

[Code Style] Satisfy JSLint

2015-08-11 13:03:06 -07:00

core

Merge remote-tracking branch 'origin/open1334' into open1416

2015-08-24 11:55:27 -07:00

data

[Structure] Add platform structure

2014-10-27 18:18:50 -07:00

entanglement

Merge branch 'open-master' into open1482c

2015-08-19 15:00:52 -07:00

execution

[Code Style] Use prototypes for execution bundle

2015-08-11 15:02:52 -07:00

features

[Imagery] Start off with empty timestamp

2015-08-24 09:39:42 -07:00

forms

[Code Style] Use prototypes in forms bundle

2015-08-14 13:44:08 -07:00

framework

[Code Style] Use prototypes in framework layer

2015-08-14 14:50:48 -07:00

identity

[Structure] Add platform structure

2014-10-27 18:18:50 -07:00

persistence

Merge branch 'master' of https://github.com/nasa/openmctweb into search

2015-08-24 13:14:43 -07:00

policy

[Code Style] Use prototypes in policy bundle

2015-08-14 15:49:47 -07:00

representation

[Code Style] Fix merge error

2015-08-17 16:57:46 -07:00

Merge branch 'master' of https://github.com/nasa/openmctweb into search

2015-08-24 13:14:43 -07:00

telemetry

[Code Style] Use prototypes in telemetry bundle

2015-08-14 16:55:17 -07: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.