12852 Commits (083abff29792f5e4805d3032e2e699ae884c20da)

 

All Branches   

Search

Author	SHA1	Message	Date
bergquist	083abff297	Merge branch 'master' into provisioning ... * master: install dep instead of govendor on setup remove unused code from vendor migrate from govendor to dep fix: cloudwatch corrected error handling so original error is not thrown away Generic Oauth Support for ADFS (#9242) Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside mysql: convert numbers to text for annotation tooltip mysql: update to use ColumnTypes interface in new version mysql: update mysql driver to latest master gofmt my dear friend ux: updated react-layout-grid	8 years ago
bergquist	278337e45a	install dep instead of govendor on setup	8 years ago
Carl Bergquist	987a546e74	Merge pull request #10563 from grafana/golang_dep ... Migrated from govendor to dep	8 years ago
bergquist	7ed643f302	remove unused code from vendor	8 years ago
bergquist	e023f79c5a	migrate from govendor to dep	8 years ago
Torkel Ödegaard	4f59d229fe	fix: cloudwatch corrected error handling so original error is not thrown away	8 years ago
Torkel Ödegaard	4720b86f5c	Merge remote-tracking branch 'origin/mattttt-style-tweaks'	8 years ago
Dan Cech	5bb22b836d	Generic Oauth Support for ADFS (#9242) ... * check upn field if email address isn't present, support for adfs * correctly set login to the user's email address if not specified by the oauth server * break up GenericOAuth.UserInfo into helper functions	8 years ago
Matt	0dffb6dbb1	Adjusted the border color on the buttons in dashboard nav, fixed alert email text area width, fixed padding-top issue on dashboard settings aside	8 years ago
bergquist	7858965117	codestyle: extract code into methods	8 years ago
Daniel Lee	1a019052d5	mysql: convert numbers to text for annotation tooltip	8 years ago
Daniel Lee	6d13645206	mysql: update to use ColumnTypes interface in new version ... The custom code in vendor is not needed anymore and most of the mapping code can be replaced.	8 years ago
Daniel Lee	7bc7af6c39	mysql: update mysql driver to latest master ... The latest master implements the ColumnType interface. See https://github.com/go-sql-driver/mysql/issues/495 This removes the custom code in the vendor folder that did a ColumnType mapping.	8 years ago
bergquist	a32644198c	gofmt my dear friend	8 years ago
Torkel Ödegaard	7dc046d9f5	ux: updated react-layout-grid	8 years ago
Carl Bergquist	d6667c4fa0	Merge pull request #10548 from StevenTobin/follow_symlinks ... Make file_reader follow symlinks	8 years ago
bergquist	b6e6935821	plugins: send secureJsonData unencrypted	8 years ago
Carl Bergquist	81bb3e1e27	Merge pull request #10547 from grafana/provisioning ... Dashboard provisioning. Replace folder property with path	8 years ago
stobin	f1813ae3a3	Make file_reader follow symlinks	8 years ago
bergquist	34d7f8a44f	dashboards as cfg: property path replaces folder	8 years ago
bergquist	9e20004ec8	Merge branch 'plugin_lib' ... * plugin_lib: moves datasource plugin model to grafana/grafana_plugin_model	8 years ago
bergquist	a183ea97bb	moves datasource plugin model to grafana/grafana_plugin_model	8 years ago
Torkel Ödegaard	af9d1cc577	Update package.json ... fixed duplicate dev dependency, closes #10542	8 years ago
Torkel Ödegaard	561561d8fe	fix: fixed build issue	8 years ago
Torkel Ödegaard	66edb29f53	fix: multi valued query variables did not work correctly, fixes #10539	8 years ago
Torkel Ödegaard	c4c0e7934b	Update building_from_source.md ... corrected build instructions, #10532	8 years ago
Torkel Ödegaard	94b0c79631	Update README.md ... Simplified build instructions i	8 years ago
Torkel Ödegaard	6edc945e85	Update default_task.js ... removed build clean from test task, #10532	8 years ago
Leonard Gram	183507964c	Clearer naming for dashboard provisioning config. ... Renames folder (in options) to path to make it different from the grafana folder wherein the dashboard will be created.	8 years ago
Torkel Ödegaard	307b419f7c	ux: dashboard nav and settings tweaks	8 years ago
Torkel Ödegaard	11ba8070b8	Tag filters in search (#10521) ... * tag filter: initial react component * dashboard: move tag filter to filterbox * tag filter: customize value rendering * tag filter: get color from name * tag filter: custom option renderer * tag filter: mode with tags in different container * tag filter: refactor * refactoring PR #10519 * tag filter: refactor of PR #10521	8 years ago
Torkel Ödegaard	42d7308034	fix: save as enter key now works and folder selection also works, fixes #10464	8 years ago
bergquist	5eb36e65f2	use context over golang.org/x/net/context	8 years ago
Daniel Lee	87064bff79	docs: small update to IIS proxy docs	8 years ago
Patrick O'Carroll	08211eb220	added a variable for grid color and if statment to switch colors, fixes #10509 (#10517)	8 years ago
bergquist	1a6c2ea8d8	dashboards as cfg: logs error when trying to import dashboard with id ... dashboard json cannot contain fixed id when importing from disk. We used to override this but it didnt caught all problems so now we block dashboards from beeing imported instead. closes #10504	8 years ago
bergquist	3951df136c	Merge branch 'backend_plugins' ... * backend_plugins: (34 commits) code style fixes Adds Table in backend datasource contract. Adds Tables types to protobuf Review tsdb protobuf contract supports windows compatible plugin binaries moves plugin proxy to plugin package improves name for plugin logger uses pluginmanagers log instead of global removes commented code makes datasource handshake more explicit backend plugins: improves logging dont spawn new subprocess while shutting down plugins: restart killed plugins query result should be a map test for plugin path builder merge backend datasources and datasources use int64 for timestamps fixes invalid valud/timestamp order merge backend-datasource and datasource type fixes broken unit test ...	8 years ago
bergquist	5499f4910c	Merge branch 'master' into backend_plugins ... * master: (117 commits) fix: share snapshot controller was missing ngInject comment, fixes #10511 Use URLEncoding instead of StdEncoding to be sure state value will be corectly decoded (#10512) Optimize metrics and notifications docs Optimize cli and provisioning docs docs: Guide for IIS reverse proxy changelog: adds note about closing #9645 telegram: Send notifications with an inline image telegram: Switch to using multipart form rather than JSON as a body telegram: Fix a typo in variable name fix: alert list pause/start toggle was not working properly fix template variable selector overlap by the panel (#10493) dashboard: Close/hide 'Add Panel' before saving a dashboard (#10482) fix: removed unused param Fix variables values passing when both repeat rows and panels is used (#10488) moved angular-mocks out of dependencies ux: minor change to alert list page ux: minor word change to alert list fix: updated snapshot test Add eu-west-3 in cloudwatch datasource default's region (#10477) fix: Make sure orig files are not added to git again #10289 ...	8 years ago
bergquist	b511788c51	code style fixes	8 years ago
Leonard Gram	b63c834a4b	Adds Table in backend datasource contract.	8 years ago
Torkel Ödegaard	270db4da8b	fix: share snapshot controller was missing ngInject comment, fixes #10511	8 years ago
m-pavel	dff66559e4	Use URLEncoding instead of StdEncoding to be sure state value will be corectly decoded (#10512)	8 years ago
Carl Bergquist	baffdb156e	Merge pull request #10510 from nir0s/fix-docs ... Fix docs	8 years ago
nir0s	b7d4a1887c	Optimize metrics and notifications docs	8 years ago
nir0s	71a12c6bb6	Optimize cli and provisioning docs	8 years ago
Daniel Lee	77b5dee408	docs: Guide for IIS reverse proxy	8 years ago
bergquist	594447f5f5	changelog: adds note about closing #9645	8 years ago
Carl Bergquist	a69bdf9432	Merge pull request #9967 from rburchell/master ... Add support for inline image uploads to telegram notifier plugin	8 years ago
Robin Burchell	43109dc8ca	telegram: Send notifications with an inline image ... If image upload is enabled, but there is no public image repository, fall back to sending an image via telegram's API.	8 years ago
Robin Burchell	b6fcf2b609	telegram: Switch to using multipart form rather than JSON as a body ... This is a pre-requisite for uploading inline images.	8 years ago