71c22fdbff
dataproxy: removed some logging, closes #9078
2017-08-24 11:18:06 +02:00
71c9582944
data source with token auth is starting to work, #9078
2017-08-24 11:07:37 +02:00
3c9798bec9
datasource-proxy: token exchange
2017-08-23 17:18:43 +02:00
4f9fbcc211
dataproxy: added caching of datasources when doing data proxy requests, #9078
2017-08-23 13:31:26 +02:00
8bf49c51b9
dataproxy: refactoring data source proxy to support route templates and wrote more tests for data proxy code, #9078
2017-08-23 10:52:31 +02:00
63d6ab476a
feat: data source proxy refactoring and route handling, #9078
2017-08-22 17:14:15 +02:00
5c2958023d
Merge branch 'v4.4.x'
2017-08-21 13:45:04 +02:00
e3bd51e38d
fix: remove duplicate set-cookie when logging in, fixes #9013
2017-08-21 11:10:59 +02:00
23b0795dcc
ux: minor button changes
2017-08-21 11:08:58 +02:00
21a7f57248
ux: changed cta button style
2017-08-20 21:16:40 +02:00
011c582ebb
minor user avatar stuff
2017-08-18 14:49:04 +02:00
bb7b55277c
users view update
2017-08-18 08:17:35 +02:00
a4da0adf38
ux: switching orgs now works through modal
2017-08-16 15:37:13 +02:00
95f5c84a57
ux: making org visibile in profile view
2017-08-16 15:03:49 +02:00
7f0f0eb617
ux: more nav work
2017-08-16 11:28:52 +02:00
5405736321
ux: nav fixes & polish
2017-08-15 23:17:34 +02:00
0bc226d760
ux: more nav work
2017-08-15 20:24:16 +02:00
1eab771231
ux: navigation work
2017-08-15 17:52:52 +02:00
63424f9866
ux: more work on sidemenu
2017-08-15 14:49:12 +02:00
1dab313ca3
Merge branch 'master' into develop
2017-08-14 10:30:36 +02:00
649fe7e462
Merge branch 'v4.4.x'
2017-08-07 10:47:23 +02:00
1e5778174c
login: regenerates session id on login
2017-08-07 10:00:29 +02:00
c7ca4830a8
Merge branch 'v4.4.x'
2017-08-03 08:56:46 +02:00
1372d2e517
fix: update user permissions validation was not working properly, fixes #8977
2017-08-03 08:56:34 +02:00
8d7186d40d
Merge branch 'v4.4.x'
2017-08-02 17:33:19 +02:00
3dc9d76b38
fix: viewer role fix, fixes #8976
2017-08-02 17:33:06 +02:00
9fb60c2fc8
Merge branch 'develop' into panel-title-menu-ux
2017-08-02 09:56:08 +02:00
c7c5730c40
Merge branch 'v4.4.x'
2017-07-31 16:04:31 +02:00
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
61d8eb1fac
Merge branch 'v4.4.x'
2017-07-31 15:07:22 +02:00
73563d087c
feat: more work on #8768
2017-07-31 14:39:33 +02:00
b16b649c9b
(cloudwatch) add new elb metrics ( #8894 )
2017-07-20 14:12:56 +02:00
9d50ab8fb5
(cloudwatch) check auth type before assume role ( #8895 )
2017-07-20 14:11:51 +02:00
228c210379
Cloudwatch: Fix bug with obtaining IAM roles within ECS containers. ( #8766 )
...
Fixes #8750 .
2017-07-12 06:55:59 +02:00
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
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
5aac2d2078
Include user Id on the lookup api ( #8698 )
...
Implements feature request #8682
2017-06-25 14:23:03 +02:00
3066280216
added code from #8504 , and #8021
2017-06-23 17:13:58 -04:00
1833c65559
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-06-23 16:07:16 -04:00
fc69d59cae
dashboard folder search fix
2017-06-23 16:00:26 -04:00
01ac3a49bd
dashfolders: fix user group picker + cleanup
2017-06-23 20:56:02 +02:00
e854fadb67
Merge branch 'master' into develop
2017-06-23 12:56:59 -04:00
be29357d22
fix: added missing url route for annotation state history delete, fixes #8660
2017-06-23 11:48:58 -04:00
ff4a79df06
minor update
2017-06-23 11:01:55 -04:00
876bb08b05
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-06-22 19:05:49 -04:00
5360303ad4
ux: nav changes
2017-06-22 19:05:33 -04:00
12270022e3
added sidemeu stuff
2017-06-22 18:41:39 -04:00
6d86afd472
dashfolders: use canadmin permission in settings menu
2017-06-23 00:36:17 +02:00
a4910c7aea
merging new-sidenav
2017-06-22 18:11:29 -04:00
aa634402d9
dashboard acl fixes
2017-06-22 17:43:55 -04:00
Torkel Ödegaard
Daniel Lee
Mitsuhiro Tanda
gomlgs
Denis Doria
Torkel Ödegaard