Torkel Ödegaard
507bff8b59
Godep is acting strangly
2015-01-16 15:48:34 +01:00
Torkel Ödegaard
3912ed5023
Role checking when saving dashboard, making sure that the user has owner or editor role
2015-01-16 15:28:44 +01:00
Torkel Ödegaard
984ece646f
Get access denied when trying to save from collaboration role viewer
2015-01-16 15:21:07 +01:00
Torkel Ödegaard
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
Torkel Ödegaard
9637efd5ee
renamed isAdmin to isGrafanaAdmin to make it less confusable with admin role
2015-01-16 14:31:09 +01:00
Torkel Ödegaard
52992928d5
Updated macaron dependency
2015-01-16 12:37:25 +01:00
Torkel Ödegaard
aa9ca68883
Tokens small fixes
2015-01-16 12:28:35 +01:00
Torkel Ödegaard
aaa717aac2
Refactoring apikeys into its own view
2015-01-16 12:28:09 +01:00
Torkel Ödegaard
4ece7fc038
Merge remote-tracking branch 'origin/tokens' into pro
2015-01-16 12:07:27 +01:00
Torkel Ödegaard
9feb8a73fd
Added binding to tokens api and role validation
2015-01-16 12:06:24 +01:00
Torkel Ödegaard
d3cc6e518d
updated collaborators
2015-01-16 12:06:05 +01:00
Torkel Ödegaard
f858f6b621
Add collaborator now handles role, added macaron-contrib/binding for binding and validation
2015-01-16 11:54:19 +01:00
Torkel Ödegaard
500e000661
Add collaborator now handles roles, added macaron-binding for binding and validation
2015-01-16 11:53:31 +01:00
Torkel Ödegaard
4c73d970e5
Merge branch 'master' of github.com:torkelo/grafana-private into pro
2015-01-16 09:32:06 +01:00
Torkel Ödegaard
becdaafdca
Refactored away the graphite-target-inner / tight-form-row
2015-01-16 09:31:38 +01:00
woodsaj
3887aa72cb
add tokens to UI under the Account Settings.
...
Adds support for adding and removing API tokens.
2015-01-16 16:04:46 +08:00
Torkel Ödegaard
72d7a7d91d
changed grafana-target css names in partials
2015-01-16 08:50:26 +01:00
Torkel Ödegaard
e1f410d32e
Starting css refactor for grafana-target
2015-01-16 08:35:32 +01:00
Torkel Ödegaard
cd5843e977
Fixed unit tests
2015-01-16 07:45:37 +01:00
Torkel Ödegaard
af3aa81d71
UI: Fixed position of confirm modal when scrolled down, Fixes #1345
2015-01-16 07:20:00 +01:00
Torkel Ödegaard
04bbdbad12
Worked on account update, moved collaborats to its own api url and files
2015-01-15 19:14:47 +01:00
Torkel Ödegaard
9d1dacb8d4
Worked on account update, moved collaborators to its own view
2015-01-15 19:14:07 +01:00
Torkel Ödegaard
f3bb2d41a7
removed sidemenu controller
2015-01-15 17:41:28 +01:00
Torkel Ödegaard
804bff55ec
Accounts admin view/get api
2015-01-15 15:54:22 +01:00
Torkel Ödegaard
5b93e09714
Very basic start for accounts admin view
2015-01-15 15:53:55 +01:00
Torkel Ödegaard
fdfcc3ab2a
Admin flagged users, create a default admin user on startup if missing
2015-01-15 14:44:15 +01:00
Torkel Ödegaard
cf344abff2
Admin menu only visible for admins
2015-01-15 14:43:44 +01:00
Torkel Ödegaard
5ec07db143
Refactoring of auth middleware, and starting work on account admin
2015-01-15 12:16:54 +01:00
Torkel Ödegaard
67b935188b
Fixed failing unit test
2015-01-15 10:52:22 +01:00
Torkel Ödegaard
0dfd09ed0e
fixed build.go setup
2015-01-14 20:51:22 +01:00
Torkel Ödegaard
6f63d63ee0
Working on account collaborators
2015-01-14 16:12:37 +01:00
Torkel Ödegaard
961ebbde6b
Working on account collaborators
2015-01-14 16:12:19 +01:00
Torkel Ödegaard
50a5355de0
Merge pull request #17 from torkelo/tokenGetAccountFix
...
fix getAccountByToken query.
2015-01-14 14:59:23 +01:00
woodsaj
f25cffd24e
fix getAccountByToken query.
2015-01-14 21:45:00 +08:00
Torkel Ödegaard
5e18afe916
Refactoring of api routes
2015-01-14 14:25:12 +01:00
Torkel Ödegaard
733a9af629
small changes
2015-01-14 14:24:54 +01:00
Torkel Ödegaard
166ce7d2ae
Added Gzip option and the macaron Gzip middleware, but does not seem to work
2015-01-14 10:34:14 +01:00
Torkel Ödegaard
5833867b44
renamed register route to signup
2015-01-14 10:19:53 +01:00
Torkel Ödegaard
6cc1502c89
Renamed register routes/ctrl to signup
2015-01-14 10:19:35 +01:00
Torkel Ödegaard
ced5e5500e
mini code cleanup of in auth
2015-01-14 10:14:07 +01:00
woodsaj
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
Torkel Ödegaard
e58cd91487
updated frontend
2015-01-13 14:07:34 +01:00
Torkel Ödegaard
10fd66b7c5
removed old sample directory, Closes #1333
2015-01-13 10:19:32 +01:00
Torkel Ödegaard
9f4ea7301a
Merge branch 'master' of github.com:torkelo/grafana-private into pro
2015-01-12 18:59:48 +01:00
Torkel Ödegaard
14e1bc8702
Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule, Watt, eV), and new design for graph axis & grid tab and single stat options tab views, #1331
2015-01-12 17:05:43 +01:00
Torkel Ödegaard
cc21c66b3a
Updated design of singlestat options view, it now uses the new unit format selector, #1331
2015-01-12 17:02:58 +01:00
Torkel Ödegaard
1e9c51072a
Added new units to dropdown in singlestat options, need to add new unit selector to singlestat panel, #1331
2015-01-12 16:24:44 +01:00
Torkel Ödegaard
4544f79471
Fixed influxdb and opentsdb editors to use latest markup and css, #1331
2015-01-12 16:18:35 +01:00
Torkel Ödegaard
a3da11c5bc
Fixed legend values check, got rid of the legend values checkbox, #1331
2015-01-12 15:59:22 +01:00
Torkel Ödegaard
66631da1c7
Some last polish to thew new axis editor view, #1331
2015-01-12 15:47:47 +01:00
Torkel Ödegaard
woodsaj