ryan
e92ea79524
get circle to run tests again
2018-03-23 12:48:03 +01:00
ryan
2116152295
add dashboardId to test
2018-03-23 12:35:39 +01:00
ryan
a58b4ff2d6
remove api tests
2018-03-23 12:13:38 +01:00
ryan
14b737e662
update CHANGELOG
2018-03-23 12:08:32 +01:00
ryan
b39fb7fdd5
fix operator
2018-03-23 12:01:21 +01:00
ryan
a0a6fa6fa5
remove constraint from sqlstore
2018-03-23 11:47:07 +01:00
ryan
a5588b6957
Merge remote-tracking branch 'origin/annotations-created' into annotations-created
...
* origin/annotations-created:
dooh
2018-03-23 11:44:21 +01:00
ryan
4ed1ec5174
Merge remote-tracking branch 'grafana/master' into annotations-created
...
* grafana/master: (30 commits)
changelog: adds note about closing #11278
docs: spelling
docs: add intro paragraph to provisioning page
Cleanup CircleCI V2 Conversion
changelog: notes for #1271 and #2740
graph: minor fixes to y-axes alignment feature
added save icon to save buttons
removed trash can icon from save buttons
Return actual user ID in UserProfileDTO
dashboard version cleanup: more tests and refactor
minor refactor of dashboard version cleanup
refactor: dashboard version cleanup
limit number of rows deleted by dashboard version cleanup
fix dashboard version cleanup on large datasets
Allocated to a separate alignment block. Replaced the attribute of the second axis by the attribute of the axes.
Fixed unit test.
Changed the way this feature was activated. And changed tolltip.
Added validation of input parameters.
Resolved conflict
Corrected work for graphs created before this feature.
...
2018-03-23 11:38:43 +01:00
ryan
db92a96067
move dashboard error to API (not sql)
2018-03-23 11:36:44 +01:00
bergquist
09df38d9f4
changelog: adds note about closing #11278
2018-03-23 11:01:32 +01:00
Carl Bergquist
f0d77804da
Merge pull request #11329 from alexanderzobnin/fix-11278
...
fix dashboard version cleanup on large datasets
2018-03-23 10:53:51 +01:00
Carl Bergquist
d29116d8ff
Merge pull request #11346 from infernix/fix-api-user-id
...
Return actual user ID in UserProfileDTO
2018-03-23 10:36:47 +01:00
Carl Bergquist
113888d6aa
Merge pull request #11357 from tylerauerbeck/update_circleciv2
...
Cleanup CircleCI V2 Conversion
2018-03-23 10:29:37 +01:00
Daniel Lee
1c1d962bb1
docs: spelling
2018-03-23 09:04:50 +01:00
Daniel Lee
ccfe9de014
docs: add intro paragraph to provisioning page
2018-03-23 08:55:11 +01:00
Tyler Auerbeck
6f0eb94d46
Cleanup CircleCI V2 Conversion
2018-03-23 02:14:12 -04:00
Ryan McKinley
164ddb16c9
dooh
2018-03-22 20:48:40 +01:00
ryan
0c7294593c
update the updated column!
2018-03-22 20:05:04 +01:00
ryan
d554c6f9be
using circle as my tester
2018-03-22 19:44:47 +01:00
ryan
fa021b547a
using circle as my tester
2018-03-22 19:39:30 +01:00
ryan
db91033b6e
adding tests, but they arent running locally
2018-03-22 19:33:33 +01:00
Marcus Efraimsson
63465fd556
changelog: notes for #1271 and #2740
...
[skip ci]
2018-03-22 19:19:56 +01:00
Marcus Efraimsson
1ee0d1c296
Merge pull request #10994 from ilgizar/1271_share_zero
2018-03-22 18:34:38 +01:00
Marcus Efraimsson
f04a5d7329
Merge branch 'master' into 1271_share_zero
2018-03-22 18:31:37 +01:00
Marcus Efraimsson
c672e44d35
graph: minor fixes to y-axes alignment feature
2018-03-22 18:30:23 +01:00
Marcus Efraimsson
4af3a7875a
Merge pull request #11349 from grafana/save_trash
...
Fix save icon in folder settings
2018-03-22 18:21:28 +01:00
Patrick O'Carroll
99626b8e07
added save icon to save buttons
2018-03-22 17:04:00 +01:00
Marcus Efraimsson
2e8aeffc13
Merge branch 'master' into 1271_share_zero
2018-03-22 16:59:36 +01:00
Patrick O'Carroll
823f903048
removed trash can icon from save buttons
2018-03-22 16:59:06 +01:00
Gerben Meijer
e722732021
Return actual user ID in UserProfileDTO
...
This fixes calls to /api/user where ID is currently always 0
2018-03-22 16:30:04 +01:00
ryan
20353db966
convert epoch to milliseconds
2018-03-22 16:21:47 +01:00
ryan
a2bbd89a9e
adding updated column
2018-03-22 15:52:09 +01:00
ryan
df94b380f4
Merge remote-tracking branch 'grafana/master' into annotations-created
...
* grafana/master:
Make golint happier
2018-03-22 14:59:14 +01:00
Carl Bergquist
22fffe0dda
Merge pull request #11337 from digineo/golint
...
Make golint happier
2018-03-22 14:35:33 +01:00
Alexander Zobnin
0ffcea08c7
dashboard version cleanup: more tests and refactor
2018-03-22 15:18:05 +03:00
Julian Kornberger
7aab6a8887
Make golint happier
2018-03-22 12:40:21 +01:00
ryan
3898ea02e6
adding created column
2018-03-22 02:22:58 +01:00
Alexander Zobnin
2ade0881b1
minor refactor of dashboard version cleanup
2018-03-21 22:48:17 +03:00
Alexander Zobnin
3f85fcce2d
refactor: dashboard version cleanup
2018-03-21 21:01:15 +03:00
Alexander Zobnin
f976b690ca
limit number of rows deleted by dashboard version cleanup
2018-03-21 20:26:27 +03:00
Alexander Zobnin
fc2d1d6ca9
fix dashboard version cleanup on large datasets
2018-03-21 17:23:05 +03:00
Daniel Lee
624dac16fa
docs: add variable regex examples ( #11327 )
2018-03-21 13:23:50 +01:00
bergquist
f41f2089a2
docs: details about provisioning elastic
...
closes #11292
2018-03-21 08:54:09 +01:00
Carl Bergquist
4bcc073813
Merge pull request #11322 from jordo1138/patch-1
...
update email template default year and name
2018-03-21 07:49:35 +01:00
Jordan Hamel
7a4475fbf3
update email default year and name
...
from 2016 grafana and raintank to 2018 Grafana Labs
2018-03-20 16:55:57 -07:00
Daniel Lee
c53fda4b5a
Merge pull request #11264 from grafana/11102_duplicate_panel_shortcut
...
Keyboard shortcut to duplicate panel
2018-03-20 20:56:35 +01:00
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
