Commit Graph

2870 Commits

Author SHA1 Message Date
Torkel Ödegaard
db371d2a5d API: added admin role requirement for account changes, datasource admin, and api keys admin 2015-01-26 20:26:17 +01:00
Torkel Ödegaard
01cce09ef2 Updated frontend 2015-01-26 16:00:03 +01:00
Torkel Ödegaard
d2f21bc93e Merge branch 'master' into pro 2015-01-26 15:56:39 +01:00
Torkel Ödegaard
5ba2423626 Worked on account update view 2015-01-26 15:42:22 +01:00
Torkel Ödegaard
a6b0856020 Worked on account update view 2015-01-26 15:42:11 +01:00
Torkel Ödegaard
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
Torkel Ödegaard
ab7e2f89fb Corrected the use of POST vs PUT, POST creates something, PUT updates, got them mixed up 2015-01-26 12:57:44 +01:00
Torkel Ödegaard
71ab8d6afc Merge branch 'master' of github.com:torkelo/grafana-private 2015-01-26 12:41:15 +01:00
Torkel Ödegaard
ea5da627af Panel: Different time periods, panels can override dashboard relative time and/or add a time shift, #171, only works for graph panel for now, need feedback for how to do it for singlestat panel 2015-01-26 11:49:18 +01:00
Torkel Ödegaard
1c8ef716a2 Began work on time overrides for panels, to enable different time periods on the same dashboard, #171 2015-01-26 10:57:08 +01:00
Torkel Ödegaard
6fc451da9e Small fix 2015-01-25 14:51:51 +01:00
Torkel Ödegaard
b940f4a97d Timepicker: New option in timepicker (under dashboard settings), to change now to be for example now-1m, usefull when you want to ignore last minute because it contains incomplete data, Closes #1242, Closes #374 2015-01-25 13:45:08 +01:00
Torkel Ödegaard
c2c81e7e6a Graph: Fix for all series tooltip showing series with all null values when Hide Empty option is enabled, Fixes #1359 2015-01-23 11:36:18 +01:00
Torkel Ödegaard
1508d0ac23 TemplatOCing: Fix to allow custom template variables to contain white space, now only splits on ',', Fixes #1363 2015-01-23 10:41:23 +01:00
Torkel Ödegaard
d3c37bda71 Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax), Fixes #1372 2015-01-23 10:29:54 +01:00
Torkel Ödegaard
c82e2d74bf Login validation 2015-01-22 11:51:44 +01:00
Torkel Ödegaard
1a11b400b0 Polish and incorporating new design for login screen from matt 2015-01-22 10:14:29 +01:00
Torkel Ödegaard
1d8bb45d3a quickfix for support suburl for sidemenu nav 2015-01-21 20:14:53 +01:00
Torkel Ödegaard
fc9de68ee9 fixed broken html on login page 2015-01-21 20:01:22 +01:00
Torkel Ödegaard
1fb9bbba91 a lot of work on sidemenu, and encoding dash edit view in url 2015-01-21 19:45:23 +01:00
Torkel Ödegaard
cd4fc78aec trying to get dashboard settings, annotations and templating views be opened via url parameters 2015-01-21 16:29:04 +01:00
Torkel Ödegaard
4e6a04923a worked on new sidemenu design 2015-01-21 14:44:34 +01:00
Torkel Ödegaard
83899eb884 added hamburger 2015-01-21 13:05:55 +01:00
Torkel Ödegaard
3744bc3228 fixed server side rendering 2015-01-21 10:51:42 +01:00
Torkel Ödegaard
a0c8d3fa6f Small fix to data source view 2015-01-21 10:51:28 +01:00
Torkel Ödegaard
d3c13a1d8c removed old signup/register view 2015-01-21 09:55:15 +01:00
Torkel Ödegaard
3c8c53194f Sign up and login work 2015-01-21 09:52:40 +01:00
Torkel Ödegaard
8ed9212401 Redesigned and polished login view, still needs work on validation 2015-01-21 09:51:31 +01:00
Torkel Ödegaard
5cef73331c Fixed asteric icon in graphite metric path selector, broken after resent font awesome upgrade, #1361 2015-01-21 07:27:27 +01:00
Torkel Ödegaard
5760fa104c trying to cleanup login page 2015-01-21 06:41:09 +01:00
Torkel Ödegaard
4786e0f882 Changed name for vendor folder 2015-01-20 17:53:20 +01:00
Torkel Ödegaard
3bf7f6ed5f Updated build post processsing to include vendor dir 2015-01-20 17:53:01 +01:00
Torkel Ödegaard
9e6df378c3 worked on account creation 2015-01-20 16:29:48 +01:00
Torkel Ödegaard
9667f324f1 added ability to create accounts from profile page 2015-01-20 16:29:19 +01:00
Torkel Ödegaard
eec178458b Validation check for not removing the last account admin 2015-01-20 15:48:19 +01:00
Torkel Ödegaard
4ea5d80099 Various fixes to data access 2015-01-20 15:23:14 +01:00
Torkel Ödegaard
d9a33680a6 Fixes to account/account users 2015-01-20 15:22:45 +01:00
Torkel Ödegaard
0a695ba17a Final work on migration, now there is no usage of xorm table sync 2015-01-20 14:44:37 +01:00
Torkel Ödegaard
afb847acc8 a lot of work on database schema and migration setup, postgres now works, every integration test passes for all database types, only token table left to do 2015-01-20 14:15:48 +01:00
Torkel Ödegaard
8bb9126b77 added postgres support for db migrations 2015-01-20 09:20:44 +01:00
Torkel Ödegaard
2379c5b770 Added loglevel to migrator, added dashboard table & index migrations 2015-01-20 08:50:08 +01:00
Torkel Ödegaard
581efa857b Small fixes 2015-01-19 19:10:29 +01:00
Torkel Ödegaard
590c3b4b50 Fixes to account users view 2015-01-19 19:10:04 +01:00
Torkel Ödegaard
e750508d76 Fixes for update user and add token 2015-01-19 18:57:51 +01:00
Torkel Ödegaard
efe7279ead Quick fix for frontend for account to user split 2015-01-19 18:57:25 +01:00
Torkel Ödegaard
90925273a0 User / Account model split, User and account now seperate entities, collaborators are now AccountUsers 2015-01-19 18:01:04 +01:00
Torkel Ödegaard
f1996a9f1f Initial work on seperation between user and account 2015-01-19 16:28:45 +01:00
Torkel Ödegaard
e411b8e423 Fixed icons in graph tooltip, not updated after recent font awesome upgrade, Closes #1355 2015-01-19 13:08:18 +01:00
Torkel Ödegaard
d8e5be5782 Worked on database agnostic table creation for db migrations 2015-01-19 10:44:16 +01:00
Torkel Ödegaard
7d70ffe201 adding more columns for account table migration 2015-01-18 20:09:30 +01:00