Commit Graph

2948 Commits

Author SHA1 Message Date
Torkel Ödegaard
c7fdea1dfb wip: dashboard permissions to redux 2018-09-13 16:00:02 +02:00
Torkel Ödegaard
d173ebe7e8 Merge branch 'master' into permissions-to-redux 2018-09-13 14:48:04 +02:00
Torkel Ödegaard
e1a1da9064 fix: add folder permission fix 2018-09-13 14:31:12 +02:00
Torkel Ödegaard
f2edb82e79 Folder pages to redux (#13235)
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* wip: began folder to redux migration

* team settings

* actions for group sync

* wip: progress on redux folder store

* wip: folder to redux

* wip: folder settings page to redux progress

* mobx -> redux: major progress on folder migration

* redux: moved folders to it's own features folder

* fix: added loading nav states

* fix: gofmt issues

* wip: working on reducer test

* fix: added reducer test
2018-09-13 14:10:51 +02:00
Torkel Ödegaard
d35eca333f folder permissions in redux 2018-09-13 13:56:09 +02:00
Torkel Ödegaard
f360b6186b wip: first couple of things starting to work 2018-09-13 10:52:29 +02:00
Torkel Ödegaard
8096cd8f33 fix: added reducer test 2018-09-13 07:30:27 +02:00
David
a5bcd4b8e4 Adhoc-filtering for prometheus dashboards (#13212)
* Basic adhoc-filtering support for prometheus
2018-09-12 18:10:57 +02:00
Dan Doyle
f0e905f3c9 First pass at a text based template var, getting feedback from devs 2018-09-12 13:17:15 +00:00
Torkel Ödegaard
a317158b72 wip: working on reducer test 2018-09-12 12:18:24 +02:00
Torkel Ödegaard
0705bf570d fix: added loading nav states 2018-09-12 09:47:23 +02:00
Torkel Ödegaard
a83beac565 redux: moved folders to it's own features folder 2018-09-12 09:15:18 +02:00
Torkel Ödegaard
7c27a87dcb Merge branch 'master' into folder-to-redux 2018-09-12 08:28:37 +02:00
Torkel Ödegaard
f5ee91f85a fix: added type export to fix failing test 2018-09-11 19:30:38 +02:00
Torkel Ödegaard
98daceade0 fix: fixed typescript test error 2018-09-11 19:08:32 +02:00
Torkel Ödegaard
ec41d76080 mobx -> redux: major progress on folder migration 2018-09-11 19:00:37 +02:00
Torkel Ödegaard
19cbff658b wip: folder settings page to redux progress 2018-09-11 17:36:23 +02:00
Torkel Ödegaard
89ea47e7fb Merge branch 'master' into folder-to-redux 2018-09-11 15:07:03 +02:00
Peter Holmberg
9f73f13091 Teams page replace mobx (#13219)
* creating types, actions, reducer

* load teams and store in redux

* delete team

* set search query action and tests

* Teampages page

* team members, bug in fetching team

* flattened team state, tests for TeamMembers

* test for team member selector

* team settings

* actions for group sync

* tests for team groups

* removed comment

* remove old stores

* fix: formating of datasource.go

* fix: minor changes to imports

* adding debounce and fixing issue in teamlist

* refactoring: moving types to their own files
2018-09-11 14:14:03 +02:00
Torkel Ödegaard
1ce9001141 upgrade of typescript and tslint and jest (#13223) 2018-09-11 13:48:13 +02:00
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