IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,207 Commits 5,454 Branches 554 Tags 1.9 GiB
3e0c66edab
Commit Graph

4207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
3e0c66edab docs(): updated download links in docs 2015-08-24 10:05:05 +02:00
Torkel Ödegaard
5d69c69b7c Merge pull request #2586 from thuck/link_typo 
Fix small typo "dashbord" to dashboard
 2015-08-22 14:48:13 +02:00
Denis Doria
06077faa6a Fix small typo "dashbord" to dashboard 2015-08-22 11:48:35 +02:00
Torkel Ödegaard
fcc369e854 Merge branch 'v2.1.x' 
Conflicts:
	CHANGELOG.md
 2015-08-22 08:44:47 +02:00
Torkel Ödegaard
ea187961da fix(templating): Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url), fixes #2564 
Conflicts:
	CHANGELOG.md
 2015-08-22 08:43:43 +02:00
Torkel Ödegaard
c9b2cec5ff fix(packaging): deb & rpm package did not mark ldap.toml config file as a configuration file, 2.1.1 & 2.1.2 upgrade overwrote it :(, fixes #2580 2015-08-22 08:34:20 +02:00
Torkel Ödegaard
960a4f71a3 fix(jsc): fixed javascript indenting 2015-08-21 16:28:01 +02:00
Torkel Ödegaard
292db86c9e feat(relative time override): You can now use the new relative time option in panel time override, closes #2575 2015-08-21 16:19:51 +02:00
Torkel Ödegaard
6d3b36d61b fix(annotations): removed accidental test code from annotationsSrv 2015-08-21 15:32:20 +02:00
Torkel Ödegaard
c876aa537a feat(panel resize): Resize handles in panel bottom right corners for easy width and height change, closes #2577 
Conflicts:
	public/app/features/panel/panelDirective.js
 2015-08-21 14:59:15 +02:00
Torkel Ödegaard
ca53ae4fc5 fix(templating): Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url), fixes #2564 2015-08-21 10:40:14 +02:00
Torkel Ödegaard
8f35683ccb fix(annotations): Fixed issue when html sanitizer failes for title to annotation body, now fallbacks to html escaping title and text, fixes #2563 2015-08-21 10:17:02 +02:00
Torkel Ödegaard
30cd782e92 fix(snapshot): Fix for snapshot with expire 7 days option, 7 days option not correct, was 7 hours, fixes #2574 2015-08-21 09:51:16 +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
7072af7c14 fix(auth proxy): Fix for server side rendering of panel when using auth proxy, fixes #2568 2015-08-21 07:49:49 +02:00
Torkel Ödegaard
abd7c15ba8 fix(TimePicker): Fix for when you applied custom time range it did not refreh dashboard, fixes #2565 2015-08-20 17:57:15 +02:00
Torkel Ödegaard
a4ff1e4f33 docs(): updated version in install docs 2015-08-20 15:20:26 +02:00
Torkel Ödegaard
5b9ea96dc5 Merge branch 'v2.1.x' 
Conflicts:
	CHANGELOG.md
	package.json
 2015-08-20 11:16:05 +02:00
Torkel Ödegaard
e86c87f7bc updated version to v2.1.2 2015-08-20 11:12:32 +02:00
Torkel Ödegaard
e5794ed1c1 fix(dragdrop): Fix for broken drag drop behavior, fixes #2558 2015-08-20 11:12:06 +02:00
Torkel Ödegaard
952a69abca docs(tutorial): updated hubot tutorial 2015-08-19 13:53:15 +02:00
Torkel Ödegaard
aa21bfd8a8 fix(timepicker): fixed for viewing auto refresh submenu when timpicker selection is set to Today, fixes #2552 2015-08-19 13:25:36 +02:00
Torkel Ödegaard
5768762591 Merge pull request #2539 from papylhomme/master 
Disable load timeout in requirejs
 2015-08-18 20:23:47 +02:00
