IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,674 Commits 5,454 Branches 554 Tags 1.9 GiB
8a95c563bb
Commit Graph

9674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
8a95c563bb Merge branch 'master' into websocket 2017-01-31 08:56:49 +01:00
Torkel Ödegaard
2594041eed hiding grafana live ds 2017-01-31 08:56:46 +01:00
Torkel Ödegaard
9ba1ea0179 fix(): another unit test fix attempt 2017-01-31 08:52:48 +01:00
Torkel Ödegaard
0c5abc1615 Merge branch 'xginn8-master' 2017-01-31 08:27:53 +01:00
Torkel Ödegaard
5fc5971145 refactor(): refactoring PR #7124 2017-01-31 08:27:48 +01:00
Torkel Ödegaard
436e35c845 fix(): fixed unit test broken in last PR merge 2017-01-31 07:59:14 +01:00
Torkel Ödegaard
9a61d43dc6 refactor(): refactoring PR #7141 2017-01-31 07:57:39 +01:00
Torkel Ödegaard
c400b5cf63 Merge branch 'master' of github.com:grafana/grafana 2017-01-31 07:48:44 +01:00
Torkel Ödegaard
1a9aaa4138 feat(server side png rendering): added timezone parameter for server side rendering, refactoring PR #7264 2017-01-31 07:48:10 +01:00
Torkel Ödegaard
830491fa66 Merge branch 'time-offset-to-image' of https://github.com/ryu1-sakai/grafana into ryu1-sakai-time-offset-to-image 2017-01-31 06:28:54 +01:00
Pavlos Daoglou
3e741315b4 [3743] Adds support for user search based on login or email (#7334) 
* [3743] Adds support for user search based on login or email

* Use query parameter instead

* Use macaron Query() instead
 2017-01-31 06:25:55 +01:00
Stanislav Vetlovskiy
bd4eadf69c #7383 Fix factory typo in telegram notifier (#7406) 2017-01-31 06:23:19 +01:00
bergquist
3c304b9b88 tech(build): disable builds for master 2017-01-30 16:24:50 +01:00
bergquist
cefb4103a7 tech(build): disable build based on tag 2017-01-30 16:03:55 +01:00
bergquist
dd982ac9a2 tech(build): dont include buildnumber when building tags 2017-01-30 15:23:38 +01:00
bergquist
ac6b5ea796 tech(build): option to not include buildIteration in package name 2017-01-30 15:21:39 +01:00
bergquist
163036591d tech(build): fixes broken build 2017-01-30 15:04:55 +01:00
bergquist
2de8cdb85c tech(build): remove unused deps 2017-01-30 14:28:39 +01:00
bergquist
7307e6345b tech(build): remove sha calc from build step 2017-01-30 13:58:39 +01:00
bergquist
6de13e081b tech(build): deploy builds for each commit to master 2017-01-30 10:37:14 +01:00
Jay Linski
91513f0bc0 Remove deprecated dataproxy logging setting (#7398) 
This should have been removed in 06440ef57b, but was probably forgotten.

Solves #6718.
 2017-01-30 08:14:44 +01:00
Torkel Ödegaard
b191638f41 feat(packaging): Make config file not part of package to simplify upgrade, made commit always a short sha, changed RESTART_ON_UPGRADE to true by default, #7399, #7227 2017-01-30 08:08:37 +01:00
Torkel Ödegaard
2a09d4a5a6 fix(): conf file had left over of old config key, #7395 2017-01-30 07:11:12 +01:00
Oleksandr Kushchenko
edba465a75 add DeliveryStreamName dimension to AWS/Firehose Cloudwatch namespace (#7388) 2017-01-28 08:30:57 +01:00
lpic
5b699dbf0d Set time when testing ES datasource, fixes #7044 (#7390) 2017-01-28 08:30:33 +01:00
Kit Westneat
cddc9ac0a7 file_export.ts: #5325 missed exportTableDataToCsv when adding sep (#7391) 2017-01-28 08:29:57 +01:00
bergquist
1fee26925f Merge branch 'new_deploy' 2017-01-27 15:55:42 +01:00
bergquist
4b6aaec880 tech(build): create sha files after signing packages 2017-01-27 15:54:19 +01:00
bergquist
a634bd0ce8 tech(build): sign and deploy packages to s3 2017-01-27 15:21:16 +01:00
bergquist
feed804a0e tech(build): updates path to signing file 2017-01-27 15:21:16 +01:00
bergquist
0cc21669f4 tech(build): adds package signing step 2017-01-27 15:21:16 +01:00
bergquist
46e4a54a6e style: go fmt with simplify 2017-01-27 15:21:02 +01:00
bergquist
1df9c2cab3 docs(changelog): adds note about closing #7377 2017-01-27 08:54:23 +01:00
Carl Bergquist
b3847a3738 Merge pull request #7377 from solugebefola/patch-3 
Disable sign out for AuthProxyEnabled
 2017-01-27 08:51:32 +01:00
Solar Olugebefola
de7edb40f5 Disable sign out for AuthProxyEnabled 
Sign out was disabled for AuthProxyEnabled in #3122.  This is to catch the one other instance of a sign out link in the side menu.
 2017-01-26 13:10:33 -05:00
Torkel Ödegaard
2f4da15264 fix(http api): throw validation error if missing property in call to /api/admin/users/123/permissions, #7365 2017-01-26 08:54:51 +01:00
Ryan McKinley
a656d01bf5 append windows phantomjs with .exe (#7065) 2017-01-25 14:49:09 +01:00
Torkel Ödegaard
9b8760bad7 packaging(): fix rpm & SUSE compatability issue, #7293 2017-01-25 14:42:19 +01:00
Torkel Ödegaard
7c5ef2c75a Merge branch 'connection-reset-shared_tooltip' 2017-01-25 14:35:02 +01:00
Torkel Ödegaard
28f890e42f refactor(): removed commented out code 2017-01-25 14:34:55 +01:00
Torkel Ödegaard
23eab81cbe fix(): fixed minor issue with single stat tooltip, #7357 2017-01-25 14:11:30 +01:00
Torkel Ödegaard
e073d20731 updated sample config 2017-01-25 13:34:02 +01:00
Torkel Ödegaard
f196ffa07d updated docs 2017-01-25 13:33:27 +01:00
Torkel Ödegaard
40d39f8a3e refactor(): renaming alerting hide ui option, #7318 2017-01-25 13:32:26 +01:00
Torkel Ödegaard
fee4846429 Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui 2017-01-25 13:16:48 +01:00
Torkel Ödegaard
4e30aa9da2 docs(): changelog updated with #7112 2017-01-25 12:32:59 +01:00
Naoufel JAMALI
4e1d8c9ced Elasticsearch - Term aggregation limit fix (should fix #7112) (#7338) 
* Elasticsearch - Term aggregation limit fix  (should fix #7112)

* Elasticsearch - Term aggregation limit fix
 2017-01-25 12:29:41 +01:00
bergquist
b6305a6577 tech(build): dont upload packages from master 2017-01-24 15:24:43 +01:00
bergquist
d5e753adbc tech(build): fixes circle.yml format issue 2017-01-24 14:01:50 +01:00
bergquist
3d6698389b tech(build): adds s3 bucket for nightly 2017-01-24 13:58:37 +01:00