chronograf/enterprise
Jared Scheib 4e2617ea24 Merge branch 'master' into feature/admin
Conflicts:
	CHANGELOG.md
	enterprise/users.go
	server/admin.go
	server/admin_test.go
	ui/.eslintrc
	ui/src/shared/constants/index.js
	ui/src/store/configureStore.js
	ui/src/style/theme/theme-dark.scss
2017-03-10 18:36:37 -08:00
..
enterprise.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00
enterprise_test.go Update schema for /permissions endpoint to have scopes 2017-02-27 13:31:38 -06:00
meta.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00
meta_test.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00
mocks_test.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00
roles.go Fix users and roles PATCH removing all permissions 2017-03-02 13:57:53 -06:00
roles_test.go Update InfluxEnterprise users to return their roles 2017-03-01 19:13:44 -06:00
types.go Add a listing of all possible permissions for OSS and Enterprise 2017-02-19 13:47:19 -06:00
users.go Merge branch 'master' into feature/admin 2017-03-10 18:36:37 -08:00
users_test.go Add ability to update roles on a user resource 2017-03-10 16:52:24 -06:00