Commit Graph

2777 Commits

Author SHA1 Message Date
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
d6f9ff34ce More work on new grap axis & grid edit tab, #1331 2015-01-12 15:37:22 +01:00
Torkel Ödegaard
a1e39ce24d Fixed show/hide axis toggles, #1331 2015-01-12 14:31:15 +01:00
Torkel Ödegaard
c39f9ed2f3 More work on refactoring and changing graph axis edit view, #1331 2015-01-12 14:00:30 +01:00
Torkel Ödegaard
3a27b610d5 Added all unit formats to new unit selector, #1331 2015-01-12 13:42:16 +01:00
Torkel Ödegaard
3dc30e4d8b Major reworking of the graph axis editor tab 2015-01-12 12:55:19 +01:00
Torkel Ödegaard
1a49d51d42 Merge branch 'Bps' of https://github.com/gitbisector/grafana into units
Conflicts:
	src/app/panels/graph/axisEditor.html
	src/app/panels/singlestat/editor.html
2015-01-12 10:06:12 +01:00
Torkel Ödegaard
0b46196ff5 Merge branch 'energy_formatting_units' of https://github.com/chron0/grafana into units
Conflicts:
	src/app/panels/graph/axisEditor.html
2015-01-12 10:04:11 +01:00
Torkel Ödegaard
ea6cea6f29 Merge branch 'master' of https://github.com/grimpy/grafana into units 2015-01-12 10:02:10 +01:00
Torkel Ödegaard
93fb02509b Removed flicker when refreshing a singlestat panel with spark line 2015-01-12 09:27:20 +01:00
Ties Bos
09a0ef2013 Add Bps support, much like bps 2015-01-11 22:19:59 -08:00
Torkel Ödegaard
ccbe055e5b Graph: Added right y axis label setting and graph support, Closes #599 2015-01-11 20:04:33 +01:00
Torkel Ödegaard
8e65f36131 Added system admin skeleton 2015-01-11 12:12:29 +01:00
Torkel Ödegaard
b66894f727 Added system admin page skeleton 2015-01-11 12:12:12 +01:00
Torkel Ödegaard
dc16c8c60c Added openldap docker/fig block, ldap auth seems to be complicated and take some time, not sure if that is high prio now 2015-01-11 12:11:49 +01:00
Torkel Ödegaard
92c3d80189 SingleStatPanel: You can now use template variables in pre & postfix, Closes #1321 2015-01-10 12:49:35 +01:00
Torkel Ödegaard
68cc3f86dd Handle default datasource management 2015-01-09 16:36:23 +01:00
Torkel Ödegaard
1d769fe41c Worked on handling marking a datasource as the default 2015-01-09 16:35:36 +01:00
Torkel Ödegaard
4edf0c9768 Fixed alert popup close icon 2015-01-09 16:28:58 +01:00
Torkel Ödegaard
d562dcd90c Default datasource and event system test 2015-01-09 11:01:37 +01:00
Torkel Ödegaard
f99e1ba441 Updated readme 2015-01-09 10:16:01 +01:00
Torkel Ödegaard
1b9b8ba2bf Fixed two icons 2015-01-09 10:15:42 +01:00
Torkel Ödegaard
16f7f68636 Plugins: fixed broken example panel plugin, Fixes #1318 2015-01-09 09:37:42 +01:00
Torkel Ödegaard
c1272de462 Merge branch 'master' of github.com:torkelo/grafana-private into pro 2015-01-08 19:04:38 +01:00
Torkel Ödegaard
31cf8812f6 Fixed some icons that I had missed when upgrading font awesome to 4.2 2015-01-08 19:03:45 +01:00
Torkel Ödegaard
a81a5315e1 Added graphite docker and fig config 2015-01-08 17:34:41 +01:00
Torkel Ödegaard
f332f22bed Updated icons to font-awesome 4.2 2015-01-08 15:00:34 +01:00
Torkel Ödegaard
08ae183877 Merge branch 'master' of github.com:torkelo/grafana-private into pro 2015-01-08 14:38:10 +01:00
Torkel Ödegaard
c4ce553936 Fixed icon in panel header when drilldown link is present 2015-01-08 14:37:50 +01:00