IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,136 Commits 1,119 Branches 715 Tags
512f6992f162bebce444486c1cacb85995b1eebc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Lee 512f6992f1 dashfolders: rename Root folder to General. Closes #10692 2018-02-02 10:39:26 +01:00
Daniel Lee 22a349051c Merge pull request #10719 from grafana/add_permissions_10676 
Grafana 5.0: Add permissions modal for the permissions pages
 2018-02-01 14:20:04 +00:00
Daniel Lee a77c656033 dashfolders: adds test for permission store 2018-02-01 14:48:11 +01:00
Daniel Lee cc55ab6bc8 dashfolders: adds permission modal to dashboard settings 2018-02-01 14:32:19 +01:00
Daniel Lee 9cdc1428d7 Merge remote-tracking branch 'upstream/master' into add_permissions_10676 2018-02-01 14:02:14 +01:00
Daniel Lee 3a0459e425 Merge branch 'dashboard_permissions' 2018-01-31 16:53:07 +01:00
Daniel Lee a5197046e8 viewstore: fix test after merge 2018-01-31 16:49:41 +01:00
Daniel Lee a9e2273064 Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-31 16:45:32 +01:00
Daniel Lee a0fc5383fd dashfolders: fix for folder picker 
If the selected folder is not in the options then manually create it. This
can happen in some edge cases (if an user has been given access to a
dashboard but does not have access to its parent folder)
 2018-01-31 16:44:55 +01:00
Daniel Lee 7e2e57c306 dashfolders: fixes #10671. Allow Editors default access to Root. 
Editors should be able to create dashboards in root and should be
able to create folders. They cannot administrate permissions though
and these dashboards and folders will get the default permissions.
 2018-01-31 16:43:21 +01:00
Daniel Lee 2409d129c2 dashfolders: text change 2018-01-31 15:41:52 +01:00
Daniel Lee 9ef64d3056 dashfolders: special case for folders in root 
Allow users to change permissions inherited from root.
 2018-01-31 15:34:05 +01:00
Daniel Lee a7e57bc2f8 spelling 2018-01-31 15:07:17 +01:00
Daniel Lee 1cfc81de74 playlist: fixes #10254 
Closes #10254
 2018-01-31 11:07:27 +01:00
Daniel Lee 79fe01959b alerting: small refactoring 2018-01-31 10:47:31 +01:00
Daniel Lee 816c4d2340 url: fix for boolean querystring parameters 
Without this fix then the querystring looks like ?abool=true which causes
a mismatch with the angular routing. This results in a redirect and messes
up the browser history and back button.
 2018-01-31 09:58:21 +01:00
Daniel Lee eb765d288c alertlist: disable pause button when user does not have permission 2018-01-30 23:35:27 +01:00
Daniel Lee 4bc5945c17 dashfolders: remove inline styles 2018-01-30 17:26:44 +01:00
Daniel Lee f5107d5023 alerting: add permission check in api for pausing alerts 2018-01-30 14:41:25 +01:00
Daniel Lee 87d6d791d5 dashfolders: adds comment for dashboard api tests 2018-01-30 14:09:30 +01:00
Daniel Lee 2b7984355a dashfolders: adds comment for dashboard acl test 2018-01-30 13:28:00 +01:00
Daniel Lee a00a42d9ee api: extract api test code to common_test.go 2018-01-30 13:17:48 +01:00
Daniel Lee 0fb05bcf59 Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-30 09:26:23 +01:00
Daniel Lee d74a98feff dashfolders: link to folder for inherited permissions 
In the permissions view in dashboard settings, this adds a
link to the parent folder for inherited permissions. Which
allows the user to easily navigate to the folder and change
inherited permissions.
 2018-01-29 16:10:47 +01:00
Daniel Lee 146af8595d dashfolders: css class as parameter for Picker 
For the permissions picker, pass in an extra class to decide
if the description should be aligned left or right.
 2018-01-29 14:30:01 +01:00
Daniel Lee 5ee2d1de05 dashfolders: select with description for permissions 
The dropdown for selecting permission is a new component built on
react-select that includes a description for the permission for
every option in the select.
 2018-01-29 13:56:12 +01:00
Daniel Lee a7fba593df dashfolders: add help popover. Add folder title for inherited permissions 2018-01-27 18:16:21 +01:00
Daniel Lee 50b20a0e5a dashfolders: use react component for dashboard permissions 
Switch out the angular component for the new react component on the
dashboard permissions editview on the settings page.
 2018-01-27 17:26:40 +01:00
Daniel Lee 83548f98b9 dashfolders: add disabled Admin permission to list 
This is a fake entry that is used to signal to the user that an Admin
user always has Admin rights and they cannot be removed.
 2018-01-26 14:38:27 +01:00
