Torkel Ödegaard d9096110f8 Merge branch 'master' into alerting ...

Conflicts:
	pkg/api/dashboard.go
	pkg/models/dashboards.go
	pkg/services/sqlstore/dashboard.go

2016-07-11 18:28:07 +02:00

..

angular

trying to fix karma issue

2016-04-03 09:43:33 -04:00

angular-bindonce

Moved angular-bindonce to bower

2015-06-13 22:20:39 +02:00

angular-mocks

tech(): updated angularjs

2016-03-28 17:08:31 +02:00

angular-native-dragdrop

Removed unnecessary components.

2015-11-01 09:48:27 -08:00

angular-other

feat(import): lots of work on dashboard import

2016-05-13 17:39:22 +02:00

angular-route

tech(): updated angularjs

2016-03-28 17:08:31 +02:00

angular-sanitize

tech(): updated angularjs

2016-03-28 17:08:31 +02:00

angular-ui

feat(timepicker2): more progress

2015-09-18 10:36:47 +02:00

bootstrap

removed old popover and unused boostrap components

2016-02-22 18:56:35 +01:00

css

feat(grunt): add autoprefix with postcss

2016-03-07 17:49:47 +01:00

flot

fix(flot): fixed flot issue introduced in alerting branch

2016-06-28 14:04:29 -07:00

jquery

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02:00

plugin-css

feat(text and css): html partials and css can be loaded via systemjs

2016-02-10 11:54:17 +01:00

plugin-text

feat(text and css): html partials and css can be loaded via systemjs

2016-02-10 11:54:17 +01:00

tagsinput

feat(alerting): progress on alerting UI and model, refactoring of dashboard parser and tests into extractor component, moved tests from sqlstore to alerting package

2016-06-11 10:13:33 +02:00

crypto.min.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

filesaver.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

license.json

Renamed src directory to public

2015-03-29 12:57:28 +02:00

lodash.js

Renamed src directory to public

2015-03-29 12:57:28 +02:00

moment.js

refactor(): refactored date handling and locale handling in #5517

2016-07-05 17:59:43 +02:00

spectrum.js

Upgraded to JQuery 2.1.1 -> 2.1.3, and spectrum.js, Fixes #1932

2015-05-04 14:36:46 +02:00

zero_clipboard.js

refactoring: move moving stuff around

2015-10-30 15:04:27 +01:00

zero_clipboard.swf

refactoring: move moving stuff around

2015-10-30 15:04:27 +01:00