Matt Toback
055e5aff2a
Merge branch 'style-changes-bulletfactory' of https://github.com/grafana/grafana into matt-updates-to-bulletactor
2016-02-11 15:47:50 -05:00
Matt Toback
692878b0c0
Checkbox fixes for light and dark themes, ready to hand over to trent for new images
2016-02-11 15:46:37 -05:00
Matt Toback
a6061ce555
Checkboxes working
2016-02-11 15:29:57 -05:00
Torkel Ödegaard
2ea548850e
Merge branch 'master' into style-changes-bulletfactory
...
Conflicts:
pkg/api/index.go
public/less/sidemenu.less
2016-02-11 21:23:54 +01:00
Trent White
d8b43a3d76
button size tweaks, user form tweaks
2016-02-11 14:41:21 -05:00
Trent White
6189208fa5
org and user form tweaks
2016-02-11 14:18:55 -05:00
Trent White
daf8db71a8
button spacing tweak. Dropdown hover color tweak, sexy pattern added
2016-02-11 13:00:36 -05:00
Trent White
c186d8b2be
button text position to center text vertically
2016-02-11 12:27:32 -05:00
Trent White
cd40362d47
sidenav tweaks, creating a content channel for the main content on non-dashboard pages
2016-02-11 12:02:12 -05:00
Torkel Ödegaard
ac5f7ecdea
fix(img): fixed img link on signup
2016-02-11 15:49:55 +01:00
Torkel Ödegaard
4e33e80957
fix(): clicking on items in graphites add function menu did not work, now works again, broken in recent panel refactorings
2016-02-11 15:25:34 +01:00
Torkel Ödegaard
bf1b60564e
fix(png rendering): fixed broken png rendering due to recent panel change
2016-02-11 14:34:15 +01:00
Torkel Ödegaard
39bb9ce118
Merge branch 'master' of github.com:grafana/grafana
2016-02-11 13:42:33 +01:00
Torkel Ödegaard
2d8180fc9c
fix(panels): restored panel name to edit mode
2016-02-11 13:42:18 +01:00
Trent White
581fb8ebfd
dropdown.less added
2016-02-10 18:14:52 -05:00
Trent White
0fa0b3b256
style changes to forms, icons updates and new buttons
2016-02-10 18:14:26 -05:00
utkarshcmu
4c35c83b84
Minor html fix
2016-02-10 11:13:17 -08:00
Torkel Ödegaard
ae39ec8585
feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk
2016-02-10 13:09:39 +01:00
Torkel Ödegaard
dfe0e258cd
feat(text and css): html partials and css can be loaded via systemjs
2016-02-10 11:54:17 +01:00
Torkel Ödegaard
eda23252e1
Merge branch 'master' of github.com:grafana/grafana
2016-02-10 11:03:26 +01:00
Torkel Ödegaard
257b824d4f
feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974
2016-02-10 11:03:12 +01:00
bergquist
b469904c7f
fix(login): hide divider if no oath
...
closes #3980
2016-02-10 10:41:43 +01:00
Torkel Ödegaard
509b37eb91
dependency(): upgraded angularjs to 1.5.1
2016-02-10 10:15:11 +01:00
Torkel Ödegaard
1ce34ed907
Merge pull request #3968 from daniellee/issue3831
...
Fixes when panel repeat is removed by clearing the templating variables
2016-02-10 09:41:06 +01:00
Torkel Ödegaard
f9e7b14f2c
cleanup(): removed old file
2016-02-10 08:32:16 +01:00
Torkel Ödegaard
dad394523f
fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster
2016-02-10 06:50:17 +01:00
Mitsuhiro Tanda
5c7689388d
fix template url for annotation editor
2016-02-10 11:42:59 +09:00
Torkel Ödegaard
fe2e6b8a80
feat(apps): began work on support for apps that contain data sources
2016-02-09 18:37:08 +01:00
Torkel Ödegaard
8784be9a14
feat(plugins): made it possible to have relative plugin template urls
2016-02-09 18:17:32 +01:00
Daniel Lee
72415be2db
fix(dashboard): fixes when panel repeat with templating removed
...
The original panel should clear all the templating variables and
look like it did before repeat was selected. Fixes #3831 . Also
cleans up after a row repeat is removed
2016-02-09 14:59:24 +01:00
Torkel Ödegaard
9653f43466
fix(): unit tests
2016-02-09 14:41:43 +01:00
Torkel Ödegaard
1acbd5b7d8
:merge branch 'app-pages'
...
Conflicts:
examples/nginx-app/module.js
examples/nginx-app/partials/stream.html
examples/nginx-app/plugin.json
2016-02-09 14:22:08 +01:00
Torkel Ödegaard
f0ecbd3878
feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master
2016-02-09 14:20:41 +01:00
Torkel Ödegaard
9dcfe6dc39
feat(apps): more work on app pages and sidemenu subnav
2016-02-09 14:06:23 +01:00
Torkel Ödegaard
397e4e4766
fix(img): img link on login
2016-02-09 12:20:09 +01:00
Torkel Ödegaard
5b9ed82d29
feat(plugins): working on plugin examples
2016-02-09 12:20:09 +01:00
Torkel Ödegaard
0def04ad34
feat(apps): more progress on app pages
2016-02-09 12:10:59 +01:00
Torkel Ödegaard
18eb9d6076
feat(apps): began work on app pages
2016-02-09 11:17:49 +01:00
bergquist
e7ff018487
feat(table): uses lodash to escape html
2016-02-09 11:16:07 +01:00
bergquist
ddb1d0c684
fix(table): escape / chars as well
2016-02-09 11:14:08 +01:00
bergquist
7d89cf228c
fix(table): remove html for htmlencoding option
2016-02-09 11:14:08 +01:00
bergquist
5775c0a341
feat(table): remove option to disable html encoding
2016-02-09 11:14:08 +01:00
bergquist
d750908e36
feat(table): escape html by default
...
closes #3673
2016-02-09 11:14:08 +01:00
bergquist
b1a648608b
test(table): rewrite invalid tests
2016-02-09 11:14:08 +01:00
Torkel Ödegaard
82d5d1b003
feat(plugins): working on plugin examples
2016-02-09 09:53:56 +01:00
Mitsuhiro Tanda
2cce057df1
(prometheus) add query result template query
2016-02-09 01:37:43 +09:00
Torkel Ödegaard
dea2234b14
Merge branch 'master' of github.com:grafana/grafana
2016-02-08 16:57:41 +01:00
Torkel Ödegaard
99a053bbdd
feat(): removed unused routes and minor fixes
2016-02-08 16:57:29 +01:00
Carl Bergquist
a3b6efdbfa
Merge pull request #2883 from mtanda/prometheus_annotation_support
...
Prometheus annotation support
2016-02-08 14:51:59 +01:00
Torkel Ödegaard
3a1dff6636
fix(): karma now works again, broken in last commit
2016-02-08 14:39:57 +01:00
