public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,127 Commits 655 Branches 650 Tags
31ea5f550f2f87fceeb22f34d64594dea6816137
Commit Graph
6127 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
raj dutt 4e91e05470 Update gettingstarted.md 2015-08-11 13:58:44 -04:00
Trent White ea0bec8bf2 update content on annotations 2015-08-11 13:51:27 -04:00
raj dutt c2e8a1d733 Update singlestat.md 2015-08-11 13:49:24 -04:00
raj dutt c6155723a1 Update playlist.md 2015-08-11 13:43:36 -04:00
Trent White 8c64afc81e update to templating doc 2015-08-11 13:42:40 -04:00
raj dutt eafd1d8c53 Update templating.md 2015-08-11 13:33:01 -04:00
raj dutt df0673f907 Update templating.md 2015-08-11 13:31:49 -04: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
raj dutt ed536f18ee Update basic_concepts.md 2015-08-11 13:07:30 -04:00
Matt Toback 96590f591c Updates to dashlist article 2015-08-11 12:34:18 -04:00
Trent White 32bfcbcdbc updates to screencasts page, with descriptions of each 2015-08-11 11:43:45 -04:00
Torkel Ödegaard 82feeff3aa tech(emails): small update to grunt watch for emails 2015-08-11 16:40:23 +02:00
Trent White 3af451caeb Merge pull request #4 from mattttt/trent-docs 
added pages, touched up some images and content  in data-sources section
 2015-08-11 10:15:59 -04:00
Trent White ae953f2420 added pages, touched up some images and content in data-sources section 2015-08-11 10:12:58 -04:00
Torkel Ödegaard 43ef9f909a feat(admin): admin page for all grafana organizations (list / edit view), #2457 2015-08-11 15:20:50 +02:00
Mitsuhiro Tanda 4f42dae3cb change behavior of dimension value suggestion 2015-08-11 20:43:34 +09:00
Torkel Ödegaard e01c68dcea fix(logging): removed db connection string from being printed in logs at app startup, fixes #2488 2015-08-11 11:26:28 +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 90169d6a05 Bumped master version to 2.2.0-pre1 2015-08-11 11:18:39 +02:00
Torkel Ödegaard 809562c874 updated install docs for 2.1.1 release 2015-08-11 11:12:06 +02:00
Torkel Ödegaard be7a3a0940 pumped version to 2.1.1 v2.1.1 2015-08-11 10:48:19 +02:00
Torkel Ödegaard 1ea0b5371a feat(invite): new user invites are now also added to correct org after sign up is completed, #2353 2015-08-11 10:45:03 +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
Mitsuhiro Tanda deedd166db add metricFindQuery 2015-08-11 14:26:24 +09:00
Mitsuhiro Tanda 6ffab821b2 refactor suggest function 2015-08-11 14:26:18 +09:00
Matt e53c8100a3 Merge pull request #3 from mattttt/mattttt-docs 
Adding additional pages and updates from google doc
 2015-08-10 23:20:15 -04:00
Mitsuhiro Tanda 6705902a94 fix style 2015-08-11 10:17:48 +09:00
Mitsuhiro Tanda fd96e30c9c add region field in query editor 2015-08-11 10:17:39 +09:00
Matt Toback 2b59724ea8 Adding additional pages and updates from google doc 2015-08-10 18:19:56 -04:00
Trent White aa4d6d6f0f Merge pull request #2 from mattttt/trent-docs 
add basic concpets doc
 2015-08-10 17:52:38 -04:00
Trent White ca65671553 add basic concpets doc 2015-08-10 17:51:29 -04:00
Trent White 2d99308219 Merge pull request #1 from mattttt/trent-docs 
adding Raj edits/additions as well as initial round of pages I created
 2015-08-10 17:46:51 -04:00
Trent White a4be75f410 adding Raj edits/additions as well as initial round of pages I created 2015-08-10 17:44:08 -04: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 835fd383ad fix(postgres): Dashboard search is now case insensitive when using Postgres, fixes #1896 2015-08-10 20:25:01 +02:00
Torkel Ödegaard dfd1bff389 feat(invite): began work on email template build system, and css inlining 2015-08-10 17:50:02 +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 4f3a3329e2 added postgres test docker fig block 2015-08-10 12:56:11 +02:00
Torkel Ödegaard 19f64bc561 fix(data source proxy): clear proxies request from cookies, fixes #2470 2015-08-10 12:11:18 +02:00
Torkel Ödegaard 1b2c1270a8 updated changelog with info about merged PR #2483 2015-08-10 09:14:45 +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
Denis Doria 696f8451cf Update documentation with $col alias 2015-08-10 08:12:12 +02:00
Torkel Ödegaard fb9f954882 fix(graphite): Fix for bug when using series ref (#A-Z) and referenced series is hidden in query editor. fixes #2484 2015-08-10 07:59:27 +02:00
Denis Doria a4af30675d Included $col as an option for the "Alias pattern" on influxdb 
With this patch it's possible to use the column name as an identifier.
This can help when we have multiple columns as it would be possible to automatic generate a legend.
Also this would help in future when grafana could support the "AS" in the query builder.
 2015-08-10 00:22:08 +02:00
Torkel Ödegaard 95cad91bae Merge pull request #2482 from thuck/influxdb_fill 
Including more special options for fill
 2015-08-09 20:18:45 +02:00
Denis Doria 166a56828d Including more special options for fill 
Included "previous" and "none" as possible values for fill.
From the influxdb documentation:
 - "previous" means the values of the previous window is used.
 - "none" means that all null values are removed.
 2015-08-09 19:17:01 +02:00