apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9367 Commits
5918 Branches
582 Tags
1.7 GiB
Tag: Branch: Tree: 0c94194a5b
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '0c94194a5b'
${ noResults }
Commit Graph

9367 Commits (0c94194a5b9d215393b533634bc3eae1d04de362)
 

Author SHA1 Message Date
Torkel Ödegaard 0c94194a5b Merge branch 'master' of github.com:grafana/grafana
9 years ago
Torkel Ödegaard b50490f080 docs(): changelog updated
9 years ago
Torkel Ödegaard 35b970347a Merge branch 'v4.0.x'
9 years ago
Torkel Ödegaard 497a1fcefc Merge branch 'v4.0.x' of github.com:grafana/grafana into v4.0.x
9 years ago
Torkel Ödegaard 94962b4193 fix(logging): fixed default log level filter option not taking effect, fixex #6978
9 years ago
bergquist 0c8193a6af docs(changelog): adds note about closing #6866
9 years ago
bergquist ca7baca21d feat(alerting): adds ok as no data option
9 years ago
bergquist 6a161216de fix(influxdb): fixes bug with empty tagColumn for annotations
9 years ago
bergquist 51c4385c92 fix(mqe): only parse none empty functions
9 years ago
bergquist f907330c9e tech(mailer): improves error when grafana cannot read open cert/key file
9 years ago
bergquist e3b53fe599 test(mqe): adds test for double function usage
9 years ago
bergquist 7dece3ff0c test(mqe): solves brittle unit test
9 years ago
Torkel Ödegaard 19552450fa Merge branch 'master' of github.com:grafana/grafana
9 years ago
Torkel Ödegaard 435f474e8a docs(): minor fix for docker docs
9 years ago
bergquist dde6e73fed feat(mqe): add basic support for functions list
9 years ago
Solar Olugebefola 1e6210dd41 update broken links (#6961)
9 years ago
Torkel Ödegaard 8fc6e4cfb0 fix(auth proxy, ldap): fixed so users cannot change password when ldap or auth proxy is enabled, fixes #2495, do not allow user to change email or username depending on what property auth proxy is using, fixes #6903
9 years ago
Torkel Ödegaard df562e23cf feat(ldap): better ldap logging, closes #6918
9 years ago
Torkel Ödegaard 6e27db148c Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap
9 years ago
Torkel Ödegaard 9f69a4d34d clean(): removed old docs file
9 years ago
Torkel Ödegaard c59fd2e8f6 fix(docs): fixed support for old docs url, fixes #6960
9 years ago
Torkel Ödegaard 330c1b945e refactor(datasource): refactoring datasource secure json fields handling, #6697, #6692
9 years ago
Torkel Ödegaard b38e9b0cac fix(cloudwatch): removed debugger statement
9 years ago
Torkel Ödegaard c3920bfba1 fix(cloudwatch): fixed broken cloudwatch edit page, #6697
9 years ago
bergquist ca6a667555 feat(mqe): renames app tag into cluster
9 years ago
bergquist f8871f9e4a chore(mqe): remove comments
9 years ago
bergquist 6d57e42246 feat(mqe): restricts the executor to max 4 concurrent outgoing requests
9 years ago
Torkel Ödegaard 7425c63528 fix(dashboard): fixed unit test
9 years ago
Torkel Ödegaard e72a60bbf5 feat(graph): shared graph tooltip is not a select option with 3 options, normal, shared crosshair & shared tooltip, CTRL+O or CMD+O cycles option, closes #6894
9 years ago
Torkel Ödegaard baec2bbe8a fix(firefox): fixed table options tab UX issues, fixes #6900
9 years ago
Torkel Ödegaard 488fe62f15 fix(singletat): fixed/polished layout in singlestat ui options tab
9 years ago
Torkel Ödegaard faf6a5fd36 fixed issue in metric segment and option lookup, #6912
9 years ago
Carl Bergquist 38d8ba8faa Merge pull request #6952 from huydx/format-gofmt
9 years ago
Carl Bergquist 9cd04768f7 Merge pull request #6953 from huydx/typo-execution
9 years ago
bergquist 9510f21304 docs(changelog): fixes invalid ticket ref
9 years ago
huydx b97f4fd8b9 (typo) Exeuction -> Execution
9 years ago
huydx adb441e5c8 (format) run go fmt in pkg
9 years ago
bergquist 63bf332023 Merge branch 'alerting_mqe'
9 years ago
bergquist e6c557bb91 Merge branch 'master' into alerting_mqe
9 years ago
bergquist 362162d6fa feat(mqe): add token cache
9 years ago
bergquist 69d6316512 style(mqe): instance dependencies in ctor func
9 years ago
bergquist 549c3ab78b tech(mqe): update todo
9 years ago
bergquist b620c7457d test(query_editor): adds test for nesting queries in targetFull
9 years ago
Utkarsh Bhatnagar bd20dc6c4c Fixed failing tests (#6941)
9 years ago
bergquist 76f78c0f72 test(alert_tab): basic test skeleton
9 years ago
Torkel Ödegaard 62d18cd493 docs(): updated changelog with PR #6940
9 years ago
Utkarsh Bhatnagar 5777f65d05 Basic Auth now supports LDAP username and password (#6940)
9 years ago
Torkel Ödegaard 0841e841f5 cleanup(): removed docker/production folder as it was old and unused (ie grafana-docker repo is the place for the offical production docker container
9 years ago
bergquist e1703166f0 docs(changelog): add thank you note to contributor
9 years ago
bergquist 99e3db8208 Merge branch 'master' into alerting_mqe
9 years ago