bergquist abd5a74e4c Merge branch 'master' into 9587_annotation_tags_wih_temp_var ... * master: (3328 commits) removes protoc from makefile changelog: note about closing #11681 Adding Centrify configuration for Oauth refactor: moved stuff into new features dir manage-dashboards move: moved styleguide to admin fix: fixed singlestat test broken due to file move moved folders from features into the main feature folder they belong to Add jsonnet with grafonnet-lib to provisioning docs fix: Dashboard permissions now shows correctly, fixes #13201 Update CHANGELOG.md redux: do not use redux logger middleware in production builds Allow oauth email attribute name to be configurable (#13006) Document required order for time series queries (#13204) refactor: changed AlertRuleItem pause action to callback Fix query builder queries for interval start renaming things in admin release 5.2.4 changelog: release 5.2.4 refactoring: custom scrollbars PR updated, #13175 changelog: add notes about closing #13121 ...		2018-09-11 11:04:29 +02:00
..
containers	Merge branch 'master' into redux-poc2	2018-09-07 14:49:05 +02:00
core	renaming things in admin	2018-09-07 17:55:38 +02:00
features	Merge pull request #13208 from grafana/fix-dashboard-permissions	2018-09-10 14:00:55 +02:00
partials	Merge pull request #12939 from grafana/12865-login-loading-animation	2018-08-27 15:17:19 +02:00
plugins	Merge branch 'master' into 9587_annotation_tags_wih_temp_var	2018-09-11 11:04:29 +02:00
routes	refactor: moved stuff into new features dir manage-dashboards	2018-09-10 13:59:31 +02:00
stores	redux: do not use redux logger middleware in production builds	2018-09-10 09:53:52 +02:00
types	tests	2018-09-04 15:00:04 +02:00
app.ts	Changed functions to arrow functions for only-arrow-functions rule. (#13131)	2018-09-05 07:47:30 +02:00
dev.ts	Add weback-dev-server with hot/hmr support	2018-04-19 11:42:53 +02:00
index.ts	prettier: change to single quoting	2017-12-20 12:33:33 +01:00