Commit Graph
19865 Commits
Author SHA1 Message Date
Patrick O'Carroll c431875f28 permissions sorting fixed + icon same size as avatrs 2018-04-13 13:50:15 +02:00
Marcus Efraimsson f2c5417ee4 Merge branch 'master' into docs-5.1 2018-04-13 11:36:54 +02:00
Marcus Efraimsson aa59843902 docs: update mssql with azure sql database support 2018-04-13 11:36:40 +02:00
Marcus Efraimsson 55d262655a changelog: adds note for #11569
[skip ci]
2018-04-13 11:06:57 +02:00
Marcus Efraimsson fa95297e6a docs: update default annotation limit when querying api
Needed due to closing #11569
2018-04-13 10:58:29 +02:00
Marcus Efraimsson 80e4a9dc55 Merge branch 'master' into docs-5.1 2018-04-13 10:56:26 +02:00
Marcus Efraimsson 167d5aebe6 Merge pull request #11576 from flopp999/patch-3
change default annotation limit from 10 to 100 when querying api
2018-04-13 10:55:01 +02:00
Tobias Wolf f143cb655a Mention the ?inactive parameter in the docs 2018-04-12 21:38:28 +02:00
Tobias Wolf a43e7c7b3f Add another URL param «inactive» which works like «kiosk» but with title
closes #11228
2018-04-12 21:14:58 +02:00
Marcus Efraimsson 224a0eb0d3 Merge branch 'master' into sql-uint64 2018-04-12 19:12:45 +02:00
Marcus Efraimsson a86ee304ff tsdb: remove unnecessary type casts in sql data sources macro engines 2018-04-12 19:08:35 +02:00
Marcus Efraimsson f5586b1270 tsdb: sql data sources should handle time ranges before epoch start correctly 2018-04-12 18:53:12 +02:00
Marcus Efraimsson a3874ce2c7 Merge branch 'master' into sql-uint64 2018-04-12 18:49:27 +02:00
flopp999 74f570fdf4 change annotation limit from 10 to 100 2018-04-12 17:38:10 +02:00
Daniel Lee b481e1515d Merge pull request #11456 from alexanderzobnin/fix-11053
Migrating to baron scrollbar WIP
2018-04-12 14:56:04 +02:00
Alexander Zobnin f8543fced9 remove mistakenly added styles 2018-04-12 14:29:35 +03:00
Alexander Zobnin 31e5c1fa1f Merge remote-tracking branch 'upstream/11053-remove-native-scrollbar' into 11053-remove-native-scrollbar 2018-04-12 14:23:47 +03:00
Alexander Zobnin 74c10515ad fix right side legend rendering in phantomjs 2018-04-12 14:22:19 +03:00
Carl Bergquist be2016f46e Merge pull request #11571 from bergquist/remove-codecov
build: remove code cov
2018-04-12 11:38:00 +02:00
Daniel Lee d4398479f5 scrollbar: fix so no overflow for legend under graph
Adds 1px of padding to the graph legend scroll div so that a non-table
legend does not get an unnecessary scroll bar.
2018-04-12 11:26:27 +02:00
bergquist b220162b91 build: remove code cov 2018-04-12 11:26:05 +02:00
Daniel Lee 76c87d1a74 scrollbar: fixes continuation scrolling for iOS
The -webkit-overflow-scrolling is an iOS only property:

https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-overflow-scrolling

