root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 20 Packages Projects Releases Wiki Activity
18,810 Commits 1,399 Branches 636 Tags 2.5 GiB
Commit Graph

18810 Commits

Author SHA1 Message Date
Daniel Lee 167e8815d3 ldap: upgrades go-ldap to v3 2018-12-16 01:05:14 +01:00
Daniel Lee 0ebd5e0c80 table: fixes #14484. Renders epoch string if date column style 2018-12-16 00:03:03 +01:00
Daniel Lee 217596b4a1 changelog: adds note for #14483 2018-12-16 00:01:56 +01:00
Torkel Ödegaard 38b5d7862f Fix for no metrics panels, now goes to viz tab and does not show queries tab 2018-12-15 12:08:33 -08:00
Torkel Ödegaard e99dbefb98 minor style fix 2018-12-15 11:29:50 -08:00
Torkel Ödegaard 1b3a520b94 minor change to table panel edit options 2018-12-15 18:09:18 +01:00
Torkel Ödegaard 68b7b6cd97 minor tweaks to text panel 2018-12-15 17:53:52 +01:00
Torkel Ödegaard f67e0827b2 Fixes and cleanup 2018-12-15 10:04:25 +01:00
Simon Podlipsky 2d296715ec Show predefined time ranges as first in timepicker on small screens 2018-12-15 00:55:24 +01:00
Torkel Ödegaard 9773a2d419
Merge pull request #14502 from banjeremy/13765-annotation-editor-outside-viewport 
remove check on axis.used in flot
 2018-12-14 21:33:40 +01:00
Torkel Ödegaard 248015c937 code cleanup in add panel, and switched off grid css transforms to fix z-index issuse 2018-12-14 20:53:42 +01:00
Torkel Ödegaard bd2c9853ec minor tweaks to alert tab 2018-12-14 19:34:51 +01:00
Torkel Ödegaard b10f558a99 fixed name of alert tab 2018-12-14 17:45:35 +01:00
Torkel Ödegaard 2cf246f946 removed unnessary test 2018-12-14 17:42:14 +01:00
Torkel Ödegaard 9ac11f1d9d updated add panel a bit 2018-12-14 17:39:33 +01:00
Torkel Ödegaard 9d8d5b18ef Merge remote-tracking branch 'origin/develop-addpanelpanel' into add-panel-rewrite 2018-12-14 17:04:33 +01:00
Torkel Ödegaard b15bb4fb95 Merge remote-tracking branch 'origin/master' into develop 2018-12-14 17:02:08 +01:00
Torkel Ödegaard cf1cd4d60f
Merge pull request #14500 from grafana/select-refactor 
Select refactor
 2018-12-14 16:57:38 +01:00
Torkel Ödegaard 6e2f6701ac minor style fix 2018-12-14 16:48:13 +01:00
Torkel Ödegaard beff16bc8d updated snapshot 2018-12-14 16:38:52 +01:00
Torkel Ödegaard 677eb6d179 fixes to unit picker 2018-12-14 16:27:48 +01:00
Peter Holmberg 7c83d7ba82 updates on thresholds component 2018-12-14 16:27:42 +01:00
Jeremy Jones 8d8ef8f97f remove check on axis.used in flot #13765 2018-12-14 09:04:47 -06:00
Torkel Ödegaard 84df0e2dde Added custom scrollbar to select component 2018-12-14 15:25:49 +01:00
ijin08 3c059bc9d6 removed a test that isn't neccessery any more 2018-12-14 14:50:46 +01:00
ijin08 3215f8abfe replaced content in addpanelpanel with three buttons that can create new panel, paste copied panel, and add a new row, to paste panel one must copy one first, code is still quite rough 2018-12-14 14:33:49 +01:00
Torkel Ödegaard 9e4547f787 fixed cloudwatch issue 2018-12-14 14:25:35 +01:00
Torkel Ödegaard cb7ffb4415 select refactor fixes 2018-12-14 14:19:39 +01:00
Peter Holmberg f8c8f2ec2c gauge working without thresholds 2018-12-14 14:18:18 +01:00
Daniel Lee 3581d619f3
Merge pull request #14499 from grafana/14483/copy-invite-link-fix 
Fix for copy invite link
 2018-12-14 14:17:36 +01:00
Peter Holmberg a7548cd294 Merge remote-tracking branch 'origin/develop' into 14409/threshold-ux-changes 2018-12-14 14:08:53 +01:00
Peter Holmberg 5f4eaad8a7 changin colors 2018-12-14 14:08:29 +01:00
Torkel Ödegaard ae76ddcc3b explore using data source picker 2018-12-14 14:05:47 +01:00
Peter Holmberg d37dae34f2 fixing issue with copy invite link 2018-12-14 13:49:14 +01:00
Peter Holmberg 3662f1c007 getting closer with no thresholds 2018-12-14 13:23:22 +01:00
Torkel Ödegaard 24825dc899 renamed folder to select 2018-12-14 12:59:45 +01:00
Torkel Ödegaard ab31d52b77 Merge branch 'panel-edit-style-changes' into select-refactor 2018-12-14 12:39:35 +01:00
Torkel Ödegaard 58cc2e34d6 User picker using common select componnet 2018-12-14 12:38:36 +01:00
Torkel Ödegaard b9a05a8543
Merge pull request #14494 from grafana/panel-edit-style-changes 
Panel edit style changes
 2018-12-14 12:27:45 +01:00
Torkel Ödegaard 104292df63 wip: unifying select components 2018-12-14 11:23:05 +01:00
Torkel Ödegaard e40d21459a fixing input unit test failure 2018-12-14 11:03:42 +01:00
Torkel Ödegaard 42ee81a97c fixed issue with switching panels 2018-12-14 10:47:18 +01:00
Torkel Ödegaard 0823712c9a refactored panel-option-section into react component 2018-12-14 09:44:48 +01:00
Torkel Ödegaard ec035d6847 removed console log 2018-12-13 21:35:15 +01:00
Torkel Ödegaard 9c13520e97 updated styles 2018-12-13 21:24:41 +01:00
Peter Holmberg 234095e6df starting with threshold refactor 2018-12-13 16:46:10 +01:00
Torkel Ödegaard dc22beadca wip: style change progress 2018-12-13 16:02:14 +01:00
Carl Bergquist 82adf5393e
Merge pull request #14482 from joesis/logging-provisioning-file-reader 
log error when resolvePath
 2018-12-13 15:16:15 +01:00
Torkel Ödegaard 3517029ede
Update CHANGELOG.md 2018-12-13 14:34:30 +01:00
Torkel Ödegaard 8a6ed4814c
Update latest.json 2018-12-13 14:31:05 +01:00