IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,194 Commits 5,416 Branches 554 Tags
dbf61355b355bc2c6099a843a31b0559880b3d0b
Commit Graph

5449 Commits

Author SHA1 Message Date
Torkel Ödegaard
e81330abf0 fix: sign in link should have target self to trigger full page reload, fixes #11626 2018-04-17 21:01:52 +02:00
Daniel Lee
5b968329a0 graphite: adds tests for tags and tag_values functions 2018-04-17 18:58:47 +02:00
Marcus Efraimsson
d7688241c6 Merge branch 'master' into readonly_dashboards 2018-04-17 16:27:51 +02:00
Daniel Lee
26bb22bffa Merge pull request #11554 from grafana/11553_viewer_general_access 
User with org viewer role permission fixes
 2018-04-17 13:50:45 +02:00
Marcus Efraimsson
2fc1558daf revert changes of add panel button to require save permission 
This resolves an issue where the add panel button was shown on the default home dashboard
 2018-04-17 11:03:46 +02:00
Marcus Efraimsson
8a5cb088d3 Merge branch 'master' into readonly_dashboards 2018-04-17 10:50:04 +02:00
Torkel Ödegaard
85121e55c9 fix: Row state is now ignored when looking for dashboard changes (#11608) 
* fix: Row state is now ignored when looking for dashboawrd changes, had to fix bug in expand logic to make fix work. Also moved the ChangeTracker to it's own file and moved tests to jest, fixes #11208

* removed commented out log calls
 2018-04-17 09:41:07 +02:00
Marcus Efraimsson
92768d5a2b Merge branch 'master' into dashboard-acl-ux2 2018-04-17 09:19:36 +02:00
Marcus Efraimsson
a01e6fc9c7 add some more sort order asserts for permissions store tests 2018-04-17 09:19:17 +02:00
Marcus Efraimsson
3a5d1f4594 tsdb: update query and annotation editor help texts for postgres 
In addition to closing #11578
 2018-04-16 23:56:14 +02:00
Sven Klemm
4599329683 set default for sslmode to verify-full in postgres datasource editor (#11615) 2018-04-16 22:23:24 +02:00
Marcus Efraimsson
58e6b11809 add some more sort order asserts for permissions store tests 2018-04-16 21:51:53 +02:00
Marcus Efraimsson
bc8353ae14 Merge branch 'master' into dashboard-acl-ux2 2018-04-16 21:19:01 +02:00
Daniel Lee
e7bcd8c3c3 variable: fix binding bug after ts conversion 2018-04-16 19:59:47 +02:00
Daniel Lee
7d165068df fix merge conflict 2018-04-16 19:19:48 +02:00
Patrick O'Carroll
7ef6106197 migrated dropdown-typeahead to ts (#11499) 
* migrated dropdown-typeahead to ts

* removed console.logs

* added @ngInject
 2018-04-16 17:40:29 +02:00
David
ed44face0e Merge pull request #11605 from grafana/davkal/show-version-in-help 
Show Grafana version and build in Help menu
 2018-04-16 16:58:18 +02:00
David Kaltschmidt
5a29c17282 moved version in help menu to top 2018-04-16 16:25:28 +02:00
Marcus Efraimsson
90ed046ce3 docs: elasticsearch and influxdb docs for group by time interval option (#11609) 2018-04-16 16:03:50 +02:00
Patrick O'Carroll
5200196092 added fix for test 2018-04-16 14:49:47 +02:00
Patrick O'Carroll
ce3dcadfef addeds test for sort order 2018-04-16 14:30:50 +02:00
David Kaltschmidt
712212d6aa Show Grafana version and build in Help menu 
* establishes Help as the single place to look for the Grafana version
* version is passed as menu sub-title to side menu
* added rendering of sub-title, plus styles
* sub-title was used by profile menu (its value is the login string),
but was not shown; now showing this value on condition that login name
is different from user name
 2018-04-16 13:37:05 +02:00
Patrick O'Carroll
6b4ef7f598 wip: writing tests for permission sorting 2018-04-16 10:42:39 +02:00
Carl Bergquist
693ff1c000 Merge pull request #11579 from towolf/add-url-param-for-inactive-mode 
Add another URL param «inactive» which works like «kiosk» but with title
 2018-04-16 09:35:57 +02:00
Daniel Lee
67daa9b058 Merge pull request #11588 from mjtrangoni/fix-codespell-issues 
Fix codespell issues
 2018-04-16 09:12:49 +02:00
Daniel Lee
af91238d14 Merge pull request #11547 from grafana/value-select-dropdown-to-ts 
Value select dropdown to ts
 2018-04-14 16:53:08 +02:00
Mario Trangoni
e5e6bc56c8 public: fix codespell issues 2018-04-13 20:31:29 +02:00
Daniel Lee
9413ce5ef6 Merge pull request #8096 from ryantxu/influx-db-query2 
let the influxdb API set a database
 2018-04-13 18:22:12 +02:00
Marcus Efraimsson
4a26797cdd Merge branch 'master' into readonly_dashboards 2018-04-13 17:03:00 +02:00
Patrick O'Carroll
c431875f28 permissions sorting fixed + icon same size as avatrs 2018-04-13 13:50:15 +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
Alexander Zobnin
74c10515ad fix right side legend rendering in phantomjs 2018-04-12 14:22:19 +03: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
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
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
Patrick O'Carroll
5f67d4268d added @ngInject 2018-04-10 15:48:51 +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
Patrick O'Carroll
6719bdf9bd added @ngInject 2018-04-10 09:24:54 +02:00
Daniel Lee
c860f21052 playlist: add missing nginject attribute 2018-04-09 21:33:18 +02:00
Patrick O'Carroll
77b8ccd7f5 removed console.log 2018-04-09 17:01:58 +02:00
Daniel Lee
23ed5dfc8a Merge pull request #11531 from grafana/11391_access 
Rename direct/proxy access mode to browser/server
 2018-04-09 14:48:29 +02:00
Sven Klemm
00524e6827 prevent angular from evaluating {{hostname}} in tooltip (#11514) 2018-04-09 12:51:17 +02:00
Marcus Efraimsson
95132165f8 data source: rename direct/proxy access mode in data source settings 
Changes access drop down options names:
- proxy -> Server (Default)
- direct -> Browser
Replace access drop down info icon/tooltip with expandable/collapsable
help section.
 2018-04-09 12:47:19 +02:00
Alexander Zobnin
41e5d66e39 scrollbar: fix add panel height bug 2018-04-06 20:31:44 +03:00