that turns on momementum/continuation scrolling for iOS devices. This means
that when swiping, the scroll continues for a half second rather than instantly
stopping the scroll when the user lifts their finger from the screen.
2018-04-12 10:53:27 +02:00
Patrick O'Carroll 229486015d added styling to fontawesome icons so they have same size as the other icons 2018-04-12 10:44:00 +02:00
Carl Bergquist dca73b9ab6 Merge pull request #11567 from 247Sports/docs/cloudwatch-backend-iam-policy
Add minimal IAM policy example for CloudWatch data source
2018-04-12 10:23:56 +02:00
Tim O'Guin 1f0dfbbf86 Improve wording 2018-04-11 21:36:07 -05:00
Tim O'Guin ee7943b9b2 Add minimal IAM policy example for CloudWatch data source 2018-04-11 21:29:11 -05:00
Andrzej Ressel bff174dba9 PR comments 2018-04-11 22:59:29 +02:00
Marcus Efraimsson 1232745e89 docs: fix typo of default port for mssql
Fixes #11562
2018-04-11 20:56:16 +02:00
Marcus Efraimsson fe4cfbeb73 Merge branch 'master' into docs-5.1 2018-04-11 20:38:09 +02:00
Marcus Efraimsson cdcaaa5d03 minor scrollbar fixes
Hide page scrollbar when rendering using phantomjs.
Hide baron scrollbar when rendering using phantomjs.
2018-04-11 20:12:32 +02:00
Daniel Lee db83255460 scrollbar: remove unused div
Fixes the height of the settings menu
2018-04-11 19:19:33 +02:00
Daniel Lee e74be16900 Merge remote-tracking branch 'upstream/11053-remove-native-scrollbar' into 11053-remove-native-scrollbar 2018-04-11 18:33:00 +02:00
Marcus Efraimsson a1b53674a9 dashboard: show baron scrollbar in dashboard panel when mouse is over
This should make the scrolling user experience much better since it
will highlight and show that content actually can be scrolled when
hovering over a panel.
2018-04-11 18:12:48 +02:00
Marcus Efraimsson 9549aadd26 fix so that page scrollbars can be scrolled by keyboard on page load
The page scrollbars are custom, not rendered on the body element and
with css property overflow set for scroll to be enabled.
For being able to scroll the page using the keyboard when a
page loads, some custom code was needed.
This fix should both work when doing a full reload of a url and when
navigating to other pages/dashboards.
For those pages having an input field that are focused on load,
scrolling by keyboard (arrow up/down) will obviously not work.
2018-04-11 17:49:40 +02:00
Marcus Efraimsson 2956011b60 fix so that dash list panel are rendered correctly
This resolves issue with dash list panel getting scrollbars
    attached to incorrect elements. Now the panel content are
    rendered correctly and all content are displayed as
    expected.
2018-04-11 17:44:51 +02:00
Marcus Efraimsson 8c04eb272d panel: add baron scroller to correct element
This resolves issue with alert list panel getting scrollbars
attached to incorrect element. Now the panel content are
rendered correctly and all content are displayed as
expected.
2018-04-11 17:41:20 +02:00
Daniel Lee 83f7ac18db Merge remote-tracking branch 'upstream/master' into 11053-remove-native-scrollbar 2018-04-11 14:32:19 +02:00
Leonard Gram 041067f5f0 Windows build updated to go1.10. 2018-04-11 14:31:23 +02:00
Daniel Lee 25ec7b5b02 scrollbar: use native scroll for page 2018-04-11 14:30:39 +02:00
Patrick O'Carroll 82aa6cf46b converted functions to arrow functions 2018-04-11 10:26:05 +02:00
Marcus Efraimsson e73479ef33 folders: fix permissions in folder picker component
Only enable creating new folders from folder picker if user has org roles
admin or editor.
Only render General option in folder picker if user has org roles admin
or editor.
2018-04-11 00:26:16 +02:00
Marcus Efraimsson b4863002c9 permission: fix user with org viewer save/move permissions
User with org viewer role should not be able to save/move dashboards
in/to general folder.
2018-04-11 00:23:50 +02:00
bergquist 93e1546f73 alerting: handle invalid json format
closes #11003
2018-04-10 22:22:12 +02:00
Marcus Efraimsson be4b715aad docker: change mysql container so that it uses utc 2018-04-10 16:59:48 +02:00
Marcus Efraimsson 6cb891dca8 mysql: use a datetime column with microsecond precision in test 2018-04-10 16:37:39 +02:00
Marcus Efraimsson 97f67ddcb8 tsdb: improved floating point support when converting sql time column to epoch (ms) 2018-04-10 16:36:00 +02:00
Patrick O'Carroll 5f67d4268d added @ngInject 2018-04-10 15:48:51 +02:00
Sven Klemm 24eafa4537 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-04-10 14:37:11 +02:00
Daniel Lee 9e1a1ed572 Merge pull request #11501 from grafana/metric-segment-to-ts
migrated metric_segment to ts
2018-04-10 12:41:58 +02:00
bergquist f424d13b53 provisioning: dont override permissions 2018-04-10 12:35:06 +02:00