IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,921 Commits 5,454 Branches 554 Tags 1.9 GiB
a8c90e2365
Commit Graph

2921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
7d70ffe201 adding more columns for account table migration 2015-01-18 20:09:30 +01:00
Torkel Ödegaard
a64a38d7dd Added migration log and migration id, do not execute already executed migrations 2015-01-18 18:41:03 +01:00
Torkel Ödegaard
8bfed7508c More work on sql schema and migrations, starting to get somewhere 2015-01-18 14:51:51 +01:00
Torkel Ödegaard
68a77c4051 More progress on db schema setup and migrations, tricky stuff 2015-01-18 13:08:59 +01:00
Torkel Ödegaard
38f237efcb Merge branch 'master' of github.com:torkelo/grafana-pro 2015-01-18 08:56:32 +01:00
Torkel Ödegaard
2daffe2a15 Api import route updated 2015-01-18 08:56:19 +01:00
Torkel Ödegaard
1f987c1903 Began work on real sql schema definitions, and migration engine 2015-01-17 21:40:22 +01:00
Torkel Ödegaard
9a29b04561 Dashboard import/export now works 2015-01-17 10:39:26 +01:00
Torkel Ödegaard
1c5f902770 Added dashboard import feature 2015-01-17 10:39:01 +01:00
Torkel Ödegaard
3be11b9861 Small cosmetic change 2015-01-17 08:27:55 +01:00
Torkel Ödegaard
c970e82758 Small update to update account command 2015-01-17 08:20:25 +01:00
Torkel Ödegaard
a0036179d5 Removed alerts and graph from sidemenu, added required field to account input fields 2015-01-17 08:19:45 +01:00
Torkel Ödegaard
1532eb4278 Fixed png rendering 2015-01-16 17:00:31 +01:00
Torkel Ödegaard
64f98d2409 Mini fix for sidemenu 2015-01-16 17:00:02 +01:00
Torkel Ödegaard
ed879df1f4 Corrected spelling of SignedInUser (was SignInUser) 2015-01-16 16:17:35 +01:00
Torkel Ödegaard
2b05dac071 Api Key role is now correcty added do middleware context 2015-01-16 16:15:35 +01:00
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