403 Commits

Author	SHA1	Message	Date
Anthony Woods	1bca28ad12	include the jsonData in the AppSettings DTO	2016-01-21 02:23:24 +08:00
Torkel Ödegaard	7a26d309b1	feat(apps): more work on apps and how apps can include panels	2016-01-19 18:18:53 +01:00
utkarshcmu	1952ebf7c4	Fixed failing gofmt tests	2016-01-19 00:33:30 -08:00
utkarshcmu	70481953fd	Snapshot name is saved in DB now	2016-01-19 00:26:20 -08:00
Torkel Ödegaard	3b5a583903	Merge branch 'master' into influxdb-policy-selector	2016-01-18 18:10:01 +01:00
Torkel Ödegaard	6fc972ab1e	feat(playlists): merge sync with RP	2016-01-18 16:05:38 +01:00
Torkel Ödegaard	66eebd1ac3	refactor(playlist): refactor of playlist feature, and PR #3776	2016-01-18 16:01:14 +01:00
Torkel Ödegaard	1adb7b286c	updated	2016-01-18 07:28:01 +01:00
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
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	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	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	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	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	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
Mitsuhiro Tanda	f84737d7d4	(cloudwatch) reuse credentials	2016-01-08 18:13:36 +09:00
Torkel Ödegaard	41a0995db7	feat(apps): minor progress on app meta data	2015-12-22 16:32:17 +01:00
Torkel Ödegaard	ad94f99d57	refactor(apps): more WIP work on apps	2015-12-22 11:37:44 +01:00
utkarshcmu	bcaaedf2ff	Resurrected nikita-graf's work and added playlistType for future use	2015-12-22 02:07:15 -08:00
Torkel Ödegaard	eacc46da6d	feat(plugins): WIP on new apps concept	2015-12-21 23:09:27 +01:00
woodsaj	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
utkarshcmu	d8b90721b3	Able to display login Id of the user in Last Updated By	2015-12-18 03:38:49 -08:00
utkarshcmu	cb5c1bd24d	Removed created_by and fixed gofmt	2015-12-18 02:30:20 -08:00
utkarshcmu	af371249f9	Successfully displayed userdId in UI	2015-12-18 01:52:05 -08:00
utkarshcmu	c433167950	Merged with master, resolved conflicts	2015-12-18 00:23:08 -08:00
utkarshcmu	e0ffcda32e	Added UI , DB settings	2015-12-18 00:20:23 -08:00
woodsaj	3d15ee6d74	allow app menu items to be selectivly pinned to the left nav menu	2015-12-18 15:10:52 +08:00