Commit Graph

9304 Commits (bd20dc6c4ca8b232d19acaf56e957fc9dc020f73)
 

Author SHA1 Message Date
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
Torkel Ödegaard 46c161b104 Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 80d88d302c fix(config): changed default for oauth and allow_sign_up setting, #6928 9 years ago
Hans Kristian Flaatten 1060b99810 docs(configuration): set `allow_sign_up` to `true` for gerneric OAuth (#6928) 9 years ago
Torkel Ödegaard 9da44141f1 fix(git): removed external submodule, accedentially included in PR, fixes #6929 9 years ago
bergquist 0e03c43174 docs(changelog): adds note about merging #4550 9 years ago
bergquist f33aeb6591 Merge branch 'adrianlzt-bug/show_multiple_tags_with_influxdb' 9 years ago
bergquist 530e1b358a Merge branch 'master' into adrianlzt-bug/show_multiple_tags_with_influxdb 9 years ago
bergquist ce4e71364c test(influxdb): adds tests for supporting multiple tags 9 years ago
Torkel Ödegaard 5ec7dea81a Merge branch 'v4.0.x' 9 years ago
Torkel Ödegaard 8feaef20e0 fix(graph): fixed graph issue with axes mode set to series and picking Max value, fixes #6926 9 years ago
Torkel Ödegaard 40b359334b fix(typescript): fixed sourcemap issue, #6904 9 years ago
bergquist d599f45707 Merge branch 'bug/show_multiple_tags_with_influxdb' of https://github.com/adrianlzt/grafana into adrianlzt-bug/show_multiple_tags_with_influxdb 9 years ago
Torkel Ödegaard ee6cd727ea Merge branch 'master' of github.com:grafana/grafana 9 years ago
Torkel Ödegaard 3bb9d47a45 minor change to #6904 9 years ago
bergquist 413a187119 docs(notification): add message property to notification 9 years ago
Carl Bergquist a5c41fe7cb Merge pull request #6921 from huydx/master 9 years ago
Torkel Ödegaard 815722c3cc Merge branch 'upgrade_typescript' of https://github.com/Nepomuceno/grafana into Nepomuceno-upgrade_typescript 9 years ago
bergquist 3cbc325f18 tech(github): asks ppl to remove placeholder text 9 years ago
huydx 015fa82cf5 fix(alert): alert test should return error when it failed to dispatch 9 years ago
bergquist 06b4dacaa4 docs(changelog): add note about closing #5479 9 years ago
Carl Bergquist 73ec529688 Merge pull request #6897 from grafana/cli_db_commands 9 years ago
Gabriel Nepomuceno cbf0d571f5 Removing task from other build sources 9 years ago
Gabriel Nepomuceno 2f46c56672 removing type validation because copy needs to be done first 9 years ago
Gabriel Nepomuceno 7ff07aa7b1 Revoming old files 9 years ago
Gabriel Nepomuceno a8ae0a5b79 fixing compilation of grunt 9 years ago
Gabriel Nepomuceno f3ebd2d849 upgrading bases and correcting identation missing tslint 9 years ago
Axel 2adbe3e13e Prettify duration value format (#6875) 9 years ago
bergquist 96e8ecfa7b feat(cli): adds command to reset admin password 9 years ago
bergquist cd85e1f651 Merge branch 'master' into cli_db_commands 9 years ago
bergquist ba7a990f86 tech: bump version in server cli 9 years ago
bergquist 02392e5189 docs(changelog): adds PR contributors name to release notes 9 years ago
bergquist 64f22e7037 docs(changelog): add note about closing #6356 9 years ago
bergquist cfb6033765 Merge branch 'elastic5_support' 9 years ago
bergquist 619c5c4f1b Merge branch 'master' into elastic5_support 9 years ago
bergquist ebec02ffae style(elastic): minor code style changes 9 years ago
bergquist 99c5f7d571 feat(elastic): remove support for ES 1.x 9 years ago
bergquist 873024b917 tech(elastic): use bool conditions for all es queries 9 years ago
Matt Toback e58b6989c2 Small refactor to make hover highlighting proper, added a title tag for the completed grafana step. (#6882) 9 years ago
Matt Toback f39f77692b Adjusted the active state to fix the faint line showing. Probably related to the font change going into 4.0 (#6886) 9 years ago
Carl Bergquist 20e4cb9a0b Merge pull request #6885 from utkarshcmu/patch-1 9 years ago
Utkarsh Bhatnagar db3ac79015 Fixed Create org API in docs 9 years ago
bergquist 6265afd8b6 docs: updat latest to 4.0.2 9 years ago
bergquist 7c3c8bc4c9 docs(changelog): add date for 4.0.2 release 9 years ago
bergquist 49827de278 docs: release 4.0.2 9 years ago