Torkel Ödegaard
38ddc88b20
fix(api): do not include null jsonData field in /api/datasources resource, closes #3755
2016-01-15 15:57:00 +01:00
bergquist
01d47fb280
fix(plugins): fix for default plugin dif
2016-01-15 11:22:41 +01:00
bergquist
83346a29aa
fix(plugins): scans default plugin path
2016-01-15 11:01:56 +01:00
Torkel Ödegaard
88a132b878
Merge branch 'dynamic-directives'
2016-01-14 18:57:34 +01:00
Torkel Ödegaard
e38e8c740f
Merge pull request #3723 from schen59/master-schen
...
fix mismatch api path introduced by commit to issue #3600
2016-01-13 19:51:56 +01:00
Shaofeng Chen
4ceab4abc7
fix mismatch api path
2016-01-13 10:44:31 -08:00
Torkel Ödegaard
8ff48c126a
fix(merge): minor merge fix
2016-01-13 15:51:47 +01:00
Torkel Ödegaard
6da3af5e89
Merge branch 'new_macaron'
2016-01-13 15:48:49 +01:00
Torkel Ödegaard
2cf0dc2cb2
fix(gofmt): fixed non formated go file
2016-01-13 15:43:32 +01:00
Torkel Ödegaard
bdb67d4909
fix(build): fixed dependency and build issue
2016-01-13 15:38:54 +01:00
bergquist
4fe72ebf69
feat(macaron): upgrades macaron version
2016-01-13 15:11:23 +01:00
Torkel Ödegaard
49fdf8427a
fix(png rendering): removed --ssl-protocol=any phantomjs param
2016-01-13 15:07:03 +01:00
Torkel Ödegaard
534bc83173
temp work on dynamic directives
2016-01-13 14:03:50 +01:00
Shaofeng Chen
dc427d5a2c
add get org by name api
2016-01-12 13:50:56 -08:00
Torkel Ödegaard
44f0242157
fix(build): fixed issue after merge
2016-01-12 15:45:55 +01:00
Torkel Ödegaard
e5b3f27a30
Merge branch 'apps'
2016-01-12 15:41:15 +01:00
Torkel Ödegaard
a15984b663
feat(apps): pages work
2016-01-12 15:39:29 +01:00
Carl Bergquist
f7fecdc6de
Merge pull request #3655 from grafana/playlist
...
Persistable playlists
closes #515
closes #1137
2016-01-12 15:20:43 +01:00
bergquist
1ec97e5199
feat(playlist): shortens urls
2016-01-12 14:36:04 +01:00
bergquist
458d15063d
fix(playlist): remove invalid logging
2016-01-12 14:28:19 +01:00
bergquist
e8786b0747
feat(playlist): renames timespan to interval
2016-01-12 13:56:47 +01:00
Torkel Ödegaard
ffe1407217
feat(apps): minor progress
2016-01-12 10:20:04 +01:00
Mitsuhiro Tanda
7d8519f5f0
add seoul region
2016-01-12 18:15:29 +09:00
bergquist
b79f04493d
style(playlist): abstract DTO creation
2016-01-12 08:36:25 +01:00
bergquist
07fdf6491c
fix(playlist): new url for viewing playlist
2016-01-12 08:17:44 +01:00
bergquist
98dccb8641
feat(playlist): refactor FE to support playlistitems
2016-01-12 08:17:44 +01:00
bergquist
8a38991270
feat(playlist): changes to relation table
...
Also introduces an abstraction between playlist and dashboard.
This will make it possible to att search, and tag filtering to
playlists without any major refactoring
2016-01-12 08:17:44 +01:00
Torkel Ödegaard
e081a5c5a0
feat(apps): worked on pinning apps
2016-01-11 18:03:08 +01:00
Torkel Ödegaard
4da31291d2
feat(apps): minor progress to apps list
2016-01-11 10:44:04 +01:00
Torkel Ödegaard
c1e94e61d0
feat(apps): lots of more work on apps, changed app_plugin to app_settings in order to to confuse the app plugin model (definition) and app org settings
2016-01-10 21:37:11 +01:00
Torkel Ödegaard
ab79348af5
feat(plugins): minor fix for external plugins with staticRoot
2016-01-09 23:56:39 +01:00
Torkel Ödegaard
1ffcea1952
feat(plugins): major improvement in plugins golang code
2016-01-09 23:34:20 +01:00
Torkel Ödegaard
c5635f9c89
feat(plugins): changed what datasources should return, they should now return the datasource constructor
2016-01-09 13:21:16 +01:00
Torkel Ödegaard
9943b9a226
feat(plugin): more work on plugin schema
2016-01-09 08:12:27 +01:00
Torkel Ödegaard
3bb20dbf2e
feat(plugins): changed plugin schema, pluginType -> type, type -> id
2016-01-08 23:15:44 +01:00
Torkel Ödegaard
7a8b3c419b
feat(apps): lots of progress
2016-01-08 20:57:58 +01:00
Torkel Ödegaard
60e7c6d150
Merge branch 'master' into apps
...
Conflicts:
public/app/partials/sidemenu.html
2016-01-08 18:10:53 +01:00
bergquist
0918063c55
fix(playlist): move dashboard uri cration to Backend
2016-01-08 16:13:49 +01:00
bergquist
22c001c8a6
fix(playlist): implement api according to new standard
2016-01-08 14:21:30 +01:00
Torkel Ödegaard
f67563e9ee
feat(apps): moving things around
2016-01-08 12:45:12 +01:00
Torkel Ödegaard
69d0e82453
Merge branch 'master' into apps
...
Conflicts:
pkg/services/sqlstore/migrations/migrations.go
2016-01-08 10:20:46 +01:00
Mitsuhiro Tanda
f84737d7d4
(cloudwatch) reuse credentials
2016-01-08 18:13:36 +09:00
bergquist
6c8d084664
Merge branch 'ssl-for-mysql' of https://github.com/improbable-io/grafana into improbable-io-ssl-for-mysql
2016-01-07 17:08:31 +01:00
bergquist
5792a16222
fix(plugins): removes warnings for missing folder
...
Remove warnings when scanning for plugins in the default
catalog data/plugins
closes #3663
2016-01-07 08:51:31 +01:00
bergquist
9343b0378d
feat(plugins): adds warn log for scanning folders
...
symlinks outside to plugin folder can cause problems.
This commit makes sure to warn about it in the logs
2016-01-06 11:57:17 +01:00
nikita-graf
ee400df930
remove dashboard from playlist when its destroyed
2016-01-05 04:14:39 +03:00
Carl Bergquist
311624beaa
Merge pull request #3598 from eddawley/ISSUE-2818
...
Fixes #2818 . Adds support for mysql backends via unix sockets
2015-12-28 10:33:49 +01:00
utkarshcmu
ca5099f53b
Fixed gofmt tests
2015-12-24 02:25:49 -08:00
utkarshcmu
5877e5e11a
Merged with master, resolved conflicts
2015-12-24 02:24:59 -08:00
Torkel Ödegaard
69eb62c09f
Merge pull request #3597 from eddawley/ISSUE-3461
...
Issue 3461: Session table is now created automatically
2015-12-24 09:59:34 +01:00
Torkel Ödegaard
bergquist
Torkel Ödegaard
Shaofeng Chen
Mitsuhiro Tanda
nikita-graf
utkarshcmu