public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,448 Commits 655 Branches 650 Tags
1fb9bbba91e6d760d1c0ff2bd20021d1b7804a77
Commit Graph

2448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 d3c13a1d8c removed old signup/register view 2015-01-21 09:55:15 +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 5760fa104c trying to cleanup login page 2015-01-21 06:41:09 +01:00
Torkel Ödegaard 3bf7f6ed5f Updated build post processsing to include vendor dir 2015-01-20 17:53:01 +01:00
Torkel Ödegaard 9667f324f1 added ability to create accounts from profile page 2015-01-20 16:29:19 +01:00
Torkel Ödegaard d9a33680a6 Fixes to account/account users 2015-01-20 15:22:45 +01:00
Torkel Ödegaard 590c3b4b50 Fixes to account users view 2015-01-19 19:10:04 +01:00
Torkel Ödegaard efe7279ead Quick fix for frontend for account to user split 2015-01-19 18:57:25 +01:00
Torkel Ödegaard 1c5f902770 Added dashboard import feature 2015-01-17 10:39:01 +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 64f98d2409 Mini fix for sidemenu 2015-01-16 17:00:02 +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 9637efd5ee renamed isAdmin to isGrafanaAdmin to make it less confusable with admin role 2015-01-16 14:31:09 +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 d3cc6e518d updated collaborators 2015-01-16 12:06:05 +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 af3aa81d71 UI: Fixed position of confirm modal when scrolled down, Fixes #1345 2015-01-16 07:20:00 +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 5b93e09714 Very basic start for accounts admin view 2015-01-15 15:53:55 +01:00
Torkel Ödegaard cf344abff2 Admin menu only visible for admins 2015-01-15 14:43:44 +01:00
Torkel Ödegaard 961ebbde6b Working on account collaborators 2015-01-14 16:12:19 +01:00
Torkel Ödegaard 733a9af629 small changes 2015-01-14 14:24:54 +01:00
Torkel Ödegaard 6cc1502c89 Renamed register routes/ctrl to signup 2015-01-14 10:19:35 +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