Daniel Lee
685a371747
Merge pull request #11316 from ryantxu/ace-disable-snippets
...
Expose option to disable snippets in ACE code-editor
2018-03-20 20:53:34 +01:00
Marcus Efraimsson
9df5476fe3
Merge pull request #11312 from grafana/func_editor_js_to_ts
...
convert func_editor.js to typescript
2018-03-20 20:51:58 +01:00
Marcus Efraimsson
de396b277e
Merge pull request #11309 from grafana/add_graphite_func_js_to_ts
...
convert add_graphite_func.js to typescript
2018-03-20 20:51:21 +01:00
Daniel Lee
4dcf1b72b3
Merge pull request #11313 from ryantxu/remove-unused-images
...
Remove unused kibana images
2018-03-20 20:44:00 +01:00
Daniel Lee
70cd501373
Merge pull request #11320 from daniellee/update-xorm
...
mysql: fixes panics when mysql connection times out (#11155 )
2018-03-20 20:16:18 +01:00
Daniel Lee
32d1477b79
Merge pull request #11319 from alexanderzobnin/fix-11318
...
snapshot: fix legend rendering bug
2018-03-20 20:02:25 +01:00
Alexander Zobnin
a472d38fbf
snapshot: fix legend rendering bug
2018-03-20 21:33:54 +03:00
Daniel Lee
1cef373d16
Merge remote-tracking branch 'upstream/master' into update-xorm
2018-03-20 19:21:58 +01:00
Daniel Lee
70630d742e
snapshots: removes errors for empty values in ViewStore
...
Occurs when opening a snapshot.
2018-03-20 19:12:52 +01:00
ilgizar
0e159dada1
Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes.
2018-03-20 22:44:48 +05:00
ryan
f9acb4157b
Expose option to disable snippets
2018-03-20 15:26:41 +01:00
Patrick O'Carroll
47215098a3
changed var to const, changed to string interpolation
2018-03-20 14:43:09 +01:00
ryan
54c4b6a11a
Remove unused kibana images
2018-03-20 14:39:19 +01:00
Patrick O'Carroll
3bdd006291
changed var to const
2018-03-20 14:26:03 +01:00
Daniel Lee
d34cd8730e
mssql: convert tests to jest
2018-03-20 13:01:32 +01:00
Daniel Lee
ae4c6e4648
mssql: fix precision for time column in table mode
...
ref #11306
2018-03-20 12:59:40 +01:00
Carl Bergquist
10a0460dc6
Merge pull request #11282 from alexanderzobnin/fix-11086
...
Fix rendering link to panel in collapsed row
2018-03-20 12:40:30 +01:00
Patrick O'Carroll
2a90370230
converted file to ts
2018-03-20 12:36:02 +01:00
Alexander Zobnin
05ac7d8fca
dashboard: fix phantomjs panel rendering in collapsed row
2018-03-20 14:13:31 +03:00
ilgizar
e015047ed1
Fixed unit test.
2018-03-20 16:09:52 +05:00
ilgizar
341afe65ef
Merge remote-tracking branch 'upstream/master' into 1271_share_zero
2018-03-20 15:54:56 +05:00
ilgizar
1588295375
Changed the way this feature was activated. And changed tolltip.
2018-03-20 15:38:48 +05:00
ilgizar
230f018c78
Added validation of input parameters.
2018-03-20 15:37:18 +05:00
Patrick O'Carroll
2a50bc35a3
converted file to ts
2018-03-20 11:07:31 +01:00
Marcus Efraimsson
8f6626e805
mssql: encrypt password in database
2018-03-19 17:32:51 +01:00
Marcus Efraimsson
6044b3aeeb
Merge branch 'master' into mssql_datasource
2018-03-19 17:14:33 +01:00
Daniel Lee
caf60dda0e
Merge pull request #10376 from grafana/openTSDB-file-to-ts
...
migrated file to ts
2018-03-19 14:32:32 +01:00
Daniel Lee
8b9c44be17
Merge pull request #10369 from grafana/elastic-file-to-ts
...
migrated files to ts
2018-03-19 13:59:30 +01:00
Marcus Efraimsson
24c0f28f41
mssql: allow host without port and fallback to default port 1433
2018-03-19 13:24:31 +01:00
Marcus Efraimsson
62174c81c8
mssql: cleanup and minor changes
2018-03-19 13:06:46 +01:00
Marcus Efraimsson
8c2f3f761b
mssql: update readme
2018-03-19 11:20:17 +01:00
Marcus Efraimsson
294ee5a610
Merge branch 'master' into mssql_datasource
2018-03-19 11:03:13 +01:00
Marcus Efraimsson
74a98d46eb
mssql: remove logos for now
2018-03-19 11:02:55 +01:00
flopp999
6718915a23
Changed Swedish and Icelandic currency
...
Swedish krone -> Swedish krona
Icelandic krone - > Icelandic króna
2018-03-16 19:46:20 +01:00
Alexander Zobnin
205714759e
fix failed tests for dashboard view state
2018-03-16 21:45:31 +03:00
Alexander Zobnin
0e5b790b54
dashboard: fix rendering link to panel in collapsed row
2018-03-16 21:03:49 +03:00
Marcus Efraimsson
d26d8c713e
Merge branch 'master' into mssql_datasource
2018-03-16 15:19:19 +01:00
Marcus Efraimsson
06afd24a10
mssql: add alternative logo without text
2018-03-16 15:18:05 +01:00
Marcus Efraimsson
1c7aff7810
mssql: strip inkscape from logo
2018-03-16 15:17:25 +01:00
Marcus Efraimsson
69b9fb6d15
mssql: minor improvements of query editor help
2018-03-16 15:11:15 +01:00
Marcus Efraimsson
ccd57fbfa3
mssql: skip rendering of mssql logos until we have a valid logo
2018-03-16 14:47:43 +01:00
Marcus Efraimsson
a6e4ac5484
mssql: update plugin.json, added description and name MSSQL -> Microsft SQL Server
2018-03-16 14:26:05 +01:00
Patrick O'Carroll
fc9014f920
added indent to dashboards inside folder in search dropdown, and added indent to dashboard icon in search item
2018-03-16 12:36:36 +01:00
Mitsuhiro Tanda
c6fa0b90a7
prometheus editor: variable autocomplete support (PR #9988 )
...
* prometheus ace editor, template variable support
* minor fix
* support [[var]] notation
* don't remove last ] if token type is string
* Revert "don't remove last ] if token type is string"
This reverts commit bce5b2d56e10012f8ffe
2018-03-15 20:17:51 +03:00
Patrick O'Carroll
1094dc32bc
made a keyboard shortcut to duplicate panel
2018-03-15 17:22:11 +01:00
Marcus Efraimsson
d2267643ed
Merge branch 'master' into mssql_datasource
2018-03-15 09:53:19 +01:00
ilgizar
bd3d17ab8c
Merge remote-tracking branch 'upstream/master' into 1271_share_zero
2018-03-14 23:42:58 +05:00
ilgizar
9d7ab78d9f
Resolved conflict
2018-03-14 23:39:05 +05:00
Carl Bergquist
0ef94ea403
Merge pull request #11232 from grafana/11231_dash_url
...
Should be possible to browse dashboard using only uid
2018-03-14 14:18:58 +01:00
Marcus Efraimsson
91fa076fb3
folders: should be possible to browse folder using only uid
...
That is, the slug part of url should be optional.
2018-03-13 21:32:37 +01:00
