IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 10:03:33 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,315 Commits 5,452 Branches 554 Tags 1.9 GiB
0960360b35
Commit Graph

193 Commits

Author SHA1 Message Date
Torkel Ödegaard
0960360b35 feat(elasticsearch): added support for index time based patterns, #1034 2015-09-06 16:09:42 +02:00
Torkel Ödegaard
14cb2b0143 began work on support index time patterns 2015-09-06 12:58:53 +02:00
Torkel Ödegaard
74da5a610c fix(spelling): capitalize text 2015-09-02 13:20:19 +02:00
Torkel Ödegaard
4b4299604b fix(import): fixed nav link in header, fixes #2633 2015-09-01 17:14:48 +02:00
Torkel Ödegaard
aa89416bca fix(invite): fixes to org invite stuff, #2630 2015-09-01 12:35:06 +02:00
Torkel Ödegaard
6fac241404 Merge branch 'signup_remake' 2015-08-31 11:42:30 +02:00
Torkel Ödegaard
13c70ac02c feat(signup): selecting org after invite now works 2015-08-31 09:37:14 +02:00
Torkel Ödegaard
d3c79c9b49 fix(datasource query editors): fixed issue with duplicate query and the query letter (refId) 2015-08-30 10:24:15 +02:00
Denis Doria
06077faa6a Fix small typo "dashbord" to dashboard 2015-08-22 11:48:35 +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
9a9c9b2b12 Merge branch 'query-editor-breakout' 
Conflicts:
	CHANGELOG.md
 2015-08-18 08:23:13 +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
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
a16c63a43e feat(mixed datasources): continued work on editor design change 2015-08-16 20:52:30 +02:00
Torkel Ödegaard
3105215425 feat(mixed datasource): changed how query ref ids (letters) are assigned, now they are persisted 2015-08-16 11:24:32 +02:00
Torkel Ödegaard
b30dfcf28a feat(datasource): added new mixed data source 2015-08-16 01:34:09 +02:00
Torkel Ödegaard
b9cfade18c feat(mutli db query): major changes to query editor and data source handling, looks promising 2015-08-15 23:11:37 +02:00
Torkel Ödegaard
ed49962120 refactor(): began work on big design change for how data source query editors are loaded 2015-08-15 21:49:30 +02:00
Torkel Ödegaard
8fcaa4997d feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457 2015-08-12 08:59:39 +02:00
Torkel Ödegaard
745162c589 fix(graphite): Import dashboard from graphite is working again, fixes #2490 2015-08-11 21:20:20 +02:00
Torkel Ödegaard
43ef9f909a feat(admin): admin page for all grafana organizations (list / edit view), #2457 2015-08-11 15:20:50 +02:00
Torkel Ödegaard
234d1291f9 Merge branch 'invite' 
Conflicts:
	public/css/less/gfbox.less
	public/emails/reset_password.html
	public/emails/welcome_on_signup.html
 2015-08-11 11:22:43 +02:00
Torkel Ödegaard
e53c1e39d3 feat(invite): can now add org user with sername again, #2353 2015-08-10 14:03:08 +02:00
Torkel Ödegaard
91e5fcf8f1 fix(templating): fixed issue with repeat row, was pretty buggy due to very recent change, fixes #2443 2015-08-05 14:19:09 +02:00
Matt Toback
b64c550989 Added some small styling tweaks to the modals, and adjusted some copy. 2015-08-04 15:58:07 -04:00
Torkel Ödegaard
775a805959 fix(): fix for cleaning up repeat panel scope for orphaned panels or duplicated panels 2015-08-04 15:15:03 +02:00
Torkel Ödegaard
0586dbaf8b feat(save_as): imporved save as dialog, now auto focus, and enter key to submit works, closes #2426 2015-08-03 10:46:07 +02:00
Torkel Ödegaard
0fd4c3bd00 fix(templating): small fixed toplaceholder text in template variable editor 2015-07-31 14:56:51 +02:00
Torkel Ödegaard
4c7e52288d fix(templating): another fix for panel links and repeat panels, #2410 2015-07-30 12:04:52 +02:00
Torkel Ödegaard
2cc53f328b fix(templating): fixed scoped vars issue when generating urls for panel links, fixes #2410 2015-07-30 08:28:42 +02:00
Torkel Ödegaard
aaae23e9f0 fix(templating): fixed issue with templated dashboard and error selectOptionsForCurrentValue undefined 2015-07-30 08:08:08 +02:00
Torkel Ödegaard
5a160f426e feat(invite): trying to get username to work as well 2015-07-29 09:30:23 +02:00
Torkel Ödegaard
6d6af09296 feat(invite): handling of existing org user case when inviting, #2353 2015-07-21 12:18:11 +02:00
Torkel Ödegaard
6b25453f11 templating(influxdb): regex escape values when multi or all format is enabled, closes #2373 2015-07-21 11:00:09 +02:00
Torkel Ödegaard
ab54971763 feat(invite): more progress on completing invite form and actually creating a real user, #2353 2015-07-20 17:46:48 +02:00
Torkel Ödegaard
024c112944 feat(invite): redesign for pending invite list, added revoke button and link, copy invite also works now, #2353 2015-07-20 14:26:49 +02:00
Torkel Ödegaard
3242354a4b feat(invite): worked on pending invitations list, revoke invite now works, #2353 2015-07-20 10:57:39 +02:00
Torkel Ödegaard
a82aa8203b Merge branch 'master' into invite 2015-07-18 10:14:45 +02:00
Torkel Ödegaard
0a59d6ab2f fix(repeat panel): fix for unwanted unsaved changes warnings when using repeat panel, #2364 2015-07-18 10:14:21 +02:00
Torkel Ödegaard
2c7e807738 feat(invite): small style change 2015-07-17 17:22:42 +02:00
Torkel Ödegaard
39430e1cee Merge pull request #2361 from mtanda/fix_link 
Fix dashboard/panel link in Scripted Dashboard
 2015-07-17 15:49:08 +02:00
Torkel Ödegaard
142a323efd fix(save as): fixed issue with save as and overwriting a dashboard with the same name 2015-07-17 15:34:15 +02:00