Daniel Lee ccd86873e7 dashfolders: autosave permissions on change (remove update button) 2018-01-26 14:02:22 +01:00
Daniel Lee 08c78ab8b7 dashfolders: fix tests for ViewStore after merge 2018-01-26 09:55:03 +01:00
Daniel Lee bc5fae5367 dashfolders: merge conflict 2018-01-25 14:54:50 +01:00
Daniel Lee 4cfe179f47 variables: lint fix 2018-01-25 14:49:51 +01:00
Daniel Lee 8aa55ee352 variables: fix when datasource returns error 2018-01-25 14:16:06 +01:00
Daniel Lee 9d2a667e8b dashfolder: fix for mysql test 2018-01-24 11:19:26 +01:00
Daniel Lee 94a54248c1 dashfolders: show folders use can save to in picker 
Instead of returning all folders a user has some sort of access to,
this change creates a new end point that returns folders the user
has write access to. This new endpoint is used in the folder picker
 2018-01-20 01:58:28 +01:00
Daniel Lee f443cb8229 dashfolders: fix bug in save as modal 2018-01-20 01:58:28 +01:00
Daniel Lee f64637c2c5 dashfolders: stop user locking themselves out of a folder 2018-01-18 14:30:04 +01:00
Daniel Lee 10018d8455 dashfolders: add breadcrumbs to NavStore 2018-01-18 12:12:07 +01:00
Daniel Lee 1a019052d5 mysql: convert numbers to text for annotation tooltip 2018-01-18 11:50:16 +01:00
Daniel Lee 6d13645206 mysql: update to use ColumnTypes interface in new version 
The custom code in vendor is not needed anymore and most of the
mapping code can be replaced.
 2018-01-18 11:50:16 +01:00
Daniel Lee 7bc7af6c39 mysql: update mysql driver to latest master 
The latest master implements the ColumnType interface.

See https://github.com/go-sql-driver/mysql/issues/495

This removes the custom code in the vendor folder that
did a ColumnType mapping.
 2018-01-18 11:50:16 +01:00
Daniel Lee a5830c6dbc Merge remote-tracking branch 'upstream/master' into dashboard_permissions 2018-01-16 12:02:13 +01:00
Daniel Lee 87064bff79 docs: small update to IIS proxy docs 2018-01-16 09:49:12 +01:00
Daniel Lee 58293ce5cc dashfolders: bugfix after rename 2018-01-15 10:15:52 +01:00
Daniel Lee 4948d4fd75 dashfolders: bugfix after rename 2018-01-15 10:14:10 +01:00
Daniel Lee 77b5dee408 docs: Guide for IIS reverse proxy 2018-01-12 17:02:10 +01:00
Daniel Lee 21b5ded75b dashfolder: refactor breadcrumbs in PageHeader 
Combines title and breadcrumbs in PageHeader instead of having to
set title to empty and add it as a breadcrumb.
 2018-01-11 17:53:06 +01:00
Daniel Lee 545d7b9477 dashfolders: convert folder settings to React 2018-01-11 15:42:45 +01:00
Daniel Lee e1aff1d5ff dashfolders: show/hide create folder or dashboard buttons 
depending on the user role and the permissions the user has for a
folder.
 2018-01-09 14:44:36 +01:00
Daniel Lee a8e9a4995c dashfolders: fix mergeconflict error 2018-01-09 14:44:36 +01:00
Daniel Lee 6f98117641 dashfolders: prettify 2018-01-09 14:44:36 +01:00
Daniel Lee c27a74bb6b dashfolders: check permissions for new dashboard 
ref #10275. Use the parent folder permissions if new dashboard and
it does not have an id yet.
 2018-01-09 14:44:36 +01:00
Daniel Lee ae69c96518 dashfolders: allow any signed in user to get list of teams 2018-01-09 14:44:36 +01:00
Daniel Lee b7f023bc26 fix gofmt warning 2018-01-09 14:44:36 +01:00
Daniel Lee 3ae1bf0c16 dashfolders: permissions for saving annotations 
ref #10275 Use folder permissions instead of hard coded
permissions on the annotations routes.
 2018-01-09 14:44:36 +01:00
Daniel Lee eef37c4071 dashfolders: disable save button after save of acl 2018-01-09 14:44:36 +01:00
Daniel Lee e77878bba8 dashfolders: on folder page, hide tabs if not has admin permission 2018-01-09 14:44:36 +01:00
Daniel Lee 61ed0b0381 dashfolders: remove role requirements on dashboard routes 
and rely on the permission system instead.
 2018-01-09 14:44:36 +01:00
Daniel Lee f7bbfeba28 dashfolders: must have admin permission to save/see dash acl 2018-01-09 14:44:36 +01:00
Daniel Lee 5b6ee6f37b dashfolders: prettify on tests file 2018-01-09 14:44:36 +01:00
Daniel Lee 1e496ec76c dashfolders: permissions tab in dashboard settings 2018-01-09 14:44:36 +01:00
Daniel Lee 5400692cd4 dashfolders: permissions tab for dashboard folders 2018-01-09 14:44:36 +01:00
Daniel Lee 3ea63a1064 fix for unsaved changes popup on tab close/refresh 
Incorrect return values in onbeforeunload event handler mean that the
unsaved changes popup is shown despite there being no changes.
 2018-01-09 14:42:58 +01:00
