Torkel Ödegaard
0bc226d760
ux: more nav work
2017-08-15 20:24:16 +02:00
Torkel Ödegaard
1eab771231
ux: navigation work
2017-08-15 17:52:52 +02:00
Torkel Ödegaard
63424f9866
ux: more work on sidemenu
2017-08-15 14:49:12 +02:00
Torkel Ödegaard
1dab313ca3
Merge branch 'master' into develop
2017-08-14 10:30:36 +02:00
Daniel Lee
649fe7e462
Merge branch 'v4.4.x'
2017-08-07 10:47:23 +02:00
Daniel Lee
1e5778174c
login: regenerates session id on login
2017-08-07 10:00:29 +02:00
Torkel Ödegaard
c7ca4830a8
Merge branch 'v4.4.x'
2017-08-03 08:56:46 +02:00
Torkel Ödegaard
1372d2e517
fix: update user permissions validation was not working properly, fixes #8977
2017-08-03 08:56:34 +02:00
Torkel Ödegaard
8d7186d40d
Merge branch 'v4.4.x'
2017-08-02 17:33:19 +02:00
Torkel Ödegaard
3dc9d76b38
fix: viewer role fix, fixes #8976
2017-08-02 17:33:06 +02:00
Torkel Ödegaard
9fb60c2fc8
Merge branch 'develop' into panel-title-menu-ux
2017-08-02 09:56:08 +02:00
Torkel Ödegaard
c7c5730c40
Merge branch 'v4.4.x'
2017-07-31 16:04:31 +02:00
Torkel Ödegaard
34cda65998
fix: png rendering api & timeout parameter now works as it should AND default render timeout increased from 30 to 60 seconds, fixes #8710
2017-07-31 16:04:04 +02:00
Torkel Ödegaard
61d8eb1fac
Merge branch 'v4.4.x'
2017-07-31 15:07:22 +02:00
Torkel Ödegaard
73563d087c
feat: more work on #8768
2017-07-31 14:39:33 +02:00
Mitsuhiro Tanda
b16b649c9b
(cloudwatch) add new elb metrics ( #8894 )
2017-07-20 14:12:56 +02:00
Mitsuhiro Tanda
9d50ab8fb5
(cloudwatch) check auth type before assume role ( #8895 )
2017-07-20 14:11:51 +02:00
gomlgs
228c210379
Cloudwatch: Fix bug with obtaining IAM roles within ECS containers. ( #8766 )
...
Fixes #8750 .
2017-07-12 06:55:59 +02:00
Daniel Lee
74093c700f
api: adds no-cache header for GET requests
...
Fixes #5356 . Internet Explorer aggressively caches GET requests which
means that all API calls fetching data are cached. This fix adds a
Cache-Control header with the value no-cache to all GET requests to
the API.
2017-07-04 21:26:05 +02:00
Daniel Lee
b8aa203707
signup: fix email sent logic for tempuser
...
Fixes #8656 and properly sets the email_sent and email_sent_on fields
for a tempuser (signup user).
2017-06-30 20:21:08 +02:00
Denis Doria
5aac2d2078
Include user Id on the lookup api ( #8698 )
...
Implements feature request #8682
2017-06-25 14:23:03 +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
Daniel Lee
01ac3a49bd
dashfolders: fix user group picker + cleanup
2017-06-23 20:56:02 +02:00
Torkel Ödegaard
e854fadb67
Merge branch 'master' into develop
2017-06-23 12:56:59 -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
ff4a79df06
minor update
2017-06-23 11:01:55 -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
Daniel Lee
6d86afd472
dashfolders: use canadmin permission in settings menu
2017-06-23 00:36:17 +02: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
Daniel Lee
1d43bfbf3f
dashfolders: new admin permission needed to view/change acl
2017-06-22 23:01:04 +02:00
Daniel Lee
f68d2816ab
dashfolders: security for png rendering
2017-06-22 01:23:48 +02:00
Torkel Ödegaard
2257c1f874
dashboard acl work
2017-06-21 19:02:03 -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
212a66ae5f
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
2017-06-19 18:55:34 -04:00
Daniel Lee
812112f2f6
WIP: fix acl route
2017-06-20 00:34:25 +02: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
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
