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

..

bootstrap

[API] Enable strict DI

2016-01-07 15:56:09 -08:00

load

[API] Remove bundles.json

2016-01-08 09:54:02 -08:00

register

[Plot] Allow filters to be registered

2016-01-15 13:00:24 -08:00

resolve

[API] Fix logging of paths

2016-01-07 16:06:04 -08:00

Constants.js

[JSDoc] Add annotations

2015-08-07 11:44:54 -07:00

FrameworkInitializer.js

[Code Style] Use prototypes in framework layer

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

FrameworkLayer.js

[API Refactor] Fix JSLint failures

2016-01-08 12:36:48 -08:00

LogLevel.js

[API] Obey strict DI rules

2016-01-07 16:03:36 -08:00

Main.js

[API Refactor] Move out non-global require config

2016-01-13 12:41:15 -08:00