 Torkel Ödegaard
|
b9540e4c49
|
ace: minor ace theme tweaks
|
2017-08-09 21:12:15 +02:00 |
|
|
Torkel Ödegaard
|
95f67ed79d
|
minor fixes
|
2017-08-05 08:51:57 +02:00 |
|
|
Torkel Ödegaard
|
c4eadb576e
|
fix: graphite bug fix introduced in recent commit
|
2017-07-31 22:39:56 +02:00 |
|
|
Torkel Ödegaard
|
73a1a262ef
|
Merge branch 'v4.4.x'
|
2017-07-31 22:33:36 +02:00 |
|
|
Torkel Ödegaard
|
e9989cb690
|
fix: make it easier to close search by clicking outside result container, fixes #8848
|
2017-07-31 22:33:22 +02:00 |
|
|
Torkel Ödegaard
|
0fcc87010a
|
fix: cloudwatch fix for templating namespace argument to metrics tempalting function, fixes #8965
|
2017-07-31 22:30:49 +02:00 |
|
|
Torkel Ödegaard
|
23558c61d4
|
feat: wip work on #8768
|
2017-07-31 13:03:42 +02:00 |
|
|
Torkel Ödegaard
|
d46fd890a5
|
Merge branch 'v4.4.x'
|
2017-07-24 12:38:39 +02:00 |
|
|
Torkel Ödegaard
|
8ca08d65e7
|
docs: updated configuration docs with new defaults, #8743
|
2017-07-24 12:37:58 +02:00 |
|
|
Torkel Ödegaard
|
f5ed5c6529
|
settings(change): changed default value for allow sign up to false, closes #8743, and changed default option allow_org_create to false
|
2017-07-24 12:36:42 +02:00 |
|
|
Torkel Ödegaard
|
0f33ac9e10
|
Merge branch 'master' of github.com:grafana/grafana
|
2017-07-24 12:30:43 +02:00 |
|
|
Torkel Ödegaard
|
24a79a6bea
|
Merge branch 'v4.4.x'
|
2017-07-24 12:30:28 +02:00 |
|
|
Torkel Ödegaard
|
723f5bc9e8
|
fix: dsahboard_version data column type changed to MEDIUMTEXT, fixes #8813
|
2017-07-24 12:30:13 +02:00 |
|
|
Torkel Ödegaard
|
6956110497
|
Merge branch 'master' of github.com:grafana/grafana
|
2017-07-24 12:23:33 +02:00 |
|
|
Torkel Ödegaard
|
cd0e1a8978
|
Merge branch 'v4.4.x'
|
2017-07-24 12:21:43 +02:00 |
|
|
Torkel Ödegaard
|
2d2800e710
|
fix: url did not update correctly when closing settings view by using ESC key, fixes #8869
|
2017-07-24 12:21:30 +02:00 |
|
|
Torkel Ödegaard
|
e4950c2dc1
|
fix: elasticsearch with template variable with terms agg on IP field, fixes #8662
|
2017-07-12 07:43:30 +02:00 |
|
|
Torkel Ödegaard
|
bb3bcbe6a1
|
fix: for issue in graph panel axes labels when iframe embedding, fixes #8827
|
2017-07-12 07:12:05 +02:00 |
|
|
Torkel Ödegaard
|
cff1c37064
|
fix: InfluxDB direct access with normal inflxudb credentials was not sent correctly, fixes #8789
|
2017-07-06 09:46:31 +02:00 |
|
|
Torkel Ödegaard
|
e5b499a958
|
fix: Text area css issue prevented scrolling, fixes #8797
|
2017-07-06 09:36:57 +02:00 |
|
|
Torkel Ödegaard
|
1994b767d3
|
fix: InfluxDB direct access with normal inflxudb credentials was not sent correctly, fixes #8789
|
2017-07-05 22:15:28 +02:00 |
|
|
Torkel Ödegaard
|
e269b3b2a0
|
Merge branch 'refactor-basic-diff' of https://github.com/walmartlabs/grafana into walmartlabs-refactor-basic-diff
|
2017-07-03 09:49:53 +02:00 |
|
|
Torkel Ödegaard
|
3066280216
|
added code from #8504, and #8021
|
2017-06-23 17:13:58 -04:00 |
|
|
Torkel Ödegaard
|
1833c65559
|
Merge branch 'develop' of github.com:grafana/grafana into develop
|
2017-06-23 16:07:16 -04:00 |
|
|
Torkel Ödegaard
|
fc69d59cae
|
dashboard folder search fix
|
2017-06-23 16:00:26 -04:00 |
|
|
Torkel Ödegaard
|
456225365f
|
Merge branch 'develop' of github.com:grafana/grafana into develop
|
2017-06-23 12:59:14 -04:00 |
|
|
Torkel Ödegaard
|
e854fadb67
|
Merge branch 'master' into develop
|
2017-06-23 12:56:59 -04:00 |
|
|
Torkel Ödegaard
|
60da730c95
|
mysql: fix for TIME columns, fixes #8534
|
2017-06-23 12:55:40 -04:00 |
|
|
Torkel Ödegaard
|
73fcc919cd
|
change: made dashboard save message optional
|
2017-06-23 11:49:32 -04:00 |
|
|
Torkel Ödegaard
|
be29357d22
|
fix: added missing url route for annotation state history delete, fixes #8660
|
2017-06-23 11:48:58 -04:00 |
|
|
Torkel Ödegaard
|
86a73c359b
|
fix: data source selector did not show, fixes #8692
|
2017-06-23 11:32:17 -04:00 |
|
|
Torkel Ödegaard
|
ff4a79df06
|
minor update
|
2017-06-23 11:01:55 -04:00 |
|
|
Torkel Ödegaard
|
b7255723ea
|
ux: style tweaks, trying out non italic headers
|
2017-06-23 09:18:39 -04:00 |
|
|
Torkel Ödegaard
|
876bb08b05
|
Merge branch 'develop' of github.com:grafana/grafana into develop
|
2017-06-22 19:05:49 -04:00 |
|
|
Torkel Ödegaard
|
5360303ad4
|
ux: nav changes
|
2017-06-22 19:05:33 -04:00 |
|
|
Torkel Ödegaard
|
12270022e3
|
added sidemeu stuff
|
2017-06-22 18:41:39 -04:00 |
|
|
Torkel Ödegaard
|
a4910c7aea
|
merging new-sidenav
|
2017-06-22 18:11:29 -04:00 |
|
|
Torkel Ödegaard
|
aa634402d9
|
dashboard acl fixes
|
2017-06-22 17:43:55 -04:00 |
|
|
Torkel Ödegaard
|
545b02139d
|
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
|
2017-06-22 17:11:39 -04:00 |
|
|
Torkel Ödegaard
|
9c6c8c0f3f
|
acl fixes
|
2017-06-22 17:10:43 -04:00 |
|
|
Torkel Ödegaard
|
f6b52cd6d7
|
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
|
2017-06-22 15:16:57 -04:00 |
|
|
Torkel Ödegaard
|
a82b25eb79
|
acl: more acl work
|
2017-06-22 15:16:41 -04:00 |
|
|
Torkel Ödegaard
|
659a59107e
|
dashboard acl stuff
|
2017-06-21 19:23:24 -04:00 |
|
|
Torkel Ödegaard
|
2257c1f874
|
dashboard acl work
|
2017-06-21 19:02:03 -04:00 |
|
|
Torkel Ödegaard
|
aab6c98e45
|
Merge branch 'dashboard-acl' into dashboard_folders
|
2017-06-21 17:57:57 -04:00 |
|
|
Torkel Ödegaard
|
a37c441193
|
dashboard acl
|
2017-06-21 17:57:04 -04:00 |
|
|
Torkel Ödegaard
|
945302ba52
|
working on dashbord acl stuff
|
2017-06-21 17:14:06 -04:00 |
|
|
Torkel Ödegaard
|
48305b5789
|
dashboard acl
|
2017-06-21 14:19:08 -04:00 |
|
|
Torkel Ödegaard
|
fcc8557dbb
|
dashboard acl work
|
2017-06-21 14:11:16 -04:00 |
|
|
Torkel Ödegaard
|
43ffe826fa
|
dashboard acl work
|
2017-06-20 17:18:20 -04:00 |
|
|
Torkel Ödegaard
|
408c37170f
|
refactoring: dashboard folders
|
2017-06-20 14:45:00 -04:00 |
|
|
Torkel Ödegaard
|
3edd209736
|
dashboard acl modal
|
2017-06-20 12:36:07 -04:00 |
|
|
Torkel Ödegaard
|
212a66ae5f
|
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
|
2017-06-19 18:55:34 -04:00 |
|
|
Torkel Ödegaard
|
93bc588dae
|
refactoring: moving dashboards acl migrations to its own folder
|
2017-06-19 18:48:15 -04:00 |
|
|
Torkel Ödegaard
|
e290015887
|
refactoring: renaming
|
2017-06-19 18:19:58 -04:00 |
|
|
Torkel Ödegaard
|
aaf2a897b0
|
folders: changed api urls for dashboard acls
|
2017-06-19 18:11:30 -04:00 |
|
|
Torkel Ödegaard
|
c4a1803060
|
refactoring more renaming
|
2017-06-19 17:30:54 -04:00 |
|
|
Torkel Ödegaard
|
e0b9ba7554
|
refactoring renaming dashboard folder operations
|
2017-06-19 17:15:25 -04:00 |
|
|
Torkel Ödegaard
|
34cf305d2c
|
Merge branch 'master' into dashboard_folders
|
2017-06-19 16:40:30 -04:00 |
|
|
Torkel Ödegaard
|
77136d7a70
|
Merge branch 'master' of github.com:grafana/grafana
|
2017-06-19 16:02:31 -04:00 |
|
|
Torkel Ödegaard
|
8440d2d0a2
|
fix: fixed search issues with in active mode and keyboard nav
|
2017-06-19 16:02:16 -04:00 |
|
|
Torkel Ödegaard
|
04da97bffb
|
dashboard_folders refactoring
|
2017-06-19 15:37:22 -04:00 |
|
|
Torkel Ödegaard
|
74840178cf
|
refactoring dashboard folder security checks
|
2017-06-19 15:22:42 -04:00 |
|
|
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 |
|
|
Torkel Ödegaard
|
cbbbccf12a
|
refactoring dashoard folder guardian
|
2017-06-17 18:24:38 -04:00 |
|
|
Torkel Ödegaard
|
3fe031d25d
|
refactoring: Dashboard guardian
|
2017-06-16 21:25:24 -04: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Torkel Ödegaard
|
9ff4ab1236
|
Merge branch 'master' into query_troubleshooting
|
2017-06-13 16:47:04 -04:00 |
|
|
Torkel Ödegaard
|
a6bbcb8fef
|
ux: gridstack poc
|
2017-06-13 16:10:56 -04:00 |
|
|
Torkel Ödegaard
|
812ac5cb8e
|
Merge branch 'master' of github.com:grafana/grafana
|
2017-06-13 13:22:08 -04:00 |
|
|
Torkel Ödegaard
|
7d642546b3
|
fix: restore dashboard history version did not reload route correctly when slug did not change
|
2017-06-13 13:21:22 -04:00 |
|
|
Torkel Ödegaard
|
35c440eb79
|
Gridstack: testing
|
2017-06-13 12:59:37 -04:00 |
|
|
Torkel Ödegaard
|
5061b3c691
|
ux: nav experiments
|
2017-06-12 21:11:22 +02:00 |
|
|
Torkel Ödegaard
|
f341a21b01
|
ux: side nav experiments
|
2017-06-12 16:46:02 +02:00 |
|
|
Torkel Ödegaard
|
ff2394709d
|
ux: very early start to new sidemenu
|
2017-06-08 23:13:38 +02:00 |
|
|
Torkel Ödegaard
|
ef9fa7b0cc
|
ux: very early start to new sidemenu
|
2017-06-08 22:17:43 +02:00 |
|