Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Configuration: Add an option to hide certain users in the UI #28942

Merged
merged 34 commits into from Nov 24, 2020
Merged

Configuration: Add an option to hide certain users in the UI #28942

merged 34 commits into from Nov 24, 2020

Commits on Nov 9, 2020

  1. Add an option to hide certain users in the UI

    @AgnesToulet
    AgnesToulet committed Nov 9, 2020
    Copy the full SHA
    7bf8601 View commit details
    Browse the repository at this point in the history

  2. revert changes for admin users routes

    @AgnesToulet
    AgnesToulet committed Nov 9, 2020
    Copy the full SHA
    b68cf02 View commit details
    Browse the repository at this point in the history

  3. fix sqlstore function name

    @AgnesToulet
    AgnesToulet committed Nov 9, 2020
    Copy the full SHA
    affa394 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2020

  1. Improve slice management 

    Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
    @AgnesToulet @sakjur
    AgnesToulet and sakjur committed Nov 10, 2020
    Copy the full SHA
    403ba09 View commit details
    Browse the repository at this point in the history

  2. Hidden users: convert slice to map

    @AgnesToulet
    AgnesToulet committed Nov 10, 2020
    Copy the full SHA
    dff0bf2 View commit details
    Browse the repository at this point in the history

  3. filter with user logins instead of IDs

    @AgnesToulet
    AgnesToulet committed Nov 10, 2020
    Copy the full SHA
    a247aa7 View commit details
    Browse the repository at this point in the history

  4. put HiddenUsers in Cfg struct

    @AgnesToulet
    AgnesToulet committed Nov 10, 2020
    Copy the full SHA
    22e0faa View commit details
    Browse the repository at this point in the history

  5. hide hidden users from dashboards/folders permissions list

    @AgnesToulet
    AgnesToulet committed Nov 10, 2020
    Copy the full SHA
    ec5e6d4 View commit details
    Browse the repository at this point in the history

  6. Update conf/defaults.ini 

    Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
    @AgnesToulet @torkelo
    AgnesToulet and torkelo committed Nov 10, 2020
    Copy the full SHA
    78b3f52 View commit details
    Browse the repository at this point in the history

  7. fix params order

    @AgnesToulet
    AgnesToulet committed Nov 10, 2020
    Copy the full SHA
    11c48d8 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'config-hidden-users' of https://github.com/AgnesToulet/… 

    …grafana into config-hidden-users
    @AgnesToulet
    AgnesToulet committed Nov 10, 2020
    Copy the full SHA
    85766f2 View commit details
    Browse the repository at this point in the history

  9. fix tests

    @AgnesToulet
    AgnesToulet committed Nov 10, 2020
    Copy the full SHA
    ba41f68 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into config-hidden-users

    @AgnesToulet
    AgnesToulet committed Nov 10, 2020
    Copy the full SHA
    69f5f88 View commit details
    Browse the repository at this point in the history

  11. fix dashboard/folder update with hidden user

    @AgnesToulet
    AgnesToulet committed Nov 10, 2020
    Copy the full SHA
    5c05906 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2020

  1. add team tests

    @AgnesToulet
    AgnesToulet committed Nov 13, 2020
    Copy the full SHA
    c6ae7a3 View commit details
    Browse the repository at this point in the history

  2. add dashboard and folder permissions tests

    @AgnesToulet
    AgnesToulet committed Nov 13, 2020
    Copy the full SHA
    271c4c8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into config-hidden-users

    @AgnesToulet
    AgnesToulet committed Nov 13, 2020
    Copy the full SHA
    f134875 View commit details
    Browse the repository at this point in the history

  4. fixes after merge

    @AgnesToulet
    AgnesToulet committed Nov 13, 2020
    Copy the full SHA
    a14aed3 View commit details
    Browse the repository at this point in the history

  5. fix tests

    @AgnesToulet
    AgnesToulet committed Nov 13, 2020
    Copy the full SHA
    478fd94 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2020

  1. Merge branch 'master' into config-hidden-users

    @AgnesToulet
    AgnesToulet committed Nov 17, 2020
    Copy the full SHA
    30f7a70 View commit details
    Browse the repository at this point in the history

  2. API: add test for org users endpoints

    @AgnesToulet
    AgnesToulet committed Nov 17, 2020
    Copy the full SHA
    12e9164 View commit details
    Browse the repository at this point in the history

  3. update hidden users management for dashboard / folder permissions

    @AgnesToulet
    AgnesToulet committed Nov 17, 2020
    Copy the full SHA
    5df868a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into config-hidden-users

    @AgnesToulet
    AgnesToulet committed Nov 17, 2020
    Copy the full SHA
    7da897b View commit details
    Browse the repository at this point in the history

  5. improve dashboard / folder permissions tests

    @AgnesToulet
    AgnesToulet committed Nov 17, 2020
    Copy the full SHA
    4d28116 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into config-hidden-users

    @AgnesToulet
    AgnesToulet committed Nov 17, 2020
    Copy the full SHA
    319b968 View commit details
    Browse the repository at this point in the history

  7. fixes after merge

    @AgnesToulet
    AgnesToulet committed Nov 17, 2020
    Copy the full SHA
    6661337 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2020

  1. Guardian: add hidden acl tests

    @AgnesToulet
    AgnesToulet committed Nov 18, 2020
    Copy the full SHA
    b6d7d44 View commit details
    Browse the repository at this point in the history

  2. API: add team members tests

    @AgnesToulet
    AgnesToulet committed Nov 18, 2020
    Copy the full SHA
    674a514 View commit details
    Browse the repository at this point in the history

  3. fix team sql syntax for postgres

    @AgnesToulet
    AgnesToulet committed Nov 18, 2020
    Copy the full SHA
    868ff29 View commit details
    Browse the repository at this point in the history

  4. api tests update

    @AgnesToulet
    AgnesToulet committed Nov 18, 2020
    Copy the full SHA
    7461502 View commit details
    Browse the repository at this point in the history

  5. fix linter error

    @AgnesToulet
    AgnesToulet committed Nov 18, 2020
    Copy the full SHA
    578647b View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2020

  1. Merge branch 'master' into config-hidden-users 

    * master: (71 commits)
  Security: Fixes minor security issue with alert notification webhooks that allowed GET & DELETE requests grafana#29330
  Chore: Bump storybook to v6 (grafana#28926)
  ReleaseNotes: Updates release notes link in package.json (master) (grafana#29329)
  Docs: Accurately reflecting available variables (grafana#29302)
  Heatmap: Fixes issue introduced by new eventbus (grafana#29322)
  Dashboard Schemas (grafana#28793)
  devenv: Add docker load test which authenticates with API key (grafana#28905)
  Login: Fixes redirect url encoding issues of # %23 being unencoded after login (grafana#29299)
  InfluxDB: update flux library and support boolean label values (grafana#29310)
  Explore/Logs: Update Parsed fields to Detected fields (grafana#28881)
  GraphNG: Init refactorings and fixes (grafana#29275)
  fixing a broken relref link (grafana#29312)
  Drone: Upgrade build pipeline tool (grafana#29308)
  decreasing frontend docs threshold. (grafana#29304)
  Docker: update docker root group docs and docker image (grafana#29222)
  WebhookNotifier: Convert tests away from goconvey (grafana#29291)
  Annotations: fixing so when changing annotations query links submenu will be updated. (grafana#28990)
  [graph-ng] add temporal DataFrame alignment/outerJoin & move null-asZero pass inside (grafana#29250)
  Dashboard: Fixes kiosk state after being redirected to login page and back (grafana#29273)
  make it possible to hide change password link in profile menu (grafana#29246)
  ...
    @xlson
    xlson committed Nov 24, 2020
    Copy the full SHA
    e94c168 View commit details
    Browse the repository at this point in the history

  2. fix tests errors after merge

    @AgnesToulet
    AgnesToulet committed Nov 24, 2020
    Copy the full SHA
    9e91d73 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into config-hidden-users 

    * master:
  Guardian: Rewrite tests from goconvey (grafana#29292)
  Docs: Fix editor role and alert notification channel description (grafana#29301)
  Docs: Improve custom Docker image instructions (grafana#29263)
    @xlson
    xlson committed Nov 24, 2020
    Copy the full SHA
    0f05c1a View commit details
    Browse the repository at this point in the history