Daniel Lee ccf1a5124b plugin: fix path for app plugins on windows 
This fixes when an app that contains a plugin (which means it has
a filepath with more parts) gets a back slash in the path for the
plugin module. The string replace now replaces all back slashes and
not just the first one.
 2018-01-04 17:32:57 +01:00
Daniel Lee 6ad06364c7 search: closes dash search when selecting current dashboard (#10285) 
Fixes #10231.
 2017-12-19 15:28:58 +01:00
Daniel Lee 31fc19c6d7 dashboard: fixes #10262 2017-12-19 14:55:03 +01:00
Daniel Lee 78fb5be2cf docs: mysql example with macro 2017-12-18 14:24:04 +01:00
Daniel Lee 40af84a83f docs: mysql macros update 2017-12-18 14:12:04 +01:00
Daniel Lee 77cc546315 dashfolder: nginject fix 2017-12-15 16:36:31 +01:00
Daniel Lee 7dac64354f teams: missing nginject attribute 2017-12-15 16:26:00 +01:00
Daniel Lee 2b814738c1 dashfolder: change to migration text 
First index for the dashboard_acl table had the word
unique in the migration description even though the
index is not unique
 2017-12-15 11:35:14 +01:00
Daniel Lee bcc85862fe dshttpsettings: Move whitelisted cookies to end of config page 2017-12-14 11:46:44 +01:00
Daniel Lee f1aa7dcd52 proxyds: failing test for keepCookies 
If the cookies are specified in the keepCookies property then they
should not be deleted from proxied requests for data sources
 2017-12-14 11:46:44 +01:00
Daniel Lee 592cb386e2 dshttpsettings: add field for cookies that should be kept 
The ds proxy strips out cookies. Cookie names specified in
this field will not be stripped out. This is the frontend
change only.
 2017-12-14 11:46:44 +01:00
Daniel Lee fcca36a256 fix: after removed file 2017-12-14 09:46:55 +01:00
Daniel Lee 34cffc6b92 dashfolder: fix after backendSrv change 
also removes unused create folder modal
 2017-12-14 09:35:14 +01:00
Daniel Lee f1b1dbc6dd dashboard: fix test after merge conflict 2017-12-14 09:34:00 +01:00
Daniel Lee c5c403b6ef orgswitcher: update test 2017-12-14 09:02:23 +01:00
Daniel Lee fa29ff0d79 fixes switching org when url contains orgId querystring param 2017-12-13 17:29:17 +01:00
Daniel Lee 7d0ca63b72 navmodel: fix for signout link on pref page 
without a target property on the link, the signout tab on
the preferences page returned a 404.
 2017-12-13 16:28:36 +01:00
Daniel Lee 02d3a9f365 docs: SSL Mode config settings for Postgres 2017-12-13 10:55:58 +01:00
Daniel Lee c98e15903e dashfolder: settings page for folder 
with rename and delete. Fixes #10120
 2017-12-13 10:54:08 +01:00
Daniel Lee a37f1b77f1 dashfolders: new dashboard with folder selected 
Fixes #10133
 2017-12-11 16:37:40 +01:00
Daniel Lee 781349d360 dashboard: dashboard search results component. closes #10080 2017-12-05 14:20:44 +01:00
Daniel Lee 66657d24b8 sidemenu: responsive sidemenu view for smallest breakpoint 
For the smallest breakpoint, expands the sidemenu to be width 100% and
to be toggled on or off rather than visible all the time.
 2017-12-04 12:37:00 +01:00
Daniel Lee 554c7ba96f notifier: Fixes path for uploaded image for Slack notifier 
Fixes #10012
 2017-11-29 11:16:45 +01:00
Daniel Lee e6bf266c4b formatting in build file 2017-11-29 11:15:27 +01:00
Daniel Lee 4356e980f0 dashfolders: create app folder on dashboard import 2017-11-27 17:08:39 +01:00
Daniel Lee 07cd182617 datasource: fix merge conflict - restore dashboards tab 2017-11-27 15:17:50 +01:00
Daniel Lee 9ba9043d64 dashlist: change scrollbar to new perfect scroll directive 2017-11-23 13:31:35 +01:00
Daniel Lee 245cebedde dashlist: style list to be same as dash search 2017-11-23 11:53:55 +01:00
Daniel Lee 41a3431c4e dashlist: starred filter search 2017-11-22 18:44:57 +01:00
Daniel Lee 400bd205a8 Removing file that got committed by accident 2017-11-22 09:30:49 +01:00
Daniel Lee ba511f3e24 dashlist: adds tag filter select (GitHub style) 2017-11-21 18:53:49 +01:00
Daniel Lee 121d48ec26 dashlist: toggle folders 2017-11-21 17:06:30 +01:00
Daniel Lee 3dc2e06a33 dashboard: fix test for folderIds 2017-11-21 16:41:08 +01:00
Daniel Lee bd2b26e9f5 dashlist: fix tag filtering and some css 2017-11-21 14:47:19 +01:00
Daniel Lee 5dd9582520 mysql: add data source support for Azure MySql 
Fixes #9649
 2017-11-21 13:21:19 +01:00
Daniel Lee 8daff73ba2 dashlist: started fixing js/css after design changes 2017-11-20 18:15:59 +01:00