Commits · db95a01febb210a858c0cc3833879cccdf896ee7 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

13 Dec, 2017 22 commits
- Merge branch 'develop' of github.com:grafana/grafana into develop · db95a01f
  Torkel Ödegaard committed Dec 13, 2017
  
  db95a01f Browse Files
- ux: refactoring login page change · 3c650156
  Torkel Ödegaard committed Dec 13, 2017
  
  3c650156 Browse Files
- navmodel: fix for signout link on pref page · 7d0ca63b
```
without a target property on the link, the signout tab on
the preferences page returned a 404.
```
  Daniel Lee committed Dec 13, 2017
  7d0ca63b Browse Files
- change protip to go to manage dashboards · f18eeaa9
  bergquist committed Dec 13, 2017
  
  f18eeaa9 Browse Files
- Merge remote-tracking branch 'origin/9879-login' into develop-login2 · aa4f1fa9
  Torkel Ödegaard committed Dec 13, 2017
  
  aa4f1fa9 Browse Files
- Merge branch 'develop' of github.com:grafana/grafana into develop · d417a625
  Torkel Ödegaard committed Dec 13, 2017
  
  d417a625 Browse Files
- search: worked on search results · 313735bd
  Torkel Ödegaard committed Dec 13, 2017
  
  313735bd Browse Files
- Merge branch 'develop' into 9879-login · c433597f
  Johannes Schill committed Dec 13, 2017
  
  c433597f Browse Files
- ux: wip - Login animation POC (#9879) · b8bfe51b
  Johannes Schill committed Dec 13, 2017
  
  b8bfe51b Browse Files
- ux: Move "Sign up" and "Reset password" to its own pages - and remove all inline styling (#9879) · 0be97893
  Johannes Schill committed Dec 13, 2017
  
  0be97893 Browse Files
- ux: org user management changes · ccbd1800
  Torkel Ödegaard committed Dec 13, 2017
  
  ccbd1800 Browse Files
- changed width to input fields (#10184) · daf32c57
  Patrick O'Carroll committed Dec 13, 2017
  
  daf32c57 Browse Files
- ux: added search box to ds list page, closes #10106 · cacbcb9c
  Torkel Ödegaard committed Dec 13, 2017
  
  cacbcb9c Browse Files
- ux: change members to users · 22aa1f7e
  Torkel Ödegaard committed Dec 13, 2017
  
  22aa1f7e Browse Files
- plugins: fixed plugin edit page and plugin page · 60e2ba11
  Torkel Ödegaard committed Dec 13, 2017
  
  60e2ba11 Browse Files
- dashfolders: Minor css fixes for bulk edit · c6a02bec
  Marcus Efraimsson committed Dec 13, 2017
  
  c6a02bec Browse Files
- dashfolders: Minor css fixes for bulk edit · a9ba7b91
  Marcus Efraimsson committed Dec 13, 2017
  
  a9ba7b91 Browse Files
- dashfolder: settings page for folder · c98e1590
```
with rename and delete. Fixes #10120
```
  Daniel Lee committed Dec 13, 2017
  c98e1590 Browse Files
- fix: FolderId and IsFolder when saving dashboard · 2465fcbd
  Torkel Ödegaard committed Dec 13, 2017
  
  2465fcbd Browse Files
- ux: fixed inactive view mode and removed animation · d3858d88
  Torkel Ödegaard committed Dec 13, 2017
  
  d3858d88 Browse Files
- Merge branch 'develop' into 9879-login · 6a2b1e52
  Johannes Schill committed Dec 13, 2017
  
  6a2b1e52 Browse Files
- fix: Handle state when no password is entered on registration page (#9879) · 1f8c1a5c
  Johannes Schill committed Dec 13, 2017
  
  1f8c1a5c Browse Files
12 Dec, 2017 18 commits
- ux: move add member into its own page (#10167) · d85405d5
  Alexander Zobnin committed Dec 12, 2017
  
  d85405d5 Browse Files
- minor fix for #10136 · 67f1435d
  Torkel Ödegaard committed Dec 12, 2017
  
  67f1435d Browse Files
- Merge branch 'refactor-user-group-to-team' of… · 05cc1f85
```
Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team
```
  Torkel Ödegaard committed Dec 12, 2017
  05cc1f85 Browse Files
- Fix graph legend scroll (#10169) · 10fbfcb1
```
* graph panel: fix legend scroll

* graph panel: enable scroll for table legend

* graph panel: fix legend right side toggle
```
  Alexander Zobnin committed Dec 12, 2017
  10fbfcb1 Browse Files
- fix colorpicker colors order (width issue) (#10170) · 8aaaee5e
  Alexander Zobnin committed Dec 12, 2017
  
  8aaaee5e Browse Files
- fix: fixed build failure · e88bd67d
  Torkel Ödegaard committed Dec 12, 2017
  
  e88bd67d Browse Files
- ux: Use the previously renamed classes (#9879) · 86244146
  Johannes Schill committed Dec 12, 2017
  
  86244146 Browse Files
- fix: fixed dashboard api tests · 89db9cc9
  Torkel Ödegaard committed Dec 12, 2017
  
  89db9cc9 Browse Files
- fix: don't detect graphite version before it's saved · de91d684
  Torkel Ödegaard committed Dec 12, 2017
  
  de91d684 Browse Files
- updated new dashboard folder · cfd755eb
  Torkel Ödegaard committed Dec 12, 2017
  
  cfd755eb Browse Files
- ux: style tweaks · 271c597c
  Torkel Ödegaard committed Dec 12, 2017
  
  271c597c Browse Files
- ux: Update ui of login buttons via third parties and add link to sign up page (#9879) · 01e90536
  Johannes Schill committed Dec 12, 2017
  
  01e90536 Browse Files
- ux: search look update · d379b501
  Torkel Ödegaard committed Dec 12, 2017
  
  d379b501 Browse Files
- tech: updated version for react-grid item · df25c9f0
  Torkel Ödegaard committed Dec 12, 2017
  
  df25c9f0 Browse Files
- Merge branch 'master' into develop · 8a61e096
  Torkel Ödegaard committed Dec 12, 2017
  
  8a61e096 Browse Files
- build: fixed unit test failure · a00af85f
  Torkel Ödegaard committed Dec 12, 2017
  
  a00af85f Browse Files
- Merge branch 'master' into develop · cafed8ce
  Torkel Ödegaard committed Dec 12, 2017
  
  cafed8ce Browse Files
- allow overriding dashboards from api · ff1b71bc
  bergquist committed Dec 12, 2017
  
  ff1b71bc Browse Files