Commits · 0f6579801d8d5a61ba92096a8b43a49941b4990e · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

16 Mar, 2016 21 commits
- Merge branch 'master' into websocket · 0f657980
```
Conflicts:
	public/app/core/core.ts
```
  Torkel Ödegaard committed Mar 16, 2016
  0f657980 Browse Files
- fix(datasource): when addding data source withCredentials did not get set, fixes #4389 · fcaf2bfd
  Torkel Ödegaard committed Mar 16, 2016
  
  fcaf2bfd Browse Files
- Merge branch 'datasource-lists-cards' · 4144f71e
  Torkel Ödegaard committed Mar 16, 2016
  
  4144f71e Browse Files
- ux(): update data source list to card view, #4364 · 852ecd71
  Torkel Ödegaard committed Mar 16, 2016
  
  852ecd71 Browse Files
- fix(fonts): move icon fonts back to main css · aadc6e0b
  bergquist committed Mar 16, 2016
  
  aadc6e0b Browse Files
- feat(data source observerable): started work on handling data source observerable · a738945a
  Torkel Ödegaard committed Mar 16, 2016
  
  a738945a Browse Files
- Merge branch 'cli_colors' · 9d3cbfe8
  bergquist committed Mar 16, 2016
  
  9d3cbfe8 Browse Files
- Merge branch 'master' into cli_colors · 1a11f1e8
  bergquist committed Mar 16, 2016
  
  1a11f1e8 Browse Files
- feat(cli): adds some colors to ls command · a12f5376
  bergquist committed Mar 16, 2016
  
  a12f5376 Browse Files
- Merge pull request #4384 from vitorboschi/fixTypo · fd531e84
```
fix typo
```
  Carl Bergquist committed Mar 16, 2016
  fd531e84 Browse Files
- fix(opentsdb): fixed templating issue for single value variables, fixes #4312 · d26d7162
  Torkel Ödegaard committed Mar 16, 2016
  
  d26d7162 Browse Files
- fix typo · a9cdf580
  Vitor Boschi committed Mar 16, 2016
  
  a9cdf580 Browse Files
- Merge pull request #4383 from bbinet/patch-1 · 990acb3f
```
[docs] typos in plugins/installation.md
```
  Carl Bergquist committed Mar 16, 2016
  990acb3f Browse Files
- [docs] typos · 3486bf92
  Bruno Binet committed Mar 16, 2016
  
  3486bf92 Browse Files
- feat(dashlist): stores recently visited dashboards per orgid · ed1864e0
  bergquist committed Mar 16, 2016
  
  ed1864e0 Browse Files
- Merge branch 'local_fonts' · 0998ce81
  bergquist committed Mar 16, 2016
  
  0998ce81 Browse Files
- feat(fonts): download fonts from grafana instead of CDN · 99e06864
```
Makes its possible to run grafana without internet access.
The performance hit by not using a cdn is very small since
most grafana instances are setup on locally.

closes #4223
```
  bergquist committed Mar 16, 2016
  99e06864 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 0d7eb18d
  Torkel Ödegaard committed Mar 16, 2016
  
  0d7eb18d Browse Files
- fix(dashlist): fixed issue with viewing last viewed dashboards, when you had… · 81c11ebb
```
fix(dashlist): fixed issue with viewing last viewed dashboards, when you had more than dashboards in last viewed than panel limit they did not show up in list
```
  Torkel Ödegaard committed Mar 16, 2016
  81c11ebb Browse Files
- Merge pull request #4379 from mtanda/cloudwatch_tag_search_fix · 2e73c583
```
(cloudwatch) remove duplicative attribute
```
  Carl Bergquist committed Mar 16, 2016
  2e73c583 Browse Files
- (cloudwatch) remove duplicative attribute · 381a48f2
  Mitsuhiro Tanda committed Mar 16, 2016
  
  381a48f2 Browse Files
15 Mar, 2016 9 commits
- ux(): began work on updating data source list to cards view · e4c0c39f
  Torkel Ödegaard committed Mar 15, 2016
  
  e4c0c39f 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
- Merge branch 'master' into websocket · b273cd13
  Torkel Ödegaard committed Mar 15, 2016
  
  b273cd13 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 10 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
- feat(grafana_live): more work pushing data to websocket, #4355 · 2e1f2609
  Torkel Ödegaard committed Mar 14, 2016
  
  2e1f2609 Browse Files
- Fix minor typo in tooltip · 8f97e8d5
  Sean Kenny committed Mar 14, 2016
  
  8f97e8d5 Browse Files
- feat(websocket): reconnection and resubscription handling, #4355 · 92f20b9b
  Torkel Ödegaard committed Mar 14, 2016
  
  92f20b9b Browse Files
- feat(websocket): more work websocket ds, # 4355 · 3d5251d9
  Torkel Ödegaard committed Mar 14, 2016
  
  3d5251d9 Browse Files
- feat(live): wip work · 195be274
  Torkel Ödegaard committed Mar 14, 2016
  
  195be274 Browse Files
- feat(live): work on websocket data source, #3455 · 2adc4d12
  Torkel Ödegaard committed Mar 14, 2016
  
  2adc4d12 Browse Files
- Merge branch 'master' into websocket · 8d7b7009
  Torkel Ödegaard committed Mar 14, 2016
  
  8d7b7009 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
- feat(websockets): inital work on websockets, #4355 · fbd94fc6
  Torkel Ödegaard committed Mar 14, 2016
  
  fbd94fc6 Browse Files