root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 20 Packages Projects Releases Wiki Activity
16,765 Commits 1,399 Branches 636 Tags 2.5 GiB
Commit Graph

22 Commits

Author SHA1 Message Date
Torkel Ödegaard 5b5cb6622d Remove user form org now completely removes the user from the system if the user is orphaned 2018-10-11 07:48:35 +02:00
Mark Meyer 0f6e5e2953 Allow settting of default org id to auto-assign to (#12401) 
Author:    Mark Meyer <mark@ofosos.org>
 2018-07-13 12:14:40 -07:00
Marcus Efraimsson 004142a1e4
Merge pull request #12263 from grafana/11076_current_org 
Set current org when adding/removing user to org
 2018-06-18 11:19:42 +02:00
Marcus Efraimsson 6d48d0a80c
set current org when adding/removing user to org 
To not get into a situation where a user has a current organization assign which he is
not a member of we try to always make sure that a user has a valid current organization
assigned.
 2018-06-18 09:30:01 +02:00
bergquist 1181e96799 merge create user handlers 2018-06-15 21:23:57 +02:00
Daniel Lee 5a3ba68a9c database: fixes after xorm update 2018-03-16 00:09:29 +01:00
Torkel Ödegaard fcaa8227a6
Dashboard acl query fixes (#10909) 
* initial fixes for dashboard permission acl list query, fixes #10864

* permissions: refactoring of acl api and query
 2018-02-14 15:04:26 +01:00
Marcus Efraimsson a86f2fa34b user picker should only include users from current org (#10845) 2018-02-09 10:42:37 +01:00
Torkel Ödegaard 9c6c8c0f3f acl fixes 2017-06-22 17:10:43 -04:00
Torkel Ödegaard fcc8557dbb dashboard acl work 2017-06-21 14:11:16 -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
Torkel Ödegaard cbbbccf12a refactoring dashoard folder guardian 2017-06-17 18:24:38 -04:00
Daniel Lee 9e7aa65fb7 WIP: clean up after user and org user delete 2017-06-15 20:19:54 +02:00
Daniel Lee 193d468ed3 admin: adds paging to global user list 
Currently there is a limit of 1000 users in the global
user list. This change introduces paging so that an
admin can see all users and not just the first 1000.

Adds a new route to the api - /api/users/search that
returns a list of users and a total count. It takes
two parameters perpage and page that enable paging.

Fixes #7469
 2017-02-13 12:59:36 +01:00
Torkel Ödegaard a8aab0cb2b Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014 2015-05-19 11:47:14 +02:00
Torkel Ödegaard cb8110cd48 Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921 2015-05-01 16:23:36 +02:00
Torkel Ödegaard e771d8e944 Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899 2015-05-01 09:48:07 +02:00
Torkel Ödegaard f3d4d2782f Simplified single org settings, now auto_assign_org, and auto_assign_org_role, new [users] config section, Closes #1585 2015-03-11 16:19:29 +01:00
Torkel Ödegaard 04ca85fe89 Moved dashboard theme option from the dashboard to a persisted user setting, #1458 2015-02-28 14:30:08 +01:00
Torkel Ödegaard da41d99aa7 Fixed sql integration test 2015-02-23 20:48:43 +01:00
Torkel Ödegaard 26e4809e2e Big Backend Refatoring: Renamed Account -> Org 2015-02-23 20:07:49 +01:00