Commits · 9c222a445f1f3bd3b7d7128ba3c7ee2c06e804c3 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

15 Mar, 2016 8 commits
- Merge branch 'master' into preferences · 9c222a44
  Torkel Ödegaard committed Mar 15, 2016
  
  9c222a44 Browse Files
- ux(): fixes to cards and sorting plugin list, #4364 · 1abdd170
  Torkel Ödegaard committed Mar 15, 2016
  
  1abdd170 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · dddd155a
  Torkel Ödegaard committed Mar 15, 2016
  
  dddd155a Browse Files
- ux(): added card layout selector and list view mode, #4364 · c4117145
  Torkel Ödegaard committed Mar 15, 2016
  
  c4117145 Browse Files
- add graphite logo to datasource card · cba7c172
  Trent White committed Mar 15, 2016
  
  cba7c172 Browse Files
- Merge pull request #4361 from bergquist/remove_staticRoot · 0b3ccaff
```
plugin.json: remove staticRoot field
```
  Carl Bergquist committed Mar 15, 2016
  0b3ccaff Browse Files
- ux(): initial pass at new card / list design, #4364 · 82eb32a7
  Torkel Ödegaard committed Mar 15, 2016
  
  82eb32a7 Browse Files
- feat(plugin.json): remove staticRoot field · e905c2c6
  bergquist committed Mar 15, 2016
  
  e905c2c6 Browse Files
14 Mar, 2016 8 commits
- Merge pull request #4363 from cookiefission/fix/trim-edges-typo · 13376d89
```
Fix minor typo in tooltip
```
  Torkel Ödegaard committed Mar 14, 2016
  13376d89 Browse Files
- Fix minor typo in tooltip · 8f97e8d5
  Sean Kenny committed Mar 14, 2016
  
  8f97e8d5 Browse Files
- fix(datasource): filter out built in data sources from data source type dropdown · ca5a34ad
  Torkel Ödegaard committed Mar 14, 2016
  
  ca5a34ad Browse Files
- Revert "fix(datasource): fixes testdatasource bug" · 953a0725
```
This reverts commit f77bd59e.
```
  bergquist committed Mar 14, 2016
  953a0725 Browse Files
- fix(datasource): fixes testdatasource bug · f77bd59e
  bergquist committed Mar 14, 2016
  
  f77bd59e Browse Files
- fix(opentsdb): fixed templating issue for OpenTSDB, fixes #4312, fixes #4311 · 4aba3bc6
  Torkel Ödegaard committed Mar 14, 2016
  
  4aba3bc6 Browse Files
- docs(): updated doc version · fc6ad205
  Torkel Ödegaard committed Mar 14, 2016
  
  fc6ad205 Browse Files
- feat(plugins): added filter (type) tabs po plugin list view · 69c8bb1e
  Torkel Ödegaard committed Mar 14, 2016
  
  69c8bb1e Browse Files
13 Mar, 2016 4 commits
- feat(plugins): added dashboards tab to plugin edit page, #4275 · c504abb8
  Torkel Ödegaard committed Mar 13, 2016
  
  c504abb8 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 2527289e
  Torkel Ödegaard committed Mar 13, 2016
  
  2527289e Browse Files
- feat(plugins): polish to plugin page, better handling for reading readme file contents · 581ffb86
  Torkel Ödegaard committed Mar 13, 2016
  
  581ffb86 Browse Files
- feat(cli): improve error message for missing permission · 8e70e9c1
  bergquist committed Mar 13, 2016
  
  8e70e9c1 Browse Files
12 Mar, 2016 4 commits
- plugins(): dashboards, changed wording installed to imported when showing… · 4a3c19c6
```
plugins(): dashboards, changed wording installed to imported when showing imported version in dashboard list
```
  Torkel Ödegaard committed Mar 12, 2016
  4a3c19c6 Browse Files
- feat(plugins): added prometheus dashboard to prometheus data source, #4298 · d575a5ce
  Torkel Ödegaard committed Mar 12, 2016
  
  d575a5ce Browse Files
- Merge branch 'dashboard-install' · 53dc145c
  Torkel Ödegaard committed Mar 12, 2016
  
  53dc145c Browse Files
- feat(plugins): dashboard import for data sources is working! #4298 · 0398face
  Torkel Ödegaard committed Mar 12, 2016
  
  0398face Browse Files
11 Mar, 2016 16 commits
- Merge branch 'master' of github.com:grafana/grafana · ef7d8ab9
  Torkel Ödegaard committed Mar 12, 2016
  
  ef7d8ab9 Browse Files
- fix(datasource edit): Editing datasources broken earlier today, fixes #4343 · 28f4f3a8
  Torkel Ödegaard committed Mar 12, 2016
  
  28f4f3a8 Browse Files
- refactor(): refactoring json usage · 3fb0b718
  Torkel Ödegaard committed Mar 12, 2016
  
  3fb0b718 Browse Files
- fix(): fixed from db -> json · 40b2f00d
  Torkel Ödegaard committed Mar 11, 2016
  
  40b2f00d Browse Files
- updated lib · 749da42f
  Torkel Ödegaard committed Mar 11, 2016
  
  749da42f Browse Files
- lib(): added simplejson lib · 1f9f439a
  Torkel Ödegaard committed Mar 11, 2016
  
  1f9f439a Browse Files
- more work on dashboard importing and templating · c5a81719
  Torkel Ödegaard committed Mar 11, 2016
  
  c5a81719 Browse Files
- fix(plugins): fixes broken plugin link · c1e4d059
  bergquist committed Mar 11, 2016
  
  c1e4d059 Browse Files
- fix(plugins): fixes broken link · 85466c7e
  bergquist committed Mar 11, 2016
  
  85466c7e Browse Files
- feat(cli): improves error message for 401 requests · 5094c1db
  bergquist committed Mar 11, 2016
  
  5094c1db Browse Files
- feat(cli): improve error handling for missing plugin dir · f5bb2b11
  bergquist committed Mar 11, 2016
  
  f5bb2b11 Browse Files
- feat(cli): add grafana net url · 8da702c2
  bergquist committed Mar 11, 2016
  
  8da702c2 Browse Files
- fix(): fixed changed partials paths · d2b0bad1
  Torkel Ödegaard committed Mar 11, 2016
  
  d2b0bad1 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · ece8a925
```
Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json
```
  Torkel Ödegaard committed Mar 11, 2016
  ece8a925 Browse Files
- feat(plugins): more work on plugin dashboard install, #4298 · fc54c01f
  Torkel Ödegaard committed Mar 11, 2016
  
  fc54c01f Browse Files
- Merge pull request #4335 from mtanda/cloudwatch_tag_query · 3fd420c9
```
(cloudwatch) support tag query
```
  Torkel Ödegaard committed Mar 11, 2016
  3fd420c9 Browse Files