openmct

mirror of https://github.com/nasa/openmct.git synced 2025-05-25 19:54:21 +00:00

History

Victor Woeltjen 50bd233b0a Merge remote-tracking branch 'origin/master' into table-export-934

Conflicts:
	platform/commonUI/general/res/sass/controls/_buttons.scss
	platform/features/table/res/templates/mct-table.html

2016-06-15 10:05:20 -07:00

commonUI

Merge remote-tracking branch 'origin/master' into table-export-934

2016-06-15 10:05:20 -07:00

containment

[Code Style] Run gulp fixstyle

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

core

[Edit Mode] #629 Removed redundant test from DomainObjectProviderSpec

2016-05-26 11:44:43 -07:00

data

[Structure] Add platform structure

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

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/master' into table-export-934

2016-06-15 10:05:20 -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

[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.