Commits · 28d296681941190637d7c1e63c92619407c97baf · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

22 Feb, 2016 29 commits
- Merge branch 'master' of https://github.com/grafana/grafana into select-form-updates · 28d29668
  Matt committed Feb 22, 2016
  
  28d29668 Browse Files
- fix(ux): fixed panel json edit view · 92efd179
  Torkel Ödegaard committed Feb 22, 2016
  
  92efd179 Browse Files
- fixed unit test · 3a7ec2a2
  Torkel Ödegaard committed Feb 22, 2016
  
  3a7ec2a2 Browse Files
- Merge branch 'popover-to-drop' · 56a05d78
  Torkel Ödegaard committed Feb 22, 2016
  
  56a05d78 Browse Files
- removed old popover and unused boostrap components · fa5cf602
  Torkel Ödegaard committed Feb 22, 2016
  
  fa5cf602 Browse Files
- ux(color popover): refactored color popover to use drop lib · c94659f5
  Torkel Ödegaard committed Feb 22, 2016
  
  c94659f5 Browse Files
- ux(dashboard): migrate view json to gf-form · 11645100
  bergquist committed Feb 22, 2016
  
  11645100 Browse Files
- Merge branch 'master' of https://github.com/grafana/grafana into select-form-updates · f2486702
  Matt committed Feb 22, 2016
  
  f2486702 Browse Files
- Form adjustments and startting to add sidemenu · 680ff95b
  Matt committed Feb 22, 2016
  
  680ff95b Browse Files
- feat(playlist): changes tag result into a list · 31ea5f55
  bergquist committed Feb 22, 2016
  
  31ea5f55 Browse Files
- style(admin): remove white spaces · fc62af6b
  bergquist committed Feb 22, 2016
  
  fc62af6b Browse Files
- Merge pull request #4083 from marknmel/patch-1 · f8533e66
```
Update kbn.js - correct typo for megabits/sec
```
  Carl Bergquist committed Feb 22, 2016
  f8533e66 Browse Files
- Merge pull request #4093 from utkarshcmu/minor-nav · 87fec9d4
```
some nav fixes
```
  Carl Bergquist committed Feb 22, 2016
  87fec9d4 Browse Files
- ux(admin): migrates edit org page · b1e9327a
  bergquist committed Feb 22, 2016
  
  b1e9327a Browse Files
- ux(admin): migrated admin new user page to gf-form · 0aa4b47d
  bergquist committed Feb 22, 2016
  
  0aa4b47d Browse Files
- ux(admin): migrates admin edit user page · b9d50fa1
  bergquist committed Feb 22, 2016
  
  b9d50fa1 Browse Files
- in progress work · 3231d767
  Torkel Ödegaard committed Feb 22, 2016
  
  3231d767 Browse Files
- fix(annotations): updated annotations query editor · 3f05b4bb
  Torkel Ödegaard committed Feb 22, 2016
  
  3f05b4bb Browse Files
- ux(): tweak to help popover annimation and fixed pull-right state · 9eabd956
  Torkel Ödegaard committed Feb 22, 2016
  
  9eabd956 Browse Files
- ux(): fixed sidemenu submenu hover issue that caused it to be hidden as the… · eb584146
```
ux(): fixed sidemenu submenu hover issue that caused it to be hidden as the mouse tried to move on to the submenu
```
  Torkel Ödegaard committed Feb 22, 2016
  eb584146 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · cb83c237
```
Conflicts:
	public/sass/_grafana.scss
```
  Torkel Ödegaard committed Feb 22, 2016
  cb83c237 Browse Files
- fix(): fixed systemjs config for test · 773a13dc
  Torkel Ödegaard committed Feb 22, 2016
  
  773a13dc Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 8c2f7ac0
  Torkel Ödegaard committed Feb 22, 2016
  
  8c2f7ac0 Browse Files
- ux(): help popover · f375c300
  Torkel Ödegaard committed Feb 22, 2016
  
  f375c300 Browse Files
- ux(playlist): finalize the ux for playlists · ea4ce0ce
  bergquist committed Feb 22, 2016
  
  ea4ce0ce Browse Files
- fix(annotations): rearrange missplaced save button · 6c617ba2
  bergquist committed Feb 22, 2016
  
  6c617ba2 Browse Files
- ux(): worked on new popover · b98c826e
  Torkel Ödegaard committed Feb 22, 2016
  
  b98c826e Browse Files
- ux(annotations): migrate annotations editors to new form · f225bb00
  bergquist committed Feb 22, 2016
  
  f225bb00 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 145c14ed
```
Conflicts:
	public/sass/.sass-lint.yml
	tasks/options/sasslint.js
```
  Torkel Ödegaard committed Feb 22, 2016
  145c14ed Browse Files
21 Feb, 2016 10 commits
- poc(): tether drop · a93fe5b2
  Torkel Ödegaard committed Feb 21, 2016
  
  a93fe5b2 Browse Files
- lib(): added teather lib and tested it with the panel menu · 8f9c3c83
  Torkel Ödegaard committed Feb 21, 2016
  
  8f9c3c83 Browse Files
- ux(): tweaks · 363f36df
  Torkel Ödegaard committed Feb 21, 2016
  
  363f36df Browse Files
- ux(): minor tweak · 7328f4d3
  Torkel Ödegaard committed Feb 21, 2016
  
  7328f4d3 Browse Files
- fix(): gradient hover only on main submenu item · 8f3b6a23
  Torkel Ödegaard committed Feb 21, 2016
  
  8f3b6a23 Browse Files
- ux(): fixed issue with cach buster for temlpates, and updated on hover style for… · cc4fdd6d
```
ux(): fixed issue with cach buster for temlpates, and updated on hover style for sidemenu to look better
```
  Torkel Ödegaard committed Feb 21, 2016
  cc4fdd6d Browse Files
- fix(): removed css background that should not have been there in last commit · 3781a099
  Torkel Ödegaard committed Feb 21, 2016
  
  3781a099 Browse Files
- fix(snapshot): fixed snapshot header, fixes #4094 · e4d52b28
  Torkel Ödegaard committed Feb 21, 2016
  
  e4d52b28 Browse Files
- fix(panel): fixed text panel issue due to recent style changes, fixes #4095 · ac45ccba
  Torkel Ödegaard committed Feb 21, 2016
  
  ac45ccba Browse Files
- fix(forms): reverted back to old checkboxes as the new ones are broken and… · 1a412378
```
fix(forms): reverted back to old checkboxes as the new ones are broken and missing clear state, fixes #4096
```
  Torkel Ödegaard committed Feb 21, 2016
  1a412378 Browse Files
20 Feb, 2016 1 commit
- some nav fixes · 17904a6e
  utkarshcmu committed Feb 20, 2016
  
  17904a6e Browse Files