Commits · 1c5f902770c260f9bc63a0f07f1e9d22f60ce796 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

17 Jan, 2015 2 commits
- Added dashboard import feature · 1c5f9027
  Torkel Ödegaard committed Jan 17, 2015
  
  1c5f9027 Browse Files
- Removed alerts and graph from sidemenu, added required field to account input fields · a0036179
  Torkel Ödegaard committed Jan 17, 2015
  
  a0036179 Browse Files
16 Jan, 2015 13 commits
- Mini fix for sidemenu · 64f98d24
  Torkel Ödegaard committed Jan 16, 2015
  
  64f98d24 Browse Files
- Get access denied when trying to save from collaboration role viewer · 984ece64
  Torkel Ödegaard committed Jan 16, 2015
  
  984ece64 Browse Files
- renamed isAdmin to isGrafanaAdmin to make it less confusable with admin role · 9637efd5
  Torkel Ödegaard committed Jan 16, 2015
  
  9637efd5 Browse Files
- Refactoring apikeys into its own view · aaa717aa
  Torkel Ödegaard committed Jan 16, 2015
  
  aaa717aa Browse Files
- Merge remote-tracking branch 'origin/tokens' into pro · 4ece7fc0
  Torkel Ödegaard committed Jan 16, 2015
  
  4ece7fc0 Browse Files
- updated collaborators · d3cc6e51
  Torkel Ödegaard committed Jan 16, 2015
  
  d3cc6e51 Browse Files
- Add collaborator now handles roles, added macaron-binding for binding and validation · 500e0006
  Torkel Ödegaard committed Jan 16, 2015
  
  500e0006 Browse Files
- Merge branch 'master' of github.com:torkelo/grafana-private into pro · 4c73d970
  Torkel Ödegaard committed Jan 16, 2015
  
  4c73d970 Browse Files
- Refactored away the graphite-target-inner / tight-form-row · becdaafd
  Torkel Ödegaard committed Jan 16, 2015
  
  becdaafd Browse Files
- add tokens to UI under the Account Settings. · 3887aa72
```
Adds support for adding and removing API tokens.
```
  woodsaj committed Jan 16, 2015
  3887aa72 Browse Files
- changed grafana-target css names in partials · 72d7a7d9
  Torkel Ödegaard committed Jan 16, 2015
  
  72d7a7d9 Browse Files
- Starting css refactor for grafana-target · e1f410d3
  Torkel Ödegaard committed Jan 16, 2015
  
  e1f410d3 Browse Files
- UI: Fixed position of confirm modal when scrolled down, Fixes #1345 · af3aa81d
  Torkel Ödegaard committed Jan 16, 2015
  
  af3aa81d Browse Files
15 Jan, 2015 4 commits
- Worked on account update, moved collaborators to its own view · 9d1dacb8
  Torkel Ödegaard committed Jan 15, 2015
  
  9d1dacb8 Browse Files
- removed sidemenu controller · f3bb2d41
  Torkel Ödegaard committed Jan 15, 2015
  
  f3bb2d41 Browse Files
- Very basic start for accounts admin view · 5b93e097
  Torkel Ödegaard committed Jan 15, 2015
  
  5b93e097 Browse Files
- Admin menu only visible for admins · cf344abf
  Torkel Ödegaard committed Jan 15, 2015
  
  cf344abf Browse Files
14 Jan, 2015 3 commits
- Working on account collaborators · 961ebbde
  Torkel Ödegaard committed Jan 14, 2015
  
  961ebbde Browse Files
- small changes · 733a9af6
  Torkel Ödegaard committed Jan 14, 2015
  
  733a9af6 Browse Files
- Renamed register routes/ctrl to signup · 6cc1502c
  Torkel Ödegaard committed Jan 14, 2015
  
  6cc1502c Browse Files
13 Jan, 2015 1 commit
- removed old sample directory, Closes #1333 · 10fd66b7
  Torkel Ödegaard committed Jan 13, 2015
  
  10fd66b7 Browse Files
12 Jan, 2015 17 commits
- Merge branch 'master' of github.com:torkelo/grafana-private into pro · 9f4ea730
  Torkel Ödegaard committed Jan 12, 2015
  
  9f4ea730 Browse Files
- Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule,… · 14e1bc87
```
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
```
  Torkel Ödegaard committed Jan 12, 2015
  14e1bc87 Browse Files
- Updated design of singlestat options view, it now uses the new unit format selector, #1331 · cc21c66b
  Torkel Ödegaard committed Jan 12, 2015
  
  cc21c66b Browse Files
- Added new units to dropdown in singlestat options, need to add new unit selector… · 1e9c5107
```
Added new units to dropdown in singlestat options, need to add new unit selector to singlestat panel, #1331
```
  Torkel Ödegaard committed Jan 12, 2015
  1e9c5107 Browse Files
- Fixed influxdb and opentsdb editors to use latest markup and css, #1331 · 4544f794
  Torkel Ödegaard committed Jan 12, 2015
  
  4544f794 Browse Files
- Fixed legend values check, got rid of the legend values checkbox, #1331 · a3da11c5
  Torkel Ödegaard committed Jan 12, 2015
  
  a3da11c5 Browse Files
- Some last polish to thew new axis editor view, #1331 · 66631da1
  Torkel Ödegaard committed Jan 12, 2015
  
  66631da1 Browse Files
- More work on new grap axis & grid edit tab, #1331 · d6f9ff34
  Torkel Ödegaard committed Jan 12, 2015
  
  d6f9ff34 Browse Files
- Fixed show/hide axis toggles, #1331 · a1e39ce2
  Torkel Ödegaard committed Jan 12, 2015
  
  a1e39ce2 Browse Files
- More work on refactoring and changing graph axis edit view, #1331 · c39f9ed2
  Torkel Ödegaard committed Jan 12, 2015
  
  c39f9ed2 Browse Files
- Added all unit formats to new unit selector, #1331 · 3a27b610
  Torkel Ödegaard committed Jan 12, 2015
  
  3a27b610 Browse Files
- Major reworking of the graph axis editor tab · 3dc30e4d
  Torkel Ödegaard committed Jan 12, 2015
  
  3dc30e4d Browse Files
- Merge branch 'Bps' of https://github.com/gitbisector/grafana into units · 1a49d51d
```
Conflicts:
	src/app/panels/graph/axisEditor.html
	src/app/panels/singlestat/editor.html
```
  Torkel Ödegaard committed Jan 12, 2015
  1a49d51d Browse Files
- Merge branch 'energy_formatting_units' of https://github.com/chron0/grafana into units · 0b46196f
```
Conflicts:
	src/app/panels/graph/axisEditor.html
```
  Torkel Ödegaard committed Jan 12, 2015
  0b46196f Browse Files
- Merge branch 'master' of https://github.com/grimpy/grafana into units · ea6cea6f
  Torkel Ödegaard committed Jan 12, 2015
  
  ea6cea6f Browse Files
- Removed flicker when refreshing a singlestat panel with spark line · 93fb0250
  Torkel Ödegaard committed Jan 12, 2015
  
  93fb0250 Browse Files
- Add Bps support, much like bps · 09a0ef20
  Ties Bos committed Jan 11, 2015
  
  09a0ef20 Browse Files