1adb7b286c
updated
2016-01-18 07:28:01 +01:00
38ddc88b20
fix(api): do not include null jsonData field in /api/datasources resource, closes #3755
2016-01-15 15:57:00 +01:00
88a132b878
Merge branch 'dynamic-directives'
2016-01-14 18:57:34 +01:00
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
4ceab4abc7
fix mismatch api path
2016-01-13 10:44:31 -08:00
8ff48c126a
fix(merge): minor merge fix
2016-01-13 15:51:47 +01:00
6da3af5e89
Merge branch 'new_macaron'
2016-01-13 15:48:49 +01:00
bdb67d4909
fix(build): fixed dependency and build issue
2016-01-13 15:38:54 +01:00
4fe72ebf69
feat(macaron): upgrades macaron version
2016-01-13 15:11:23 +01:00
534bc83173
temp work on dynamic directives
2016-01-13 14:03:50 +01:00
dc427d5a2c
add get org by name api
2016-01-12 13:50:56 -08:00
44f0242157
fix(build): fixed issue after merge
2016-01-12 15:45:55 +01:00
e5b3f27a30
Merge branch 'apps'
2016-01-12 15:41:15 +01:00
a15984b663
feat(apps): pages work
2016-01-12 15:39:29 +01:00
f7fecdc6de
Merge pull request #3655 from grafana/playlist
...
Persistable playlists
closes #515
closes #1137
2016-01-12 15:20:43 +01:00
1ec97e5199
feat(playlist): shortens urls
2016-01-12 14:36:04 +01:00
458d15063d
fix(playlist): remove invalid logging
2016-01-12 14:28:19 +01:00
e8786b0747
feat(playlist): renames timespan to interval
2016-01-12 13:56:47 +01:00
ffe1407217
feat(apps): minor progress
2016-01-12 10:20:04 +01:00
7d8519f5f0
add seoul region
2016-01-12 18:15:29 +09:00
b79f04493d
style(playlist): abstract DTO creation
2016-01-12 08:36:25 +01:00
07fdf6491c
fix(playlist): new url for viewing playlist
2016-01-12 08:17:44 +01:00
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
e081a5c5a0
feat(apps): worked on pinning apps
2016-01-11 18:03:08 +01:00
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
3bb20dbf2e
feat(plugins): changed plugin schema, pluginType -> type, type -> id
2016-01-08 23:15:44 +01:00
7a8b3c419b
feat(apps): lots of progress
2016-01-08 20:57:58 +01:00
60e7c6d150
Merge branch 'master' into apps
...
Conflicts:
public/app/partials/sidemenu.html
2016-01-08 18:10:53 +01:00
0918063c55
fix(playlist): move dashboard uri cration to Backend
2016-01-08 16:13:49 +01:00
22c001c8a6
fix(playlist): implement api according to new standard
2016-01-08 14:21:30 +01:00
f67563e9ee
feat(apps): moving things around
2016-01-08 12:45:12 +01:00
f84737d7d4
(cloudwatch) reuse credentials
2016-01-08 18:13:36 +09:00
41a0995db7
feat(apps): minor progress on app meta data
2015-12-22 16:32:17 +01:00
ad94f99d57
refactor(apps): more WIP work on apps
2015-12-22 11:37:44 +01:00
bcaaedf2ff
Resurrected nikita-graf's work and added playlistType for future use
2015-12-22 02:07:15 -08:00
eacc46da6d
feat(plugins): WIP on new apps concept
2015-12-21 23:09:27 +01:00
0903d5541b
Merge branch 'master' of github.com:grafana/grafana into externalPlugin
...
Conflicts:
pkg/api/api.go
pkg/api/api_plugin.go
pkg/api/datasources.go
pkg/api/frontendsettings.go
pkg/api/index.go
pkg/plugins/models.go
pkg/plugins/plugins.go
2015-12-22 00:23:24 +08:00
d8b90721b3
Able to display login Id of the user in Last Updated By
2015-12-18 03:38:49 -08:00
cb5c1bd24d
Removed created_by and fixed gofmt
2015-12-18 02:30:20 -08:00
af371249f9
Successfully displayed userdId in UI
2015-12-18 01:52:05 -08:00
c433167950
Merged with master, resolved conflicts
2015-12-18 00:23:08 -08:00
e0ffcda32e
Added UI , DB settings
2015-12-18 00:20:23 -08:00
3d15ee6d74
allow app menu items to be selectivly pinned to the left nav menu
2015-12-18 15:10:52 +08:00
48cf56b69a
more renaming. also moved apps and datasource menus
2015-12-18 13:46:40 +08:00
c35b51a268
refactor.
...
Rename externalPlugin to apiPlugin
Rename bundle to app
Move js, css, menuItem and staticRoot to be properties os App
Add "app" field to panel, datasource and api plugin models. If populated
then the plugin is only enabled if the specific app is enabled for the Org.
If app is "", then the plugin is enabled for all orgs and can't be disabled.
2015-12-17 23:53:58 +08:00
25d93d1041
Merge pull request #3066 from mtanda/cloudwatch_annotation
...
(cloudwatch) annotation support
2015-12-15 13:43:02 +01:00
5eab5dc47b
feat(plugins): removed external plugins and bundle code, not ready for master yet, will revert this commit in seperate branch
2015-12-15 10:28:52 +01:00
2ec5bc77d7
Merge branch 'external-plugins'
2015-12-15 10:10:48 +01:00
6fa5e681aa
fix EC2RoleProvider parameter
2015-12-15 11:25:20 +09:00
e631940d9e
pkg/api/cloudwatch: fix api client construction against aws-sdk-go v0.10.2
2015-12-15 11:25:19 +09:00
Torkel Ödegaard
Torkel Ödegaard
Shaofeng Chen
bergquist
Mitsuhiro Tanda
utkarshcmu
woodsaj