openmct

mirror of https://github.com/nasa/openmct.git synced 2025-02-21 09:52:04 +00:00

History

Charles Hacskaylo 84b7a9dc2f Merge remote-tracking branch 'origin/open933' into open933-frontend

Fixes #933
Conflicts:
	platform/features/conductor-v2/src/TimeConductorController.js

2016-07-11 11:29:35 -07:00

commonUI

[Frontend] Styling of Time Conductor v2

2016-07-11 11:05:47 -07:00

containment

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

core

[Tests] verify that identifier service provides key

2016-06-15 10:31:25 -07:00

data

…

entanglement

Merge remote-tracking branch 'origin/better-dialog-message-339'

2016-06-10 14:55:07 -07:00

execution

[Timelines] Remove unused TaskService

2016-03-07 15:30:57 -08:00

exporters

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

features

Merge remote-tracking branch 'origin/open933' into open933-frontend

2016-07-11 11:29:35 -07:00

forms

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

framework

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

identity

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

persistence

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

policy

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

representation

[Edit Mode] #629 restored disabled tests for DropGesture. Removed extraneous argument to broadcast function

2016-05-26 11:42:15 -07:00

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

status

[Code Style] Run gulp fixstyle

2016-05-19 11:29:13 -07:00

telemetry

[Code Style] Rename shadowing variables

2016-05-20 13:05:32 -07:00

README.md

…

README.md

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