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,198 Commits 5,454 Branches 554 Tags 1.9 GiB
c876aa537a
Commit Graph

451 Commits

Author SHA1 Message Date
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
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
5b9ea96dc5 Merge branch 'v2.1.x' 
Conflicts:
	CHANGELOG.md
	package.json
 2015-08-20 11:16:05 +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
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
0339026674 fix(default datasource): minor fix for handling of default datasource 2015-08-18 20:04:24 +02:00
Torkel Ödegaard
50281f12b9 fix(default datasource): minor fix for handling of default datasource 2015-08-18 14:54:56 +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
9a9c9b2b12 Merge branch 'query-editor-breakout' 
Conflicts:
	CHANGELOG.md
 2015-08-18 08:23:13 +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
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
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
e916f93787 feat(mixed datasource): fixed failing unit tests 2015-08-16 10:06:36 +02:00
Torkel Ödegaard
1332ddbc93 feat(mixed datasources): updated OpenTSDB data source query editor to new model, #436 2015-08-16 09:52:45 +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
ad1fa110ff change(search): opening search dropdown should not take you out of fullscreen view or edit 2015-08-15 21:57:41 +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
Matt Toback
0651f134e4 Backed our new styles out of ink.css and moved them into style.css. Small margin tweaks, looking good to go. 2015-08-14 15:21:51 -04:00
Pivotal
dc9c2773cb fix test connection bug 2015-08-14 13:50:01 +08:00
Matt Toback
60eec49e95 Added in additional text and incorporated the bulletproof button that was built for raintank. Needs some help from Torkel or Nick to make sure it's cleaner 2015-08-13 17:57:58 -04:00
Mitsuhiro Tanda
caccacf52b don't calculate cumulative value if series overrides stack to false 2015-08-13 13:40:16 +09: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
089508db8e fix(influxdb 0.9): removed function from function dropdown as this function does not exist in InfluxDB 0.9 2015-08-11 21:10:15 +02:00
Torkel Ödegaard
fe093c6385 feat(timepicker): added new relative time option , will set time range to midnight to now, closes #1186 2015-08-11 19:16:45 +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
74932e6311 feat(invite): added specific email for invites to existing grafana users 2015-08-11 10:35:10 +02:00
Torkel Ödegaard
b0b96aa410 Moved reset password and welcome on sign up email to new email build template system 2015-08-11 10:01:52 +02:00
Torkel Ödegaard
4439545428 feat(invite): lots of work completing the new email template system and css inlineing, converted new_user_invite.html to new system, #2353 2015-08-10 21:24:47 +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
775e044e69 feat(invite): progress on invite feature, #2353 2015-08-10 13:47:06 +02:00
Torkel Ödegaard
4b849243ce Merge branch 'influxdb_alias_columns' of https://github.com/thuck/grafana into thuck-influxdb_alias_columns 2015-08-10 09:11:19 +02:00
Torkel Ödegaard
e7fc72067a refactor(influxdb): refactoring of PR 2477, added unit tests, #2477 2015-08-10 09:09:39 +02:00
Torkel Ödegaard
ca6476a57f Merge branch 'influxdb_operators' of https://github.com/thuck/grafana into thuck-influxdb_operators 2015-08-10 08:45:16 +02:00