bergquist
|
d59beec354
|
feat(cli): move cli into main repo
|
2016-02-15 14:09:34 +01:00 |
|
bergquist
|
fe4cdc59be
|
fix(bra): fix bra runner
|
2016-02-15 13:19:03 +01:00 |
|
bergquist
|
6e7813f2f8
|
feat(build): move grafana into grafana-server
|
2016-02-15 11:15:38 +01:00 |
|
bergquist
|
da8782a9d0
|
remove unused imports
|
2016-02-15 10:34:47 +01:00 |
|
bergquist
|
d523d45124
|
fix(playlist): dont swallow errors
|
2016-02-15 10:09:15 +01:00 |
|
bergquist
|
c4d6051477
|
add fig option for opentsdb
|
2016-02-15 07:52:34 +01:00 |
|
Carl Bergquist
|
f881ada45c
|
Merge pull request #4032 from utkarshcmu/snap-bug
Fixing snapshot templating bug
|
2016-02-15 07:32:17 +01:00 |
|
utkarshcmu
|
b9b3b75c0c
|
Fixing snapshot templating bug
|
2016-02-14 22:13:59 -08:00 |
|
Torkel Ödegaard
|
afa4ee9a28
|
Merge branch 'master' of github.com:grafana/grafana
|
2016-02-14 10:39:30 +01:00 |
|
Torkel Ödegaard
|
92f4442356
|
fix(influxdb): fixed annotations editor, broken recently in master due to plugin changes, fixes #4023
|
2016-02-14 10:39:20 +01:00 |
|
Torkel Ödegaard
|
14952de2ee
|
Merge pull request #4009 from utkarshcmu/viewer-bug
Viewers restricted to edit panel
|
2016-02-13 10:30:02 +01:00 |
|
utkarshcmu
|
23167a0bb3
|
Viewers restricted to edit panel
|
2016-02-12 07:34:56 -08:00 |
|
Torkel Ödegaard
|
b5dc1727d2
|
fix(postgres): If password or user is empty use empty quotes for connection string, #3985
|
2016-02-12 10:10:07 +01:00 |
|
Torkel Ödegaard
|
53f5cb6553
|
fix(api): org name taken error now returns HTTP status code 409, closes
|
2016-02-12 10:01:52 +01:00 |
|
Torkel Ödegaard
|
f797b19825
|
fix(build): changed from postinstall script to regular grunt task for the copying of npm dependencies into public dir, fixes #4003
|
2016-02-12 09:58:00 +01:00 |
|
Torkel Ödegaard
|
814ca99e3d
|
fix(google tag manager): fixed link to google tag manager, fixes #4005
|
2016-02-12 09:52:52 +01:00 |
|
Carl Bergquist
|
c483b2ff98
|
Merge pull request #3999 from mtanda/cloudwatch_custom_metrics_namespace
(cloudwatch) custom metrics namespace support
|
2016-02-12 09:47:42 +01:00 |
|
Carl Bergquist
|
2496202417
|
Merge pull request #3998 from utkarshcmu/ds-conf-box
Added DS deletion confirmation modal
|
2016-02-12 09:46:41 +01: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 |
|
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 |
|
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 |
|