Matt Toback
3c6fadb6f8
Merge pull request #4001 from mattttt/matt-updates-to-bulletactor
...
Matt updates to bulletactor
2016-02-11 15:55:32 -05:00
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
Mitsuhiro Tanda
81ad469533
(cloudwatch) custom metrics namespace support
2016-02-12 00:30:33 +09:00
utkarshcmu
bb77070aab
Merge branch 'master' of https://github.com/grafana/grafana into ds-conf-box
2016-02-11 07:03:04 -08:00
utkarshcmu
c051ff3eac
Removed unused commented code
2016-02-11 07:01:45 -08:00
Trent White
ff913333a2
update sidebar
2016-02-11 09:53:48 -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
50ddf7913a
docs(): work on example app
2016-02-11 14:28:04 +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
utkarshcmu
fac51d92c5
Added DS deletion confirmation modal
2016-02-11 00:06:04 -08:00
utkarshcmu
c3fc340c09
Merge branch 'master' of https://github.com/utkarshcmu/grafana into docs-refac
2016-02-10 23:12:41 -08: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
Torkel Ödegaard
3b21e9fcf0
Merge pull request #3991 from utkarshcmu/small-fix
...
Minor html fix
2016-02-10 20:43:41 +01:00
utkarshcmu
4c35c83b84
Minor html fix
2016-02-10 11:13:17 -08:00
Torkel Ödegaard
37c6a1ddf0
feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template
2016-02-10 16:43:35 +01:00
Torkel Ödegaard
9c0b89b9b0
Merge branch 'master' of github.com:grafana/grafana
2016-02-10 13:18:13 +01: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
bergquist
e37817285a
docs(readme): declare code as bash
2016-02-10 12:08:04 +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
9dac382fbf
dependency(): updated go lib go-xorm
2016-02-10 10:09:24 +01:00
Torkel Ödegaard
ddbdb54c04
Merge branch 'master' of github.com:grafana/grafana
2016-02-10 09:57:21 +01:00
Torkel Ödegaard
181a671bfb
dependency(): upgraded go-sql-driver/mysql, fixes #3969
2016-02-10 09:56:58 +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
Torkel Ödegaard
1c50eb345c
Merge pull request #3975 from mtanda/prometheus_fix_annotation
...
fix template url for prometheus annotation editor
2016-02-10 05:43:14 +01:00
Mitsuhiro Tanda
5c7689388d
fix template url for annotation editor
2016-02-10 11:42:59 +09:00
Torkel Ödegaard
baff9b0267
feat(apps): lots of work making apps easier to develop, module paths are handled automatically
2016-02-09 22:10:36 +01: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
fb74ebb4ea
:Merge branch 'master' of github.com:grafana/grafana
2016-02-09 18:17:43 +01:00
Torkel Ödegaard
8784be9a14
feat(plugins): made it possible to have relative plugin template urls
2016-02-09 18:17:32 +01:00
Torkel Ödegaard
fba3d7cb0f
Merge pull request #3970 from raintank/appScreenShots
...
add support for screenshots in plugins.
2016-02-09 16:31:28 +01:00
woodsaj
f953033ba7
add support for screenshots in plugins.
...
Allow plugin creators to include screenshots of their plugin
in action. Primarily for use in Grafana.net info pages.
2016-02-09 22:36:42 +08: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
