bergquist
7dece3ff0c
test(mqe): solves brittle unit test
2016-12-15 07:36:06 +01:00
Torkel Ödegaard
19552450fa
Merge branch 'master' of github.com:grafana/grafana
2016-12-14 22:31:11 +01:00
Torkel Ödegaard
435f474e8a
docs(): minor fix for docker docs
2016-12-14 22:30:20 +01:00
bergquist
dde6e73fed
feat(mqe): add basic support for functions list
2016-12-14 22:29:17 +01:00
Solar Olugebefola
1e6210dd41
update broken links ( #6961 )
2016-12-14 22:20:22 +01:00
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
2016-12-14 22:19:25 +01:00
Torkel Ödegaard
df562e23cf
feat(ldap): better ldap logging, closes #6918
2016-12-14 22:01:02 +01:00
Torkel Ödegaard
6e27db148c
Merge branch 'authproxy_ldap' of https://github.com/seuf/grafana into seuf-authproxy_ldap
2016-12-14 21:45:15 +01:00
Torkel Ödegaard
9f69a4d34d
clean(): removed old docs file
2016-12-14 21:22:01 +01:00
Torkel Ödegaard
c59fd2e8f6
fix(docs): fixed support for old docs url, fixes #6960
2016-12-14 21:21:21 +01:00
Torkel Ödegaard
330c1b945e
refactor(datasource): refactoring datasource secure json fields handling, #6697 , #6692
2016-12-14 21:06:10 +01:00
Torkel Ödegaard
b38e9b0cac
fix(cloudwatch): removed debugger statement
2016-12-14 20:40:02 +01:00
Torkel Ödegaard
c3920bfba1
fix(cloudwatch): fixed broken cloudwatch edit page, #6697
2016-12-14 20:38:35 +01:00
Torkel Ödegaard
467ddc19c3
feat(panel): worked on panel description tooltip, #6847
2016-12-14 17:22:19 +01:00
bergquist
ca6a667555
feat(mqe): renames app tag into cluster
2016-12-14 16:49:16 +01:00
Torkel Ödegaard
5f7ad9ddb6
Merge branch 'help-text' of https://github.com/utkarshcmu/grafana into utkarshcmu-help-text
2016-12-14 16:20:36 +01:00
bergquist
f8871f9e4a
chore(mqe): remove comments
2016-12-14 16:16:42 +01:00
bergquist
6d57e42246
feat(mqe): restricts the executor to max 4 concurrent outgoing requests
2016-12-14 15:40:15 +01:00
Torkel Ödegaard
7425c63528
fix(dashboard): fixed unit test
2016-12-14 14:42:25 +01:00
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
2016-12-14 14:33:33 +01:00
Torkel Ödegaard
baec2bbe8a
fix(firefox): fixed table options tab UX issues, fixes #6900
2016-12-14 13:16:54 +01:00
Torkel Ödegaard
488fe62f15
fix(singletat): fixed/polished layout in singlestat ui options tab
2016-12-14 12:58:20 +01:00
Torkel Ödegaard
faf6a5fd36
fixed issue in metric segment and option lookup, #6912
2016-12-14 10:50:48 +01:00
Carl Bergquist
38d8ba8faa
Merge pull request #6952 from huydx/format-gofmt
...
(format) run go fmt in pkg
2016-12-14 09:26:38 +01:00
Carl Bergquist
9cd04768f7
Merge pull request #6953 from huydx/typo-execution
...
(typo) Exeuction -> Execution
2016-12-14 09:24:54 +01:00
bergquist
9510f21304
docs(changelog): fixes invalid ticket ref
2016-12-14 09:12:22 +01:00
huydx
b97f4fd8b9
(typo) Exeuction -> Execution
2016-12-14 12:21:41 +09:00
huydx
adb441e5c8
(format) run go fmt in pkg
2016-12-14 12:17:38 +09:00
bergquist
63bf332023
Merge branch 'alerting_mqe'
2016-12-13 16:15:22 +01:00
bergquist
e6c557bb91
Merge branch 'master' into alerting_mqe
2016-12-13 16:15:04 +01:00
bergquist
362162d6fa
feat(mqe): add token cache
2016-12-13 14:01:48 +01:00
bergquist
69d6316512
style(mqe): instance dependencies in ctor func
2016-12-13 12:47:57 +01:00
bergquist
549c3ab78b
tech(mqe): update todo
2016-12-13 11:42:06 +01:00
bergquist
b620c7457d
test(query_editor): adds test for nesting queries in targetFull
2016-12-13 10:46:09 +01:00
Utkarsh Bhatnagar
bd20dc6c4c
Fixed failing tests ( #6941 )
2016-12-13 10:00:33 +01:00
bergquist
76f78c0f72
test(alert_tab): basic test skeleton
...
I created this test by misstake. But instead of deleting it I thought it
might be good to keep it to make it easier to add tests for the alert
tab
2016-12-13 09:50:38 +01:00
Torkel Ödegaard
62d18cd493
docs(): updated changelog with PR #6940
2016-12-13 09:18:10 +01:00
Utkarsh Bhatnagar
5777f65d05
Basic Auth now supports LDAP username and password ( #6940 )
2016-12-13 09:15:52 +01:00
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
2016-12-12 22:12:27 +01:00
bergquist
e1703166f0
docs(changelog): add thank you note to contributor
2016-12-12 19:06:21 +01:00
bergquist
99e3db8208
Merge branch 'master' into alerting_mqe
2016-12-12 19:01:50 +01:00
Torkel Ödegaard
46c161b104
Merge branch 'master' of github.com:grafana/grafana
2016-12-12 16:35:59 +01:00
Torkel Ödegaard
80d88d302c
fix(config): changed default for oauth and allow_sign_up setting, #6928
2016-12-12 16:35:42 +01:00
Hans Kristian Flaatten
1060b99810
docs(configuration): set allow_sign_up to true for gerneric OAuth ( #6928 )
...
This enables Grafana to accept new users authenticated through OAuth, without this set to true only previously authenticated users may log in with OAuth - and thus defeating the purpose.
2016-12-12 16:27:51 +01:00
Torkel Ödegaard
9da44141f1
fix(git): removed external submodule, accedentially included in PR, fixes #6929
2016-12-12 15:43:04 +01:00
bergquist
0e03c43174
docs(changelog): adds note about merging #4550
2016-12-12 14:59:02 +01:00
bergquist
f33aeb6591
Merge branch 'adrianlzt-bug/show_multiple_tags_with_influxdb'
2016-12-12 14:56:51 +01:00
bergquist
530e1b358a
Merge branch 'master' into adrianlzt-bug/show_multiple_tags_with_influxdb
2016-12-12 14:55:56 +01:00
bergquist
ce4e71364c
test(influxdb): adds tests for supporting multiple tags
2016-12-12 14:55:39 +01:00
Torkel Ödegaard
5ec7dea81a
Merge branch 'v4.0.x'
2016-12-12 14:39:53 +01:00