Torkel Ödegaard
ca9c11486e config(github oauth): removed allowed_domains options, closes #1986 2015-08-18 20:19:37 +02:00
Torkel Ödegaard
01d9849e44 fix(user create): fixed for creating multiple users with empty email when auto assign org is set to false, fixes #2011 2015-08-18 20:15:24 +02:00
Torkel Ödegaard
0339026674 fix(default datasource): minor fix for handling of default datasource 2015-08-18 20:04:24 +02:00
Trent White
2f5115ca45 Update hubot_howto.md 2015-08-18 09:37:51 -04:00
Trent White
66878a9b48 Update hubot_howto.md 2015-08-18 09:34:31 -04:00
Trent White
333952a231 Update hubot_howto.md 2015-08-18 09:34:08 -04:00
Torkel Ödegaard
50281f12b9 fix(default datasource): minor fix for handling of default datasource 2015-08-18 14:54:56 +02:00
Torkel Ödegaard
4f8cea6e2d docs(): added tutorial article on hubot and grafana integration 2015-08-18 14:39:04 +02:00
Torkel Ödegaard
bf5081ec8c fix(type ahead): fixed highlight, and made the highlight more distinct, also rolled back #2436 due to its issues on linux and windows, fixes #2527 2015-08-18 10:09:12 +02:00
Torkel Ödegaard
4f7587492d docs(changelog): fixed minor wording issue in changelog 2015-08-18 08:24:08 +02:00
Torkel Ödegaard
9a9c9b2b12 Merge branch 'query-editor-breakout' 
Conflicts:
	CHANGELOG.md
 2015-08-18 08:23:13 +02:00
Torkel Ödegaard
d4432ddd64 feat(mixed datasources): feature ready to merge to master, closes #436 2015-08-18 08:22:00 +02:00
Torkel Ödegaard
5c2d49f7ce feat(mixed datasource): updated Elasticsearch so it uses new way to define annotations editor 2015-08-18 07:58:44 +02:00
Michaël Lhomme
0dc263d919 Disable load timeout in requirejs 2015-08-17 21:41:04 +02:00
Torkel Ödegaard
3de041a411 feat(mixed datasource): added datasource name to left of query hamburger #436 2015-08-17 21:25:08 +02:00
Torkel Ödegaard
00f5f8b2a0 feat(mixed datasource): polishing feature, making sure everything works, #436 2015-08-17 21:20:09 +02:00
Torkel Ödegaard
95f1343a59 feat(mixed datasource): fixing varios issues with the query editor changes, updated kariosdb data source editor to work with the new model, #436 2015-08-17 20:53:40 +02:00
Torkel Ödegaard
b4115b0362 feat(query editor): updated influxdb 0.8.x data source query editors to new abstraction 2015-08-17 17:28:03 +02:00
Torkel Ödegaard
6ee0f2c6a7 feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436 2015-08-17 17:07:33 +02:00
Torkel Ödegaard
af39e4de3e Merge branch 'v2.1.x' 
Conflicts:
	CHANGELOG.md
 2015-08-17 15:02:47 +02:00
Torkel Ödegaard
0d8303cf5d fix(templating): fix for setting template variable value via url and having repeated panels or rows, fixes #2534 2015-08-17 15:01:16 +02:00
Torkel Ödegaard
4a6b5274bc feat(invite): fixes for org invite enhancement story, #2353 2015-08-17 10:55:52 +02:00
Torkel Ödegaard
f7ea420a3f Merge pull request #2521 from mattttt/email-tweaks 
Email tweaks
 2015-08-17 10:33:06 +02:00
Torkel Ödegaard
56d5b0b12a feat(mixed datasource): minor progress 2015-08-17 10:31:54 +02:00
Torkel Ödegaard
bb81248eaa Merge pull request #2528 from thuck/permissions 
Fixing permission issues for new installations
 2015-08-17 10:13:12 +02:00
Torkel Ödegaard
0e18eafcfb Merge pull request #2535 from raintank/logging 
close all existing loggers before re-initializing loggers. fixes #2533
 2015-08-17 10:05:42 +02:00
woodsaj
c138f390ac close all existing loggers before re-initilizing loggers. fixes #2533 2015-08-17 15:59:40 +08:00