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

09 Feb, 2016 21 commits
- Merge pull request #3970 from raintank/appScreenShots · fba3d7cb
```
add support for screenshots in plugins.
```
  Torkel Ödegaard committed Feb 09, 2016
  fba3d7cb Browse Files
- add support for screenshots in plugins. · f953033b
```
Allow plugin creators to include screenshots of their plugin
in action. Primarily for use in Grafana.net info pages.
```
  woodsaj committed Feb 09, 2016
  f953033b Browse Files
- fix(): unit tests · 9653f434
  Torkel Ödegaard committed Feb 09, 2016
  
  9653f434 Browse Files
- :merge branch 'app-pages' · 1acbd5b7
```
Conflicts:
	examples/nginx-app/module.js
	examples/nginx-app/partials/stream.html
	examples/nginx-app/plugin.json
```
  Torkel Ödegaard committed Feb 09, 2016
  1acbd5b7 Browse Files
- feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master · f0ecbd38
  Torkel Ödegaard committed Feb 09, 2016
  
  f0ecbd38 Browse Files
- feat(apps): more work on app pages and sidemenu subnav · 9dcfe6dc
  Torkel Ödegaard committed Feb 09, 2016
  
  9dcfe6dc Browse Files
- fix(img): img link on login · 397e4e47
  Torkel Ödegaard committed Feb 09, 2016
  
  397e4e47 Browse Files
- feat(plugins): working on plugin examples · 5b9ed82d
  Torkel Ödegaard committed Feb 09, 2016
  
  5b9ed82d Browse Files
- feat(apps): more progress on app pages · 0def04ad
  Torkel Ödegaard committed Feb 09, 2016
  
  0def04ad Browse Files
- Merge pull request #3952 from bergquist/table_html_escape · e9982bb2
```
Escape html in table panel
```
  Daniel Lee committed Feb 09, 2016
  e9982bb2 Browse Files
- feat(apps): began work on app pages · 18eb9d60
  Torkel Ödegaard committed Feb 09, 2016
  
  18eb9d60 Browse Files
- feat(table): uses lodash to escape html · e7ff0184
  bergquist committed Feb 09, 2016
  
  e7ff0184 Browse Files
- docs(changelog): add html encoding for table panel · 6ba5471b
  bergquist committed Feb 09, 2016
  
  6ba5471b Browse Files
- fix(table): escape / chars as well · ddb1d0c6
  bergquist committed Feb 09, 2016
  
  ddb1d0c6 Browse Files
- fix(table): remove html for htmlencoding option · 7d89cf22
  bergquist committed Feb 09, 2016
  
  7d89cf22 Browse Files
- feat(table): remove option to disable html encoding · 5775c0a3
  bergquist committed Feb 09, 2016
  
  5775c0a3 Browse Files
- feat(table): escape html by default · d750908e
```
closes #3673
```
  bergquist committed Feb 09, 2016
  d750908e Browse Files
- test(table): rewrite invalid tests · b1a64860
  bergquist committed Feb 09, 2016
  
  b1a64860 Browse Files
- docs(changelog): add prometheus annotation support · b7147a8b
  bergquist committed Feb 09, 2016
  
  b7147a8b Browse Files
- feat(plugins): working on plugin examples · 82d5d1b0
  Torkel Ödegaard committed Feb 09, 2016
  
  82d5d1b0 Browse Files
- Merge pull request #3472 from mtanda/prometheus_query_template · f4e90df4
```
(prometheus) templating by query result
```
  Carl Bergquist committed Feb 09, 2016
  f4e90df4 Browse Files
08 Feb, 2016 16 commits
- (prometheus) add query result template query · 2cce057d
  Mitsuhiro Tanda committed Feb 09, 2016
  
  2cce057d Browse Files
- Merge branch 'master' of github.com:grafana/grafana · dea2234b
  Torkel Ödegaard committed Feb 08, 2016
  
  dea2234b Browse Files
- feat(): removed unused routes and minor fixes · 99a053bb
  Torkel Ödegaard committed Feb 08, 2016
  
  99a053bb Browse Files
- docs(changelog): add update about fixed height legend · b7fd6bcf
  bergquist committed Feb 08, 2016
  
  b7fd6bcf Browse Files
- Merge pull request #2883 from mtanda/prometheus_annotation_support · a3b6efdb
```
Prometheus annotation support
```
  Carl Bergquist committed Feb 08, 2016
  a3b6efdb Browse Files
- fix(): karma now works again, broken in last commit · 3a1dff66
  Torkel Ödegaard committed Feb 08, 2016
  
  3a1dff66 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · cf92011f
  Torkel Ödegaard committed Feb 08, 2016
  
  cf92011f Browse Files
- refactor(): removed stuff · 01060332
  Torkel Ödegaard committed Feb 08, 2016
  
  01060332 Browse Files
- Merge pull request #3958 from bergquist/ux_login · 4a43cc1d
```
Login: UX improvements
```
  Carl Bergquist committed Feb 08, 2016
  4a43cc1d Browse Files
- feat(login): minor ux improvements · 0f52b439
```
make buttons bigger and introduce the login divider.

closes #3698
```
  bergquist committed Feb 08, 2016
  0f52b439 Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 9c0da733
  Torkel Ödegaard committed Feb 08, 2016
  
  9c0da733 Browse Files
- feat(influxdb): escape influxdb tag values, fixes #3950 · de90ad89
  Torkel Ödegaard committed Feb 08, 2016
  
  de90ad89 Browse Files
- Merge branch 'graph_legend_height' · 2f3d1ec2
  bergquist committed Feb 08, 2016
  
  2f3d1ec2 Browse Files
- feat(graph): sets fixed height for right side legend · 73bed388
```
closes #1277
```
  bergquist committed Feb 08, 2016
  73bed388 Browse Files
- fix(graph): add missing ctrl in variable · edebdb16
  bergquist committed Feb 08, 2016
  
  edebdb16 Browse Files
- ux(): mini fix! · 7f83be3d
  Torkel Ödegaard committed Feb 08, 2016
  
  7f83be3d Browse Files
07 Feb, 2016 2 commits
- fix(singlestat): fix for singlestat background and sparklines, fixes #3955 · a5d1e9ee
  Torkel Ödegaard committed Feb 07, 2016
  
  a5d1e9ee Browse Files
- ux(navbar): worked on responsive breakpoints for navbar · ff4dbea1
  Torkel Ödegaard committed Feb 07, 2016
  
  ff4dbea1 Browse Files
06 Feb, 2016 1 commit
- fix(): back to dashboard link fix · 89ef019b
  Torkel Ödegaard committed Feb 06, 2016
  
  89ef019b Browse Files