public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,856 Commits 655 Branches 650 Tags
d95eabfeec00a2386a64db9461e119ff0c8ac4f6
Commit Graph
3255 Commits
Author SHA1 Message Date
0x6875790d0a a622c55b1b (feat) Add image to LINE notify (#8771) 2017-07-07 11:20:27 +02:00
Daniel Lee 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
Daniel Lee 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
Daniel Lee 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
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
Liang Jiameng 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
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
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
Ben Tranter 1fd7b60efe Add more information to basic diff logic 2017-06-29 14:38:48 -04:00
Daniel Lee 8973b48f96 setting: add tests for windows 2017-06-28 09:35:33 +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
Daniel Lee 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
Daniel Lee 86a7266f5f dashfolders: handle permission changes when saving/moving dashboards 2017-06-23 23:31:58 +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 60da730c95 mysql: fix for TIME columns, fixes #8534 2017-06-23 12:55:40 -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
Ben Tranter a3d22ae9c7 Document logic behind basic diff 2017-06-22 18:23:31 -04:00
Torkel Ödegaard a4910c7aea merging new-sidenav 2017-06-22 18:11:29 -04:00
Ben Tranter b54b43a42e Add tests for diff formatters 2017-06-22 18:08:37 -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
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
Daniel Lee 46c5625b59 dashfolders: filter search based on child dash permissions 2017-06-22 20:10:49 +02:00
Daniel Lee 446104d120 dashfolders: allows phantomjs rendering for alerting 
Makes the alerting user an admin when rendering a png
for emails
 2017-06-22 02:43:33 +02:00
Daniel Lee f68d2816ab dashfolders: security for png rendering 2017-06-22 01:23:48 +02: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 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
Daniel Lee 2479e51a6b mysql: Null value should not be considered as previous value 
fixes #8655
 2017-06-20 02:02:05 +02: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
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