17 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	ee0e4d2b69	Merge branch 'master' into external-plugins ... Conflicts: public/app/plugins/panels/table/editor.ts public/views/index.html	2015-12-02 18:30:48 +01:00
Torkel Ödegaard	8eb3e48bc7	fix(build): fixed build issues with concat not including require_config	2015-12-02 18:22:47 +01:00
Torkel Ödegaard	df0bc7bbc4	feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185	2015-11-20 09:43:10 +01:00
Torkel Ödegaard	69daede583	feat(external plugins): worked on supporting external plugins better	2015-11-19 18:44:07 +01:00
Torkel Ödegaard	b21fa2daa0	Merge branch 'externalPlugin' of https://github.com/raintank/grafana into external-plugins	2015-11-19 11:05:27 +01:00
woodsaj	d503c5d83d	refer to plugins are ExternalPlugin instead of thirdParty	2015-11-11 14:30:07 +08:00
Torkel Ödegaard	97de8c1cc2	refactoring: move moving stuff around	2015-10-30 15:04:27 +01:00
Anthony Woods	cf89b565a6	initial import of thirdParty route support	2015-10-15 04:14:09 +08:00
Gary McLean Hall	59a2042a31	Removed spurious </div>, fixes Edge on Windows	2015-10-08 00:14:00 +01:00
Torkel Ödegaard	4ffa26cf2c	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
Torkel Ödegaard	7e44a8ed1d	feat(tagmanager): added Name variable to datalayer	2015-08-26 15:07:39 +02:00
Torkel Ödegaard	3d37c9c9a3	feat(tagmanager): support to add google tagmanager id, closes #2569	2015-08-21 09:30:39 +02:00
Torkel Ödegaard	fd319bd5f5	Moved requirejs to bower, #677	2015-06-13 23:01:54 +02:00
DaveBlooman	85c45c2b8f	Add Android 5 theme colour	2015-05-05 22:42:56 +01:00
Torkel Ödegaard	d10ce90936	Fixed XSS issue with file based dashboards, was really casued by an issue with alertSrv accepting html in message alerts	2015-04-29 15:50:47 +02:00
Torkel Ödegaard	3b737999d6	Unsaved changes: Do not show for users with role , Fixes #1703	2015-04-02 08:08:22 +02:00
Torkel Ödegaard	fde11be279	Renamed src directory to public	2015-03-29 12:57:28 +02:00