2928 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	61112d93d8	wip: folder to redux	2018-09-11 10:36:55 +02:00
Torkel Ödegaard	679ffbfd83	wip: progress on redux folder store	2018-09-10 21:49:04 +02:00
Torkel Ödegaard	9caa030108	Merge remote-tracking branch 'origin/teams-page-replace-mobx' into folder-to-redux	2018-09-10 21:14:33 +02:00
Torkel Ödegaard	108a20196f	Merge branch 'master' into teams-page-replace-mobx	2018-09-10 19:31:19 +02:00
Peter Holmberg	0cfcf2685e	actions for group sync	2018-09-10 16:58:17 +02:00
Peter Holmberg	b1fe0c4c7e	team settings	2018-09-10 15:53:58 +02:00
Torkel Ödegaard	59b5b146da	wip: began folder to redux migration	2018-09-10 14:30:42 +02:00
Peter Holmberg	841bd5817d	test for team member selector	2018-09-10 14:27:33 +02:00
Peter Holmberg	d494ebc730	flattened team state, tests for TeamMembers	2018-09-10 14:19:27 +02:00
Marcus Efraimsson	35a24032a7	Merge pull request #13208 from grafana/fix-dashboard-permissions ... fix: Dashboard permissions now shows correctly	2018-09-10 14:00:55 +02:00
Torkel Ödegaard	6c90a53654	refactor: moved stuff into new features dir manage-dashboards	2018-09-10 13:59:31 +02:00
Torkel Ödegaard	e4d9620fc0	move: moved styleguide to admin	2018-09-10 13:38:45 +02:00
Torkel Ödegaard	17e99bb38a	Merge branch 'master' of github.com:grafana/grafana	2018-09-10 13:29:57 +02:00
Torkel Ödegaard	34567bc4f1	moved folders from features into the main feature folder they belong to	2018-09-10 13:29:27 +02:00
Carl Bergquist	7e0637aa9d	Merge pull request #12260 from strohi/panelids-for-htmlbookmark ... added id tag to Panels for html bookmarking on longer Dashboards	2018-09-10 13:01:35 +02:00
Torkel Ödegaard	9cfe2a7f5c	fix: Dashboard permissions now shows correctly, fixes #13201	2018-09-10 11:35:59 +02:00
Torkel Ödegaard	6bdaf57ae7	refactor: changed AlertRuleItem pause action to callback	2018-09-10 09:29:53 +02:00
Peter Holmberg	59b3bfd342	team members, bug in fetching team	2018-09-07 18:01:59 +02:00
Torkel Ödegaard	a440d3510a	renaming things in admin	2018-09-07 17:55:38 +02:00
Torkel Ödegaard	4391209f7b	Merge branch 'master' into redux-poc2	2018-09-07 14:49:05 +02:00
Peter Holmberg	05bfc36516	Teampages page	2018-09-07 14:32:09 +02:00
Carl Bergquist	3c0b1ef581	Merge pull request #13170 from bergquist/alerting_default_setting ... make default values for alerting configurable	2018-09-06 13:26:42 +02:00
bergquist	3ce89cad71	make default values for alerting configurable	2018-09-06 11:26:14 +02:00
Patrick O'Carroll	2b74b1c4d6	added radix rule and changed files to follow rule (#13153)	2018-09-05 16:51:31 +02:00
Peter Holmberg	f68ac20218	set search query action and tests	2018-09-05 16:49:36 +02:00
Peter Holmberg	7e340b7aa5	delete team	2018-09-05 15:32:51 +02:00
Peter Holmberg	167f009819	load teams and store in redux	2018-09-05 15:13:21 +02:00
Peter Holmberg	306c3e6c10	creating types, actions, reducer	2018-09-05 12:34:32 +02:00
Torkel Ödegaard	0aea60bf17	Merge branch 'master' into redux-poc2	2018-09-05 12:11:11 +02:00
Torkel Ödegaard	c9ae585d2a	Merge branch '12918-no-conditional-assignment'	2018-09-05 12:09:32 +02:00
Torkel Ödegaard	dc236b5063	refatoring: minor changes to PR #13149	2018-09-05 12:09:16 +02:00
Torkel Ödegaard	00c0b71f3d	Merge branch '12918-only-arrow-functions4'	2018-09-05 11:46:54 +02:00
Torkel Ödegaard	432e203df1	Merge branch '12918-only-arrow-functions3'	2018-09-05 11:26:30 +02:00
Patrick O'Carroll	777010b20b	added no-conditional-assignment rule and changed files to follow new rule	2018-09-05 10:53:58 +02:00
Patrick O'Carroll	72ab24f300	Changed functions to arrow functions for only-arrow-functions rule. (#13131)	2018-09-05 07:47:30 +02:00
Torkel Ödegaard	68767acb1c	fix: Updated test	2018-09-04 13:15:45 -07:00
Torkel Ödegaard	1e5ad4da78	redux: minor changes to redux thunk actions and use of typings	2018-09-04 12:59:46 -07:00
Marcus Efraimsson	7c88436a9b	Merge pull request #13133 from grafana/13132_query_variable ... Fix error when new variables created but not yet added/saved	2018-09-04 17:25:08 +02:00
Patrick O'Carroll	dc4f547a40	Changed functions to arrow functions for only-arrow-functions rule.	2018-09-04 17:02:32 +02:00
Patrick O'Carroll	0f326f18dc	changed functions to arrowfunctions for only-arrow-functions rule (#13127)	2018-09-04 15:55:41 +02:00
Peter Holmberg	22510be450	tests	2018-09-04 15:00:04 +02:00
Patrick O'Carroll	19b7ad61dd	Changed functions to arrow functions for only-arrow-functions rule.	2018-09-04 14:27:03 +02:00
Marcus Efraimsson	1e74d7f20a	handle new variables created not yet added	2018-09-04 13:25:44 +02:00
Peter Holmberg	5ac5a08e9e	Fixed a bug in the test and added test for filter alert rules	2018-09-04 09:53:24 +02:00
Peter Holmberg	f4594c8320	some basic selector tests	2018-09-03 16:58:11 +02:00
Peter Holmberg	638370e310	pausing alert ... need to fix return type on dispatch. Could not test correctly either.	2018-09-03 15:44:39 +02:00
Marcus Efraimsson	1ceca5d8ec	Merge pull request #12145 from grafana/alerting_reminder ... Alerting notification reminder	2018-09-03 14:41:38 +02:00
Peter Holmberg	c958ebd101	extend from purecomponent	2018-09-03 14:05:12 +02:00
Peter Holmberg	1994ca5016	remove log	2018-09-03 14:04:44 +02:00
Peter Holmberg	50444c32e0	actions and reducers for search filter	2018-09-03 13:46:39 +02:00