Torkel Ödegaard
564b74cb7b
Merge branch 'develop' into develop-search
2017-11-02 16:00:50 +01:00
Torkel Ödegaard
10fcf2f5be
Merge branch 'master' into develop
2017-11-02 15:56:09 +01:00
Carl Bergquist
bf85735a36
Merge pull request #9765 from RatnadeepSimhadri/patch-1
...
chore(docs): update the search Query Example
2017-11-02 07:50:08 +01:00
Carl Bergquist
17492c091a
Merge pull request #9752 from mtanda/cw_alias_fix
...
[bug fix] (cloudwatch) fix default alias format
2017-11-02 07:45:26 +01:00
Ratna Deep Simhadri
538a8cff1e
chore(docs): update the search Query Example
...
- Updated the last Search Dashboards Example , so that the Example Request and Response seem related
2017-11-01 23:04:51 -07:00
Daniel Lee
84b277d5c0
dashfolders: fix for dashlist nav
2017-11-01 20:12:32 +01:00
bergquist
6292d7c204
reduce docker-compose header version
2017-11-01 19:28:28 +01:00
Torkel Ödegaard
b9d6c97147
ux: progress on new search
2017-11-01 16:59:20 +01:00
Torkel Ödegaard
97cc454ded
ux: minor changes
2017-11-01 14:23:46 +01:00
Carl Bergquist
c783bdac39
Merge pull request #9753 from mtanda/cw_period
...
(cloudwatch) add period alias
2017-11-01 14:02:41 +01:00
bergquist
8b10fe1abc
ignore docker-compose.yaml
2017-11-01 13:43:39 +01:00
bergquist
4dae217afc
docs: update latest release to 4.6.1
2017-11-01 13:31:10 +01:00
bergquist
d5d42c046d
packages: update published package version
2017-11-01 12:54:35 +01:00
Torkel Ödegaard
894951c7d4
fix: panel view now wraps, no scrolling required, fixes #9746
2017-11-01 11:24:26 +01:00
bergquist
575f746baa
changelog: set release date for 4.6.1
2017-11-01 11:03:10 +01:00
bergquist
d854abccad
changelog: adds note about closing #9707
2017-11-01 11:00:47 +01:00
Torkel Ödegaard
f46b7560e8
Update CHANGELOG.md
2017-11-01 10:50:24 +01:00
Mitsuhiro Tanda
4a63d696ff
fix default alias
2017-11-01 18:48:30 +09:00
Mitsuhiro Tanda
ebcb8be19a
add period alias
2017-11-01 18:47:21 +09:00
Torkel Ödegaard
e19b4a9291
plugins: fix for loading external plugins behind auth proxy, fixes #9509
2017-11-01 10:45:20 +01:00
Torkel Ödegaard
c3bd07f9b4
testdata: added manual entry mode to test data
2017-11-01 09:59:24 +01:00
Torkel Ödegaard
fec37f22b8
fix: fixed compiler error from #9676
2017-11-01 08:08:16 +01:00
Patrick O'Carroll
c8f7361e3f
converted ng_model_on_blur.js to ts, deletedkeyboard_manager.js ( #9676 )
2017-11-01 07:51:40 +01:00
Daniel Lee
624b75b58c
docs: update testdata enable explanantion
2017-10-31 18:25:35 +01:00
Carl Bergquist
d4f40eac6f
Merge pull request #9745 from cglewis/master
...
MAINTAINER is deprecated, now using LABEL
2017-10-31 18:24:34 +01:00
cglewis
f5d2ce2a72
MAINTAINER is deprecated, now using LABEL
2017-10-31 10:21:20 -07:00
Charlie Lewis
dbc0ff9739
Merge pull request #1 from grafana/master
...
sync
2017-10-31 10:19:28 -07:00
Torkel Ödegaard
84b10df887
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-31 16:14:40 +01:00
Torkel Ödegaard
ae367db377
Update ROADMAP.md
2017-10-31 16:07:45 +01:00
Carl Bergquist
8ed1d935df
Merge pull request #9741 from akshaychhajed/docker-compose-v3
...
Transitioning fig to docker-compose v3
2017-10-31 15:23:59 +01:00
Ryan McKinley
a1c1704d1f
Adding energy, area, and acceleration units ( #9336 )
...
* Adding more units
* move changes to kbn.ts
* remove accidental commits
2017-10-31 14:57:57 +01:00
Torkel Ödegaard
9d020ea1e2
Merge branch 'master' of github.com:grafana/grafana
2017-10-31 14:30:26 +01:00
Torkel Ödegaard
7f83460f42
tests: migrated tests for link_srv to jest, #9666
2017-10-31 14:30:06 +01:00
Torkel Ödegaard
9aa6a6b4c4
Merge branch 'linkSrv-js-to-ts'
2017-10-31 14:29:42 +01:00
Akshay Chhajed
38ec8ddefc
Transitioning fig to docker-compose v3
2017-10-31 18:59:27 +05:30
Torkel Ödegaard
ec94dfa890
tests: migrated tests for link_srv to jest, #9666
2017-10-31 14:29:25 +01:00
Patrick O'Carroll
1206ce261c
fix for dashboard tag link bug, fixes #9737 ( #9739 )
2017-10-31 14:29:10 +01:00
bergquist
ae5b3fd4b5
github: dont require bug/fr in title
2017-10-31 14:14:50 +01:00
bergquist
3c572aece6
changelog: adds note about closing #9713
2017-10-31 14:11:13 +01:00
Patrick O'Carroll
c3a9a04dad
converted confirm_click.js to .ts ( #9674 )
...
* converted confirm_click.js to .ts
* deleted confirm_click.ts
* removed import of confirm_click
2017-10-31 13:58:38 +01:00
Torkel Ödegaard
afd4f37f39
Update codecov.yml
2017-10-31 13:58:01 +01:00
Torkel Ödegaard
7336a98bb1
Update CHANGELOG.md
2017-10-31 13:56:00 +01:00
Sven Klemm
a503c1d39c
change default sslmode for postgres to verify-full ( #9736 )
2017-10-31 13:55:32 +01:00
Alexander Zobnin
948a5259a2
fix: color picker bug at series overrides page, #9715 ( #9738 )
2017-10-31 13:53:45 +01:00
Torkel Ödegaard
497993e2b2
Update ROADMAP.md
2017-10-31 13:04:10 +01:00
bergquist
1be476b5f5
tech: switch to golang 1.9.2
2017-10-31 12:36:52 +01:00
Sven Klemm
b6fafb13f5
always quote template variables for mysql when multi-value is allowed ( #9712 )
...
* always quote template variables for mysql when multi-value is allowed
* handle include all option similar to multi value
* declare type
* adjust tests to quoting change
* dont specify type but let it be inferred
* fix test for variable with includeAll
2017-10-31 12:23:50 +01:00
Sven Klemm
caa8b6100e
always quote template variables for postgres when multi-value or include ( #9714 )
...
all is allowed
2017-10-31 12:23:21 +01:00
Torkel Ödegaard
ae11bf7c14
fix: dashboard links dropdown toggle did not update view, fixes #9732
2017-10-31 09:22:45 +01:00
Torkel Ödegaard
3ff2dc2850
Merge branch 'master' of github.com:grafana/grafana
2017-10-31 09:17:44 +01:00
