Torkel Ödegaard 201f50b121 Merge branch 'master' into external-plugins ... Conflicts: pkg/api/login.go public/app/core/routes/all.js public/app/core/table_model.ts public/app/panels/table/table_model.ts public/app/plugins/panels/table/editor.ts public/app/plugins/panels/table/table_model.ts		2015-12-14 17:28:57 +01:00
..
core	fix(timpicker): another name change to make quick ranges nameing more consistent, fixes #3465	2015-12-10 13:01:41 +01:00
lib	refactor: moved graphite specs into plugins directory	2015-09-28 15:23:53 +02:00
mocks	fix(timerange): fix handling of invalid dates in from/to url parameters, fixes #3345	2015-12-04 10:32:23 +01:00
specs	Merge branch 'master' into external-plugins	2015-12-14 17:28:57 +01:00
.jshintrc	Renamed src directory to public	2015-03-29 12:57:28 +02:00
test-main.js	feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185	2015-11-20 09:43:10 +01:00
tests.html	Renamed src directory to public	2015-03-29 12:57:28 +02:00