Victor Woeltjen f4adc6a889 Merge branch 'open-master' into open1223 ...

Merge in latest from master branch into topic branch for
limits, WTD-1223.

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/plots.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	platform/commonUI/general/res/sass/plots/_plots-main.scss
	platform/features/scrolling/res/templates/scrolling.html

2015-06-08 10:23:36 -07:00

..

controls

[Frontend] Markup and CSS for Time Controller

2015-06-02 19:29:57 -07:00

edit

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

forms

[Frontend] Markup and CSS for Time Controller

2015-06-02 19:29:57 -07:00

helpers

Merge branch 'open-master' into ue-frontend

2015-06-02 18:25:26 -07:00

items

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

lists

Merge branch 'open-master' into open1223

2015-06-08 10:23:36 -07:00

overlay

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

plots

[Limits] Merge in latest from platform

2015-06-05 16:28:29 -07:00

themes

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

tree

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

user-environ

Merge branch 'open-master' into ue-frontend

2015-06-02 18:25:26 -07:00

_about.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

_autoflow.scss

[Limits] Merge in latest from platform

2015-06-05 16:28:29 -07:00

_badges.scss

Merge branch 'open-master' into ue-frontend

2015-06-02 18:25:26 -07:00

_constants.scss

[Limits] Merge in latest from platform

2015-06-05 16:28:29 -07:00

_data-status.scss

[Frontend] Renew of ue-frontend

2015-06-02 16:12:19 -07:00

_effects.scss

[Limits] Merge in latest from platform

2015-06-05 16:28:29 -07:00

_fixed-position.scss

[Limits] Merge in latest from platform

2015-06-05 16:28:29 -07:00

_fonts.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

_global.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

_hide-non-functional.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

_icons.scss

[Limits] Merge in latest from platform

2015-06-05 16:28:29 -07:00

_iframe.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

_limits.scss

[Frontend] Renew of ue-frontend

2015-06-02 16:12:19 -07:00

_main.scss

[Limits] Merge in latest from platform

2015-06-05 16:28:29 -07:00

_mixins.scss

[Limits] Merge in latest from platform

2015-06-05 16:28:29 -07:00

_properties.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

_text.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

forms.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

items.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

plots.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

theme-espresso.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00

tree.scss

[Licenses] Add license headers

2015-05-13 16:43:30 -07:00