15246 Commits (9ba42f63f1694c86e47b46f8cfef701ad1ce842c)

 

All Branches   

Search

Author	SHA1	Message	Date
zicklam	a89351e8e0	correct example (#12481) ... foo.bar.com in description, but foo.bar in configuration. Updated description, makes more sense then changing the configuration :)	8 years ago
Torkel Ödegaard	37efa934f1	ldap: improved ldap test env with more structured users and groups	8 years ago
Leonard Gram	5e08bf5130	test: fixed usage of wrap in tests.	8 years ago
Leonard Gram	4245f0ce11	ci: typo	8 years ago
Leonard Gram	8d6797c367	ci: publishes grafana enterprise to s3.	8 years ago
Torkel Ödegaard	6286c31d4b	refactoring: making api wrap public	8 years ago
Torkel Ödegaard	b8724ae0c4	refactoring: enterprise build/hooks refactorings (#12478)	8 years ago
Tobias Skarhed	2941dff428	Karma to Jest: datasource_srv (#12456) ... * Karma to Jest: datasource_srv * Sort function differs between Karma and Jest * Fix error based on .sort() implementation * Remove Karma test * alerting: only log when screenshot been uploaded * Remove comments * Karma to Jest: datasource_srv * Sort function differs between Karma and Jest * Fix error based on .sort() implementation * Remove Karma test * Remove comments * Remove console.log * Remove console.log * Change sorting and add test for default data source	8 years ago
Torkel Ödegaard	10e86eda69	fix: #12461 introduced issues with route registration ordering, adding plugin static routes before plugins package had been initiated (#12474)	8 years ago
Mitsuhiro Tanda	aa1b5959da	omit extra template refresh (#12454)	8 years ago
Carl Bergquist	861af4cb97	Improve extensions build. (#12461) ... * enable ee build on pr/master * step1: of including group sync * disable commit pinning for now * fixes broken build * enable team to ldap group sync * avoid returning error for missing external handler * services: allow routes to be added before http server start * services: allows services to add their own migrations * moves db migrations to ee code base * build using master branch in ee * disable enterprise build in .bra.toml [skip ci] * removes team sync extensions * removes commented line	8 years ago
Sven Klemm	1601f6d17c	[mysql] fix $__timeGroup rounding (#12469) ... * fix $__timeGroup rounding for mysql * revert accidentally commented out line	8 years ago
Sven Klemm	f017c04a65	[mssql] fix $__timeGroup rounding (#12470) ... * fix $__timeGroup rounding for mssql * revert enabling of mssql integration tests	8 years ago
Sven Klemm	c2c22c142b	[postgres] fix timeGroup macro rounding (#12468) ... * fix timeGroup tests to check for correct grouping * do explicit floor rounding in $__timeGroup macro * fix typo in comments	8 years ago
Will Weber	c03d527d25	pkg/social/github: Allow changing of userinfo data (#12471) ... Experienced a problem where a user whose email changed was no longer able to login. By using the ID as a primary identifier, we can avoid conflicts of this variety within the github OAuth provider.	8 years ago
Sven Klemm	410449b5e7	use sqlPart for ui parts	8 years ago
Sven Klemm	d26cacccd9	Merge remote-tracking branch 'upstream/master' into postgres-query-builder	8 years ago
Carl Bergquist	88783d6e0a	avoid calling os.Exit outside main.go (#12459) ... I don't think we should call os.Exit outside main.go. Calling os.Exit breaks the application control flow.	8 years ago
Marcus Efraimsson	845724e8b9	update mysql/mssql query/annotation help sections	8 years ago
Marcus Efraimsson	7a4858dd11	docs: update folders api	8 years ago
Austin Winstanley	59675dc564	Changed documentation for MSSQL and MySQL to reflect macro changes	8 years ago
Marcus Efraimsson	2835acf48c	docs: update scripted dashboard for v5	8 years ago
Marcus Efraimsson	4530925b9f	docs: update scripted dashboard for v5	8 years ago
Marcus Efraimsson	cdaeb1578d	docs: update organisation http api ... make the distinction clearer between /api/org and /api/orgs and that basic auth must be used for the /api/orgs resource	8 years ago
Marcus Efraimsson	aae3b568f3	docs: upd windows installation	8 years ago
bergquist	d440b9a8d1	registry: adds more comments	8 years ago
bergquist	f0f6d0e915	registry: adds comments to interfaces	8 years ago
Marcus Efraimsson	cb706bd059	changelog: update ... [skip ci]	8 years ago
Marcus Efraimsson	32793350b8	changelog: update ... [skip ci]	8 years ago
Marcus Efraimsson	0dd0b65900	changelog: add notes about closing #12438 ... [skip ci]	8 years ago
Marcus Efraimsson	59756863df	Merge pull request #12439 from grafana/fix-log-close-too-early ... Fix: Log close (ie flush) was done too early, before final shutdown log	8 years ago
bergquist	c4292b43f5	alerting: only log when screenshot been uploaded	8 years ago
bergquist	ce88e4b927	fixes typos ... closes #12453	8 years ago
Austin Winstanley	9823da1cc5	Reverted yarn.lock to master	8 years ago
Austin Winstanley	afee29be68	Merge branch 'master' into macros/sql	8 years ago
Austin Winstanley	a0e8437f8f	Used PostgreSQL TSDB as a model the set up the __timeFilter, __timeFrom, and __timeTo macros for Microsoft SQL and MySQL	8 years ago
Austin Winstanley	84af033281	Merge branch 'master' of https://github.com/grafana/grafana	8 years ago
Austin Winstanley	d663122244	Merge branch 'master' of https://github.com/grafana/grafana into macros/sql	8 years ago
Marcus Efraimsson	fb2b2c9f65	changelog: add notes about closing #12444 ... [skip ci]	8 years ago
Marcus Efraimsson	d226383c4e	Merge pull request #12444 from grafana/revert-12299-10707_whitelist ... Revert "auth proxy: use real ip when validating white listed ip's"	8 years ago
Marcus Efraimsson	8af5da7383	Revert "auth proxy: use real ip when validating white listed ip's"	8 years ago
Daniel Lee	7a2be69abc	changelog: adds note for #11892	8 years ago
Daniel Lee	8537f10285	Merge pull request #11892 from ApsOps/colorize-singlestat-prefix-postfix-option ... Make colorization of prefix and postfix optional in singlestat	8 years ago
Marcus Efraimsson	4c4bd2ebba	changelog: add notes about closing #12430 ... [skip ci]	8 years ago
Marcus Efraimsson	ab458061e6	Merge pull request #12441 from grafana/12430_fix ... Fix footer CSS issue	8 years ago
Marcus Efraimsson	54420363d3	fix footer css issue	8 years ago
Tobias Skarhed	af0a4a6039	Karma to Jest: 3 test files (#12414) ... * Karma to Jest: viewstate_srv * Karma to Jest: annotations_srv * Remove comments * Karma to Jest: series_override_ctrl * Remove unnecessary code * Class to function and fix lint error * Fix ngInject	8 years ago
Torkel Ödegaard	7a7c6f8fab	fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438	8 years ago
Tobias Skarhed	443ff5deb4	Karma to Jest: value_select_dropdown (#12435) ... * Begin Karma 2 Jest: value_select_dropdown * Add return for Promise * Remove Karma test	8 years ago
Dan Cech	3056d9a80e	support passing api token in Basic auth password (#12416)	8 years ago