4f9fbcc211
dataproxy: added caching of datasources when doing data proxy requests, #9078
2017-08-23 13:31:26 +02:00
95f5c84a57
ux: making org visibile in profile view
2017-08-16 15:03:49 +02:00
1dab313ca3
Merge branch 'master' into develop
2017-08-14 10:30:36 +02:00
e8a20643d6
feat: store last seen date for users and present in stats and user lists, closes #9007
2017-08-09 10:36:41 +02:00
7031f7e772
fix: sqlite3 and storing/displaying dates used wrong timezone, fixes #8996
2017-08-08 09:28:16 +02:00
9fb60c2fc8
Merge branch 'develop' into panel-title-menu-ux
2017-08-02 09:56:08 +02:00
723f5bc9e8
fix: dsahboard_version data column type changed to MEDIUMTEXT, fixes #8813
2017-07-24 12:30:13 +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
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
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
9c6c8c0f3f
acl fixes
2017-06-22 17:10:43 -04: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
46c5625b59
dashfolders: filter search based on child dash permissions
2017-06-22 20:10:49 +02:00
659a59107e
dashboard acl stuff
2017-06-21 19:23:24 -04:00
2257c1f874
dashboard acl work
2017-06-21 19:02:03 -04:00
48305b5789
dashboard acl
2017-06-21 14:19:08 -04:00
fcc8557dbb
dashboard acl work
2017-06-21 14:11:16 -04:00
212a66ae5f
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
2017-06-19 18:55:34 -04:00
93bc588dae
refactoring: moving dashboards acl migrations to its own folder
2017-06-19 18:48:15 -04:00
812112f2f6
WIP: fix acl route
2017-06-20 00:34:25 +02:00
e290015887
refactoring: renaming
2017-06-19 18:19:58 -04:00
aaf2a897b0
folders: changed api urls for dashboard acls
2017-06-19 18:11:30 -04:00
c4a1803060
refactoring more renaming
2017-06-19 17:30:54 -04:00
e0b9ba7554
refactoring renaming dashboard folder operations
2017-06-19 17:15:25 -04:00
04da97bffb
dashboard_folders refactoring
2017-06-19 15:37:22 -04:00
d6341162cb
refactoring dashboad folder acl checks
2017-06-19 11:54:37 -04:00
b494fd7689
dashboard folders acl work
2017-06-19 11:03:54 -04:00
cbbbccf12a
refactoring dashoard folder guardian
2017-06-17 18:24:38 -04:00
3fe031d25d
refactoring: Dashboard guardian
2017-06-16 21:25:24 -04:00
d89c1260c6
WIP: refactor dash search and remove extra query
2017-06-17 03:00:13 +02:00
5cf40cbd12
WIP: move guardian logic for search into the sql query
2017-06-17 02:34:05 +02:00
84ff62d773
WIP: remove dashboard children on delete
2017-06-17 02:34:05 +02:00
9e7aa65fb7
WIP: clean up after user and org user delete
2017-06-15 20:19:54 +02:00
699f9095e2
WIP: remove permissions when deleting global user
2017-06-14 23:45:30 +02:00
222a938cdf
WIP: delete dependent permissions on user group delete
2017-06-14 18:40:08 +02:00
ef0facc987
WIP: fix test after merge conflict
2017-06-12 15:49:09 +02:00
9eccb4e79f
WIP: API - add dash permission
2017-06-12 15:49:09 +02:00
2097ed0bb8
WIP: Permission Type as string in permission query
2017-06-12 15:49:09 +02:00
c602afb9c6
WIP: dashboard search by folder + toggle for list or tree mode
2017-06-12 15:49:09 +02:00
6c736e002a
WIP: add dummy root folder to folder picker
...
Can move a dash from a folder back to root level as well
2017-06-12 15:49:09 +02:00
68b9342de3
WIP: dashboard search by type (folder or dash)
2017-06-12 15:49:09 +02:00
b4576edc90
WIP: fix after upstream sqlstore refactoring
2017-06-12 15:49:09 +02:00
fff7b706d6
WIP: user group additions
2017-06-12 15:49:09 +02:00
53d11d50fc
WIP: remove browse mode for dashboard search
...
Dashboard folders included in all searches. If a dashboard matches
a search and has a parent folder then the parent folder is appended
to the search result. A hierarchy is then returned in the result
with child dashboards under their parent folders.
2017-06-12 15:49:09 +02:00
Torkel Ödegaard
Torkel Ödegaard
Daniel Lee