6a2a6afc1d
Merge branch 'develop' into apikey_hashed
...
Conflicts:
pkg/api/apikey.go
pkg/services/sqlstore/migrations.go
2015-02-26 15:48:54 +01:00
7c241fd617
Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517
2015-02-26 15:43:48 +01:00
9e789e6d82
More work on organization / admin nav, views, #1506
2015-02-25 14:27:34 +01:00
26e4809e2e
Big Backend Refatoring: Renamed Account -> Org
2015-02-23 20:07:49 +01:00
e9e2fa2927
Started Account -> Organization rename
2015-02-23 18:29:01 +01:00
1a106e5c38
Added change password ability to admin > edit user view, #1446
2015-02-23 11:24:22 +01:00
47c6c6e1b7
Added change password feature, Closes #1455
2015-02-19 16:09:49 +01:00
60ae4afe87
Refresh frontend datasourceSrv after datasource update, no longer need to reload the page to use a newly added or updated datasource, #1493
2015-02-18 14:06:44 +01:00
f6c07fdabd
Rewrote and redesign how the data source edit views look and work so they conform better to how account views look, removed tabs and put top nav items to add data source etc, made list, edit and new seperate url routes, #1483
2015-02-14 10:04:34 +01:00
e65a6cc063
added an inital admin settings view, very basic right now only displays all config options in grafana.ini
2015-02-12 15:46:14 +01:00
71f09ddd94
Added delete user action to user admin api, and made it work in UI, Closes #1466 , #1446
2015-02-11 16:47:22 +01:00
add4adeec9
Fixed links to user admin views, and backend html routes for user admin edit/create urls, Closes #1451
2015-02-10 16:26:23 +01:00
e165e2af95
Worked on user admin features, can now create and edit users as a grafana admin user, #1446
2015-02-10 15:36:51 +01:00
c5afcd8e09
Fixed issue with datasource proxying, it required account admin role when it should not
2015-02-10 10:19:43 +01:00
5269422f7c
Began work on hashing api keys
2015-02-09 13:30:04 +01:00
10820f31c2
Changed go package path
2015-02-05 10:37:13 +01:00
076905d14e
Added isStarred to search result hit, very inefficient loading right now but can be cached later on
2015-02-05 09:49:00 +01:00
42a5aefb23
Worked on home dashboard
2015-02-03 15:04:35 +01:00
97758380e0
Worked on stars in search results
2015-02-02 17:17:57 +01:00
ad3d15e28d
Worked on dashboard starring and unstarring, renamed favorite model to star
2015-02-02 11:32:32 +01:00
04d03f73b3
Added disable user sign up feature
2015-01-29 15:46:54 +01:00
1d6413bfae
More work on backend for user favorites
2015-01-29 12:10:34 +01:00
1cff564483
Fontend handling of account role to hide user actions and links that the user does not have access to
2015-01-28 11:33:50 +01:00
95305e7e11
Changed from goconfig to its new counter part go-ini
2015-01-27 10:09:54 +01:00
951ce0a102
API token -> API key rename
2015-01-27 08:26:11 +01:00
db371d2a5d
API: added admin role requirement for account changes, datasource admin, and api keys admin
2015-01-26 20:26:17 +01:00
5ba2423626
Worked on account update view
2015-01-26 15:42:22 +01:00
9a641ee7c0
Corrected the use of POST vs PUT, POST creates something, PUT updates, got them mixed up
2015-01-26 12:58:03 +01:00
3c8c53194f
Sign up and login work
2015-01-21 09:52:40 +01:00
9e6df378c3
worked on account creation
2015-01-20 16:29:48 +01:00
581efa857b
Small fixes
2015-01-19 19:10:29 +01:00
90925273a0
User / Account model split, User and account now seperate entities, collaborators are now AccountUsers
2015-01-19 18:01:04 +01:00
2daffe2a15
Api import route updated
2015-01-18 08:56:19 +01:00
c970e82758
Small update to update account command
2015-01-17 08:20:25 +01:00
3912ed5023
Role checking when saving dashboard, making sure that the user has owner or editor role
2015-01-16 15:28:44 +01:00
22156fe309
Big refactoring for context.User, and how current user info is fetching, now included collaborator role
2015-01-16 14:32:18 +01:00
aa9ca68883
Tokens small fixes
2015-01-16 12:28:35 +01:00
9feb8a73fd
Added binding to tokens api and role validation
2015-01-16 12:06:24 +01:00
f858f6b621
Add collaborator now handles role, added macaron-contrib/binding for binding and validation
2015-01-16 11:54:19 +01:00
04bbdbad12
Worked on account update, moved collaborats to its own api url and files
2015-01-15 19:14:47 +01:00
804bff55ec
Accounts admin view/get api
2015-01-15 15:54:22 +01:00
5ec07db143
Refactoring of auth middleware, and starting work on account admin
2015-01-15 12:16:54 +01:00
6f63d63ee0
Working on account collaborators
2015-01-14 16:12:37 +01:00
5e18afe916
Refactoring of api routes
2015-01-14 14:25:12 +01:00
5833867b44
renamed register route to signup
2015-01-14 10:19:53 +01:00
7b17e38f5d
add Token authentication support
...
Added CRUD methods for Tokens.
Extend Auth Handler to check for the presence of a Bearer Authorization
header to authenticate against. If there is no header, or the token is not
valid, the Auth Handler falls back to looking for a Session.
2015-01-14 16:33:34 +08:00
8e65f36131
Added system admin skeleton
2015-01-11 12:12:29 +01:00
a81a5315e1
Added graphite docker and fig config
2015-01-08 17:34:41 +01:00
d573ee22f1
Fixed missing godep dependency for unit tests
2015-01-08 09:23:34 +01:00
3e07605260
added a /api/metrics/test query that returns random walk series
2015-01-06 09:11:00 +01:00
