41e01184aa
Merge branch 'master' into develop
2017-09-18 12:32:29 +02:00
93cff1a42a
move more known datasources from others
2017-09-15 14:26:29 +02:00
cffbcb504d
allow ssl renegotiation for datasources
2017-09-13 16:20:24 -07: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
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
9fb60c2fc8
Merge branch 'develop' into panel-title-menu-ux
2017-08-02 09:56:08 +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
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
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
43ffe826fa
dashboard acl work
2017-06-20 17:18:20 -04:00
212a66ae5f
Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders
2017-06-19 18:55:34 -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
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
dd02bf7c9b
WIP: adds API check to stop folders being included in folders
2017-06-16 02:45:47 +02:00
699f9095e2
WIP: remove permissions when deleting global user
2017-06-14 23:45:30 +02:00
9f79b9b8c5
WIP: fix go fmt error
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
5c89c4b2bd
WIP: dashlist in template for new folder
2017-06-12 15:49:09 +02:00
fff7b706d6
WIP: user group additions
2017-06-12 15:49:09 +02:00
f1e1da39e3
WIP: get Dashboard Permissions
...
The guardian class checks if the user is allowed to get the
permissions for a dashboard.
2017-06-12 15:49:09 +02:00
13314f23ba
WIP: Can remove dashboard permission - sql
2017-06-12 15:49:09 +02:00
97c13b77bf
WIP: Add or update Dashboard ACL
...
SQL Integration Tests for the guardian class too.
2017-06-12 15:49:09 +02:00
3785894b40
WIP: guardian service for search
...
Removes restricted dashboards from search result.
2017-06-12 15:49:09 +02:00
552935031b
WIP: API methods for add/remove members to user group
2017-06-12 15:49:09 +02:00
0a1df0905e
WIP: add update user group command
2017-06-12 15:49:09 +02:00
233cd7af4a
WIP: add user group search
2017-06-12 15:49:09 +02:00
af67aea2a9
WIP: add usergroup commands and queries
2017-06-12 15:49:09 +02:00
1248728d7f
WIP: rough prototype of dashboard folders
...
Breaks some stuff like selected dash in the search result.
In dashboard search, if the user is not searching then the result is
returned as a tree structure. No ACL's or user group ux yet.
2017-06-12 15:49:09 +02:00
e2061312f5
refactoring: moved compare dashboard version command out of sqlstore, the code in this command did not use any sql operations and was more high level, could be moved out and use existing queries to get the versions
2017-06-06 00:15:40 +02:00
746d6cdc88
refactoring: changed name on compare command to make properties more explainatory
2017-06-05 23:29:25 +02:00
cabbfe9adc
refactoring: moved dashboard history item formating (message) and fixed dashboard history migration issue, and removed from frontend tests that where no longer needed
2017-06-05 22:59:04 +02:00
c87418d060
refactoring: Dashboard history restore operation is now reusing existing
...
operations instead of duplicating a bunch of get & save logic.
2017-06-05 17:45:27 +02:00
e18007153d
refactoring: Renamed dashboard version queries that wrongly had Command suffix, added missing OrgId to dashboard history commands and queries
2017-06-05 16:34:32 +02:00
Torkel Ödegaard
bergquist
Brandon Arp
Daniel Lee
Denis Doria
Torkel Ödegaard