public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard f7194878fe dashboard guardian refactoring starting to work 2017-06-19 13:47:44 -04:00
Torkel Ödegaard d6341162cb refactoring dashboad folder acl checks 2017-06-19 11:54:37 -04:00
Torkel Ödegaard b494fd7689 dashboard folders acl work 2017-06-19 11:03:54 -04:00
Denis Doria 41d300f69d Fix timeInterval for mysql datasource (#8651) 
* Fix timeInterval for mysql datasource

This changes the > to >= and the < to <=, so the intervals are inclusive.
This should fix the #8635

* Fix validation
 2017-06-19 08:58:22 -04:00
Alexander Zobnin 9a7e460865 fix heatmap count values bug introduced by #8632 2017-06-18 21:47:08 +03:00
Alexander Zobnin 8626bdfed8 Merge remote-tracking branch 'upstream/master' 2017-06-18 20:59:05 +03:00
Alexander Zobnin 1f4140057b heatmap-tooltip: normalize histogram Y axis 2017-06-18 20:58:13 +03:00
Torkel Ödegaard cbbbccf12a refactoring dashoard folder guardian 2017-06-17 18:24:38 -04:00
Daniel Lee d1e1c4be93 WIP: refactor user group modal 2017-06-18 00:16:33 +02:00
Daniel Lee 0eb297822c httpserver: fixes #8641 
Changes to the http_server class meant that the TLS settings were not
getting applied anymore. This fixes so that the minimum TLS version is
1.2 again.
 2017-06-17 23:10:12 +02:00
Daniel Lee ad080af38f docs: add tutorial for using API 2017-06-17 20:59:19 +02:00
Salman Jalali 49fdbb3843 Update kbn.js 2017-06-17 06:08:10 +02:00
Torkel Ödegaard 3fe031d25d refactoring: Dashboard guardian 2017-06-16 21:25:24 -04:00
Daniel Lee 5cf63e3726 WIP: remove unused test file 2017-06-17 03:21:08 +02:00
Daniel Lee d89c1260c6 WIP: refactor dash search and remove extra query 2017-06-17 03:00:13 +02:00
Daniel Lee 5cf40cbd12 WIP: move guardian logic for search into the sql query 2017-06-17 02:34:05 +02:00
Daniel Lee 84ff62d773 WIP: remove dashboard children on delete 2017-06-17 02:34:05 +02:00
Torkel Ödegaard d9dca72ee4 dashboard_folders: refactoring picker and folder selection in dashboard settings & save as menu 2017-06-16 16:57:37 -04:00
Torkel Ödegaard 5b35a21d6f Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders 2017-06-16 14:56:46 -04:00
Torkel Ödegaard 0ad4a0faa9 Merge branch 'master' into dashboard_folders 2017-06-16 13:08:45 -04:00
Torkel Ödegaard 724368d0cd fix: data source dropdown select 2017-06-16 11:43:37 -04:00
Torkel Ödegaard 25f88e9b3a Merge branch 'master' of github.com:grafana/grafana 2017-06-16 10:47:53 -04:00
Torkel Ödegaard 39ffb04be1 Merge branch 'revert-dashboard-search-nav' 2017-06-16 10:47:28 -04:00
Torkel Ödegaard 056c57d551 ux: temporary remove search 2017-06-16 10:47:17 -04:00
Brandon Arp 5d63ad21c1 allow heatmap parsing of scaled datapoints (#8632) 2017-06-16 10:45:52 -04:00
Torkel Ödegaard a49e82e447 ux: revert dashboard search nav change, this is a tempoary change until we redesign the sidenav 2017-06-16 09:47:21 -04:00
Daniel Lee dd02bf7c9b WIP: adds API check to stop folders being included in folders 2017-06-16 02:45:47 +02:00
Torkel Ödegaard 7a39578f33 use gf-form-dropdown in user picker 2017-06-15 16:38:00 -04:00
Torkel Ödegaard e63fa9c83c Merge branch 'master' into dashboard_folders 2017-06-15 16:23:10 -04:00
Torkel Ödegaard e9c8881d54 Merge branch 'metric-segment-remake' 2017-06-15 15:56:41 -04:00
Torkel Ödegaard 840099bec0 refactor: metric segment remake 2017-06-15 15:56:24 -04:00
Daniel Lee 29ec05298e WIP: add test for add user group permission 2017-06-15 20:39:27 +02:00
Daniel Lee 0e853163fd WIP: can edit dashboard permission 2017-06-15 20:21:14 +02:00
Daniel Lee 9e7aa65fb7 WIP: clean up after user and org user delete 2017-06-15 20:19:54 +02:00
Torkel Ödegaard 76c4bfe268 ux: new metric segment is starting to work 2017-06-15 14:03:26 -04:00
Torkel Ödegaard 5f3b5fdcb2 updated 2017-06-15 12:21:12 -04:00
Torkel Ödegaard 6a95df403a refacoring: more work on metric segment replacement 2017-06-14 19:42:45 -04:00
Daniel Lee 699f9095e2 WIP: remove permissions when deleting global user 2017-06-14 23:45:30 +02:00
Torkel Ödegaard 380e7e7f04 Merge branch 'master' into metric-segment-remake 2017-06-14 16:17:13 -04:00
Torkel Ödegaard 41662b8540 dashboard_folders: updated 2017-06-14 12:55:21 -04:00
Daniel Lee 222a938cdf WIP: delete dependent permissions on user group delete 2017-06-14 18:40:08 +02:00
Torkel Ödegaard 210813f126 dashboard_folders: fixes to user picker & group picker 2017-06-14 12:32:43 -04:00
Torkel Ödegaard 908eb24d3a dashboard_folders: fixes to user & group picker 2017-06-14 12:21:05 -04:00
Torkel Ödegaard 3e8937e53b Merge branch 'master' into new-sidemenu 2017-06-14 10:00:43 -04:00
Torkel Ödegaard 81abfd4ca4 minor update 2017-06-14 10:00:40 -04:00
Torkel Ödegaard 581b977787 Merge branch 'master' of github.com:grafana/grafana 2017-06-13 18:32:38 -04:00
Torkel Ödegaard c771dd4bd2 ux: metrics tab add query feature 2017-06-13 18:31:43 -04:00
Daniel Lee 92717ccafb WIP: permission checking for dash version api methods 2017-06-14 00:28:34 +02:00
Daniel Lee cb720d8eaf docs: add body options for snapshot api 2017-06-13 23:17:14 +02:00
Torkel Ödegaard 9ff4ab1236 Merge branch 'master' into query_troubleshooting 2017-06-13 16:47:04 -04:00