public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,595 Commits 655 Branches 650 Tags
a433698ddf357289c8bf2e4bdf14bb641d003e4a
Commit Graph
11595 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick O'Carroll a433698ddf changed class name for no-alerts 2017-11-02 08:44:09 +01:00
Patrick O'Carroll 5a26fc252e new design for no alerts in alert-list, fixes #9721 2017-11-01 09:44:51 +01:00
Torkel Ödegaard fec37f22b8 fix: fixed compiler error from #9676 2017-11-01 08:08:16 +01:00
Patrick O'Carroll c8f7361e3f converted ng_model_on_blur.js to ts, deletedkeyboard_manager.js (#9676) 2017-11-01 07:51:40 +01:00
Daniel Lee 624b75b58c docs: update testdata enable explanantion 2017-10-31 18:25:35 +01:00
Carl Bergquist d4f40eac6f Merge pull request #9745 from cglewis/master 
MAINTAINER is deprecated, now using LABEL
 2017-10-31 18:24:34 +01:00
cglewis f5d2ce2a72 MAINTAINER is deprecated, now using LABEL 2017-10-31 10:21:20 -07:00
Charlie Lewis dbc0ff9739 Merge pull request #1 from grafana/master 
sync
 2017-10-31 10:19:28 -07:00
Torkel Ödegaard ae367db377 Update ROADMAP.md 2017-10-31 16:07:45 +01:00
Carl Bergquist 8ed1d935df Merge pull request #9741 from akshaychhajed/docker-compose-v3 
Transitioning fig to docker-compose v3
 2017-10-31 15:23:59 +01:00
Ryan McKinley a1c1704d1f Adding energy, area, and acceleration units (#9336) 
* Adding more units

* move changes to kbn.ts

* remove accidental commits
 2017-10-31 14:57:57 +01:00
Torkel Ödegaard 9d020ea1e2 Merge branch 'master' of github.com:grafana/grafana 2017-10-31 14:30:26 +01:00
Torkel Ödegaard 7f83460f42 tests: migrated tests for link_srv to jest, #9666 2017-10-31 14:30:06 +01:00
Torkel Ödegaard 9aa6a6b4c4 Merge branch 'linkSrv-js-to-ts' 2017-10-31 14:29:42 +01:00
Akshay Chhajed 38ec8ddefc Transitioning fig to docker-compose v3 2017-10-31 18:59:27 +05:30
Torkel Ödegaard ec94dfa890 tests: migrated tests for link_srv to jest, #9666 2017-10-31 14:29:25 +01:00
Patrick O'Carroll 1206ce261c fix for dashboard tag link bug, fixes #9737 (#9739) 2017-10-31 14:29:10 +01:00
bergquist ae5b3fd4b5 github: dont require bug/fr in title 2017-10-31 14:14:50 +01:00
bergquist 3c572aece6 changelog: adds note about closing #9713 2017-10-31 14:11:13 +01:00
Patrick O'Carroll c3a9a04dad converted confirm_click.js to .ts (#9674) 
* converted confirm_click.js to .ts

* deleted confirm_click.ts

* removed import of confirm_click
 2017-10-31 13:58:38 +01:00
Torkel Ödegaard afd4f37f39 Update codecov.yml 2017-10-31 13:58:01 +01:00
Torkel Ödegaard 7336a98bb1 Update CHANGELOG.md 2017-10-31 13:56:00 +01:00
Sven Klemm a503c1d39c change default sslmode for postgres to verify-full (#9736) 2017-10-31 13:55:32 +01:00
Alexander Zobnin 948a5259a2 fix: color picker bug at series overrides page, #9715 (#9738) 2017-10-31 13:53:45 +01:00
Torkel Ödegaard 497993e2b2 Update ROADMAP.md 2017-10-31 13:04:10 +01:00
bergquist 1be476b5f5 tech: switch to golang 1.9.2 2017-10-31 12:36:52 +01:00
Sven Klemm b6fafb13f5 always quote template variables for mysql when multi-value is allowed (#9712) 
* always quote template variables for mysql when multi-value is allowed

* handle include all option similar to multi value

* declare type

* adjust tests to quoting change

* dont specify type but let it be inferred

* fix test for variable with includeAll
 2017-10-31 12:23:50 +01:00
Sven Klemm caa8b6100e always quote template variables for postgres when multi-value or include (#9714) 
all is allowed
 2017-10-31 12:23:21 +01:00
Torkel Ödegaard ae11bf7c14 fix: dashboard links dropdown toggle did not update view, fixes #9732 2017-10-31 09:22:45 +01:00
Torkel Ödegaard 3ff2dc2850 Merge branch 'master' of github.com:grafana/grafana 2017-10-31 09:17:44 +01:00
bergquist d23c77119e docs: adds prom grafana dashboard 2017-10-31 09:13:35 +01:00
Torkel Ödegaard 8838e43088 Merge branch 'master' of github.com:grafana/grafana 2017-10-31 09:01:10 +01:00
Carl Bergquist 7583b78c3a Merge pull request #9723 from boeboe/master 
Correct help message of api_dataproxy_request_all_milliseconds
 2017-10-30 13:08:32 +01:00
Bart Van Bos 1a8d05bbcb Correct help message of api_dataproxy_request_all_milliseconds 2017-10-30 12:50:57 +01:00
bergquist e7b604f538 changelog: adds note about closing #9645 2017-10-30 11:17:30 +01:00
Carl Bergquist 1a3373e049 Merge pull request #9699 from it-teaching-abo-akademi/master 
Alertlist: Inform when no alerts in current time range
 2017-10-30 11:12:11 +01:00
bergquist 92d8b3f095 changelog: adds note about closing #9698 2017-10-30 11:09:48 +01:00
Carl Bergquist d83f0fb266 Merge pull request #9698 from mtanda/text_ace_editor 
[Feature Request] ace editor for text panel
 2017-10-30 11:07:53 +01:00
Mitsuhiro Tanda e9645045a0 ace editor for text panel 2017-10-30 11:05:09 +09:00
bergquist e1765e360e tech: add missing include 2017-10-29 20:21:41 +01:00
Daniel Lee e541e60bc3 sql: remove title from annotation help 
Fixes #9710
 2017-10-29 20:03:23 +01:00
bergquist 7dcfd800b3 changelog: adds note about closing #9681 2017-10-29 19:32:49 +01:00
Carl Bergquist e5ec357625 Merge pull request #9697 from bergquist/fix_removed_threshols 
save as should only delete threshold for panels with alerts
 2017-10-28 23:48:31 +02:00
Torkel Ödegaard d03b0d664b Merge branch 'master' of github.com:grafana/grafana 2017-10-28 13:28:30 +02:00
Torkel Ödegaard 3e3cef28ec fix: undefined is not an object evaluating this., #9538 2017-10-28 13:28:06 +02:00
pkarmaka cdd17f4871 [Bug Fix] Opentsdb Alias issue (#9613) 2017-10-28 13:10:18 +02:00
Torkel Ödegaard 43d45f9fae fix: graphite annotation tooltip included undefined, fixes #9707 2017-10-28 12:59:32 +02:00
Tomas Strand 357d394c66 Alertlist: Inform when no alerts in current time range 
Shows info that no alerts are found for the currently selected interval in Alertlist.
Fixes #9624
 2017-10-27 17:20:07 +03:00
bergquist 728471eef4 save as should only delete threshold for panels with alerts 
closes #9681
 2017-10-27 15:41:53 +02:00
Daniel Lee 71d9126bb6 changelog: note for #9596 2017-10-27 11:28:04 +02:00