Leonard Gram
63f8854a48
Merge pull request #10947 from grafana/use-epoch-for-login-attempt
...
login: uses epochs for login throtting.
2018-02-19 10:15:06 +01:00
Zachary Cava
710bb70746
[elasticsearch] Allow nested fields for annotation source ( #10936 )
2018-02-19 09:26:13 +01:00
Patrick O'Carroll
9c36ee22a8
changed m3 and dm3 to fixedUnit, fixes #10920 ( #10944 )
2018-02-19 09:23:02 +01:00
Mitsuhiro Tanda
f47542db28
migrate panels in collapsed rows ( #10948 )
2018-02-19 09:07:29 +01:00
Carl Bergquist
a1d79997be
Merge pull request #10958 from srid99/master
...
Fix broken markdown links in CHANGELOG.md
2018-02-18 20:17:58 +01:00
Sridhar Gnanasekaran
b238d4e7fb
Update CHANGELOG.md
2018-02-18 19:00:11 +01:00
Leonard Gram
fe357a72d9
login: migration fix.
2018-02-16 17:36:28 +01:00
Leonard Gram
0053be9882
login: uses epochs for login throtting.
...
Closes #10937
2018-02-16 17:25:46 +01:00
Torkel Ödegaard
2e9433c495
fix: fixed redirect after save, fixes #10946
2018-02-16 16:29:14 +01:00
Torkel Ödegaard
497132c441
fix: esc key now closes panel edit/view mode as usual, fixes #10945
2018-02-16 16:09:54 +01:00
Torkel Ödegaard
76cfa0bee3
Update CHANGELOG.md
2018-02-16 14:48:50 +01:00
Torkel Ödegaard
577a00e3cf
docs: updated to beta3
2018-02-16 14:43:36 +01:00
Torkel Ödegaard
8af2c9f1f8
test: added integration test for #10941
2018-02-16 14:17:41 +01:00
Torkel Ödegaard
5323971c21
refactoring: alert rule query refactoring ( #10941 )
2018-02-16 13:56:04 +01:00
Torkel Ödegaard
5e33a52b69
updated version to v5-beta3
2018-02-16 13:26:04 +01:00
bergquist
529fc022d5
db: reduce name column size in dashboard_provisoning
...
ref #10931
2018-02-16 11:49:17 +01:00
Daniel Lee
b9d572bdec
teams: adds some validation to the API
2018-02-16 11:46:20 +01:00
Torkel Ödegaard
ac6800a88a
Merge branch 'master' of github.com:grafana/grafana
2018-02-16 10:34:15 +01:00
Marcus Efraimsson
4c073e1cf0
docker: add test dashboards for mysql and postgres for visualizing data generated by fake-data-gen
2018-02-16 10:18:40 +01:00
bergquist
b099f0309f
cli: download latest dependency by default
2018-02-16 09:54:37 +01:00
bergquist
5bbe047eaa
Revert "removes dependencies install for plugins"
...
This reverts commit 47e363ea15
2018-02-16 09:49:29 +01:00
Mitsuhiro Tanda
3b04efa4c0
migrate minSpan ( #10924 )
2018-02-16 09:29:10 +01:00
Torkel Ödegaard
39fdfb7922
Merge branch 'master' of github.com:grafana/grafana
2018-02-16 09:14:44 +01:00
Patrick O'Carroll
244ae555d9
Close modal with esc ( #10929 )
...
* added var to check if modal is open and an if for escape fullview
* moved showconfirmmodal to utils, showconfirmmodal now uses showmodal, esc works in textinput
* made esc global
2018-02-16 09:14:32 +01:00
Alexander Zobnin
2c5f3fbc5b
repeat row: fix panels placement bug ( #10932 )
2018-02-16 09:11:26 +01:00
Marcus Efraimsson
75077e634e
Merge pull request #10933 from ScottBrenner/patch-1
...
Minor typo fix
2018-02-16 02:18:51 +01:00
Scott Brenner
2d03ab1770
Update sample.ini
2018-02-15 10:41:26 -08:00
Scott Brenner
7535cefed9
Update ldap.toml
2018-02-15 10:41:15 -08:00
Scott Brenner
43baf20dcd
Update ldap.md
2018-02-15 10:41:04 -08:00
Scott Brenner
b8b6dc6d6d
Minor typo fix
2018-02-15 10:37:23 -08:00
Daniel Lee
6fa46d9539
plugins: update meta data for all core plugins
...
So that the readme's can be published on Grafana.com
2018-02-15 16:50:38 +01:00
Leonard Gram
3ddfd8bd09
alert notifiers: better error messages.
2018-02-15 16:48:01 +01:00
bergquist
651103bdda
chore: adds comment for exported function
2018-02-15 15:06:03 +01:00
Torkel Ödegaard
6b930df4d4
updated download links
2018-02-15 14:48:11 +01:00
Torkel Ödegaard
4fb7ba454e
docs: Updated changelog
2018-02-15 13:41:48 +01:00
Torkel Ödegaard
ed546c9720
updated package.json version
2018-02-15 13:30:40 +01:00
Torkel Ödegaard
168ac314fc
fix: more phantomjs fixes
2018-02-15 13:20:50 +01:00
Torkel Ödegaard
57103ec98a
fix: refactoring #10922
2018-02-15 12:42:17 +01:00
Torkel Ödegaard
4b4e38531b
Merge branch 'fix-10526' of https://github.com/alexanderzobnin/grafana
2018-02-15 11:46:33 +01:00
Alexander Zobnin
b4c51f8822
Fix phantomjs legend rendering issue, #10526
2018-02-15 12:59:14 +03:00
bergquist
0ab0343995
mark redirect_to cookie as http only
...
closes #10829
2018-02-15 10:56:29 +01:00
Carl Bergquist
aa902ef826
Merge pull request #10921 from bergquist/invalid_uid
...
dashboard: whitelist allowed chars for uid
2018-02-15 10:19:42 +01:00
bergquist
8954559cbd
dashboard: whitelist allowed chars for uid
2018-02-15 09:56:13 +01:00
Carl Bergquist
fcca578f41
updates readmes for mysql and postgres ( #10913 )
...
ref #10813
2018-02-15 09:38:39 +01:00
Carl Bergquist
243b987758
Merge pull request #10910 from bergquist/provisioning_disable_deleting_dashboards
...
provisioning: adds setting to disable dashboard deletes
2018-02-15 08:28:10 +01:00
bergquist
ad42883fc7
provisioning: adds setting to disable dashboard deletes
2018-02-14 17:30:08 +01:00
bergquist
842f4c1d32
tech: dont print error message on 500 page
...
closes #10828
2018-02-14 16:39:20 +01:00
bergquist
47e363ea15
removes dependencies install for plugins
...
this features was never intended for production.
2018-02-14 15:40:42 +01:00
bergquist
56907eef69
tests: makes sure we all migrations are working
2018-02-14 15:30:29 +01:00
Leonard Gram
fa1b92a12b
provisioning: uses unix epoch timestamps. ( #10907 )
...
* provisioning: uses unix epoch timestamps.
2018-02-14 15:28:30 +01:00
