Torkel Ödegaard
a053552fee
fixes to data source query editors
2016-02-01 13:51:47 +01:00
Torkel Ödegaard
6886faa944
feat(plugins): fixed cloudwatch query editor
2016-02-01 13:30:20 +01:00
Torkel Ödegaard
3f945e886b
merge sync with master
2016-01-31 19:51:23 +01:00
Torkel Ödegaard
931d7cd039
Merge branch 'master' into panelbase
2016-01-31 16:57:04 +01:00
Torkel Ödegaard
3f5b33b060
css(): minor tweaks to navbar and timepicker margins/paddings
2016-01-31 11:38:38 +01:00
Torkel Ödegaard
fa63d26485
feat(timepicker): added validation to timepicker, and validation state to apply button, fixes #3870
2016-01-31 11:30:18 +01:00
Torkel Ödegaard
d617d029d2
fix(css): fixed issues introduced in recent sidemenu enhancements, fixes #3893 , fixes #3894
2016-01-30 12:55:47 -05:00
Torkel Ödegaard
12460af0ec
Merge pull request #3830 from raintank/apiPlugin
...
Add secureJsonData field to appSettings model
2016-01-29 17:17:37 -05:00
bergquist
34eb5acee7
feat(dataproxy): remove 'SetCookie' from reponse
...
set cookie could potentialll leak information about the
datasource if in proxy mode.
closes #3845
2016-01-29 23:17:11 +01:00
Torkel Ödegaard
9ec3216ab0
Merge branch 'master' of github.com:grafana/grafana
2016-01-29 16:52:44 -05:00
Torkel Ödegaard
92c2f8d556
feat(pinned sidemenu): completed side menu pinned stuff
2016-01-29 16:52:30 -05:00
bergquist
eef506d8c4
tests(playlist): add more test for playlist ui
2016-01-29 22:31:53 +01:00
Daniel Lee
7f15e2c167
Merge pull request #3889 from grafana/dashboard-share-menu
...
New dropdown menu to surface the snapshot feature, basic styling in p…
2016-01-29 21:58:05 +01:00
Torkel Ödegaard
03aea09ce9
feat(pinned): updated
2016-01-29 15:49:13 -05:00
Daniel Lee
2897f618a6
Merge pull request #3880 from vitorboschi/fix3877
...
add default value for fill policy
2016-01-29 21:44:08 +01:00
Torkel Ödegaard
5f2aba6c5b
feat(sidemenu): pinned state
2016-01-29 15:36:41 -05:00
Daniel Lee
21632d22ab
Merge pull request #3882 from bergquist/playlist_tags
...
Add support for playlist based on tags
2016-01-29 21:32:58 +01:00
Matt Toback
f59f6a5486
Standardized on fa-link icon for Link instead of external-link, which generally means Open In New Window or Go Offsite
2016-01-29 15:27:42 -05:00
Torkel Ödegaard
32989f4cca
Merge branch 'master' into pinned
2016-01-29 15:13:35 -05:00
Torkel Ödegaard
b5ef793ae4
feat(sidemenu): pinned work started
2016-01-29 15:12:56 -05:00
bergquist
d405176367
chore(playlist): remove commented code
2016-01-29 20:33:01 +01:00
Daniel Lee
74cb4b6590
Merge pull request #3891 from grafana/new-icon-font
...
New icon font
2016-01-29 20:27:13 +01:00
bergquist
15087251fb
test(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstoretest(playlist): add test for playlist sqlstore
2016-01-29 20:24:19 +01:00
bergquist
73d6b95339
chore(playlist): remove unused code
2016-01-29 20:24:06 +01:00
Anthony Woods
c3032f7ba3
Merge pull request #3890 from daniellee/joinurlfragments
...
No added trailing slash if proxypath is empty in JoinUrlFragments
2016-01-29 14:11:43 -05:00
Trent White
339e73ee3d
change file names to remove the rt reference in the icon files
2016-01-29 13:57:48 -05:00
bergquist
a2c00f1cc5
docs(playlist): add docs about tags in playlist
2016-01-29 19:44:02 +01:00
Trent White
6da3f87736
use svg icon instead of png file
2016-01-29 12:52:29 -05:00
Trent White
6ae464f33a
add rt-fonts file and point refs to snapshot icon to it
2016-01-29 12:46:57 -05:00
Daniel Lee
74decb4bdc
fix(dataproxy): no trailing slash if proxypath is empty
...
The JoinUrlFragments function adds a trailing slash if to the proxy url
if the proxy path is an empty string. This fix removes that trailing
slash. Fixes #3847
2016-01-29 18:44:33 +01:00
Anthony Woods
2e9272c778
Merge remote-tracking branch 'upstream/master' into apiPlugin
2016-01-30 01:38:01 +08:00
Matt Toback
6fe850e2c1
New dropdown menu to surface the snapshot feature, basic styling in place. Want to extend menu to include summary text of each feature
2016-01-29 11:48:57 -05:00
Vitor Boschi
bb3360e92a
add default value for fill policy
2016-01-29 07:50:30 -02:00
Daniel Lee
f46eee96a9
Merge pull request #3885 from vitaliyf/patch-2
...
Update CHANGELOG.md
2016-01-29 05:52:14 +01:00
Vitaliy Fuks
3ed8870362
Update CHANGELOG.md
...
Minor grammar tweaks and formatting.
2016-01-28 22:02:29 -05:00
Daniel Lee
605f0fa24a
Merge pull request #3884 from raintank/issue3883
...
fix sql query in GetAdminStats.
2016-01-29 02:47:55 +01:00
bergquist
5a4e48fa99
style(playlist_spec): rename to underscore standard
2016-01-29 02:42:23 +01:00
Anthony Woods
79e7ae4424
fix sql query in GetAdminStats. fixes #3883
2016-01-29 09:38:51 +08:00
bergquist
35071649e0
tests(playlist): refactor playlist edit ctrl
2016-01-29 02:37:07 +01:00
bergquist
d27bb4d3fb
style(playlist): move dashboard access to dashboard.go
2016-01-29 01:41:23 +01:00
bergquist
64a18874e1
style(playlist): remove unused code
2016-01-29 01:23:51 +01:00
Torkel Ödegaard
05e8c576a2
feat(panels): updated influxdb editor to use panelCtrl
2016-01-28 19:07:53 -05:00
bergquist
ea7c2e73ad
style(playlist): remove console logging
2016-01-29 00:38:50 +01:00
bergquist
b6f276265d
style(playlist): remove semi colons for functions in TS
2016-01-29 00:13:29 +01:00
Torkel Ödegaard
3c3d3c9ec6
feat(): fixed share modal
2016-01-28 18:05:49 -05:00
bergquist
d66932a8a2
chore(playlist): extract playlist start into new file
2016-01-28 23:56:56 +01:00
Torkel Ödegaard
34141363ae
feat(panels): fixed panel time
2016-01-28 17:17:56 -05:00
bergquist
3ccf7c8006
feat(playlist): improve the look of tag playlist items
2016-01-28 23:04:22 +01:00
Torkel Ödegaard
56c76f380b
feat(panels): fixes
2016-01-28 16:48:37 -05:00
bergquist
f36ade2959
chore(playlist): cleanup some code
2016-01-28 22:43:54 +01:00
