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
23558c61d4
feat: wip work on #8768
2017-07-31 13:03:42 +02:00
0c70d271dc
Support large github organisations ( #8846 )
...
* Add new HttpGetResponse struct type
* Modify HttpGet() return to use HttpGetResponse
* Look up _all_ the teams the user is a member of
2017-07-31 12:13:29 +02:00
24a79a6bea
Merge branch 'v4.4.x'
2017-07-24 12:30:28 +02:00
723f5bc9e8
fix: dsahboard_version data column type changed to MEDIUMTEXT, fixes #8813
2017-07-24 12:30:13 +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
f8d22385ce
add a placeholder to DingTalk Url ( #8820 )
2017-07-10 16:51:03 +02:00
a622c55b1b
(feat) Add image to LINE notify ( #8771 )
2017-07-07 11:20:27 +02:00
e6f9546a7c
api: add no cache headers for IE11
...
Adds pragma and expires headers for API calls so that IE11 does not
cache GET calls. Ref #5356
2017-07-06 18:56:22 +02:00
6d4c29ea9b
migrations: dashboard version migration handles nulls
...
If a dashboard has a null value for updated_by then the migration
for the dashboard version table fails. This change uses coalesce to
set -1 instead of null when inserting into the created_by column
which has a non-null constraint. Fixes #8783 .
2017-07-05 22:14:03 +02:00
16cda723d3
migrations: dashboard version migration handles nulls
...
If a dashboard has a null value for updated_by then the migration
for the dashboard version table fails. This change uses coalesce to
set -1 instead of null when inserting into the created_by column
which has a non-null constraint. Fixes #8783 .
2017-07-05 22:06:00 +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
109fd998ed
Add a new notifier : DingTalk ( #8473 )
...
* add alerting notifier: DingDing
* add alerting notifier: DingDing
* add dingding unit test
* add dingding unit test
* delete debug code & format code style.
* fix build failed: dingding_test.go
2017-07-04 15:16:32 +02:00
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
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
1fd7b60efe
Add more information to basic diff logic
2017-06-29 14:38:48 -04:00
8973b48f96
setting: add tests for windows
2017-06-28 09:35:33 +02:00
5aac2d2078
Include user Id on the lookup api ( #8698 )
...
Implements feature request #8682
2017-06-25 14:23:03 +02:00
ebcbcdc27a
dashfolders: inherited permissions for dashboards
...
Allow duplicate permissions if the original is an
inherited permission from a parent folder.
If a dashboard has permissions but the parent folder
does not, return the default permissions for the
editor and view role combined with the permissions
for the child dashboard.
2017-06-24 03:50:22 +02:00
86a7266f5f
dashfolders: handle permission changes when saving/moving dashboards
2017-06-23 23:31:58 +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
60da730c95
mysql: fix for TIME columns, fixes #8534
2017-06-23 12:55:40 -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
a3d22ae9c7
Document logic behind basic diff
2017-06-22 18:23:31 -04:00
a4910c7aea
merging new-sidenav
2017-06-22 18:11:29 -04:00
b54b43a42e
Add tests for diff formatters
2017-06-22 18:08:37 -04:00
aa634402d9
dashboard acl fixes
2017-06-22 17:43:55 -04:00
545b02139d
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
2017-06-22 17:11:39 -04:00
9c6c8c0f3f
acl fixes
2017-06-22 17:10:43 -04:00
1d43bfbf3f
dashfolders: new admin permission needed to view/change acl
2017-06-22 23:01:04 +02:00
f6b52cd6d7
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
2017-06-22 15:16:57 -04:00
a82b25eb79
acl: more acl work
2017-06-22 15:16:41 -04:00
Torkel Ödegaard
Torkel Ödegaard
Dave Hall
Mitsuhiro Tanda
gomlgs
Liang Jiameng
0x6875790d0a
Daniel Lee
Ben Tranter
Denis Doria