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

Member roles #642

Merged
merged 14 commits into from
Mar 30, 2020
Merged

Member roles #642

merged 14 commits into from
Mar 30, 2020

Commits on Feb 27, 2020

  1. [WIP] merged role support from other branch

    @grolu
    grolu committed Feb 27, 2020
    Configuration menu
    Copy the full SHA
    d095d53 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Merge branch 'master' into member_roles 

    # Conflicts:
#	frontend/src/components/ProjectServiceAccountRow.vue
#	frontend/src/components/ProjectUserRow.vue
#	frontend/src/pages/Members.vue
#	frontend/src/utils/index.js
    @grolu
    grolu committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    48697cc View commit details
    Browse the repository at this point in the history

  2. fixed lint errors

    @grolu
    grolu committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    0c9584b View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. update member roles 

    adapted tests
    @grolu
    grolu committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    8984043 View commit details
    Browse the repository at this point in the history

  2. no message

    @grolu
    grolu committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    7cac514 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Merge branch 'master' into member_roles 

    # Conflicts:
#	backend/test/support/nocks/k8s.js
    @grolu
    grolu committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    877f01a View commit details
    Browse the repository at this point in the history

  2. fixed typo

    @grolu
    grolu committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    913a7d9 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. changes part #1

    @grolu
    grolu committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    15996e3 View commit details
    Browse the repository at this point in the history

  2. changes part #2

    @grolu
    grolu committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    21d79cd View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. changed colors 

    current user handling
refresh rules after editing own member roles
    @grolu
    grolu committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    9f9ca4a View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. fix lint errors

    @grolu
    grolu committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    6848200 View commit details
    Browse the repository at this point in the history

  2. Update backend/lib/utils/index.js 

    Co-Authored-By: Holger Koser <holger.koser@sap.com>
    @grolu @holgerkoser
    grolu and holgerkoser committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    94c4cf2 View commit details
    Browse the repository at this point in the history

  3. Update backend/lib/utils/index.js 

    Co-Authored-By: Holger Koser <holger.koser@sap.com>
    @grolu @holgerkoser
    grolu and holgerkoser committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    2b16cd5 View commit details
    Browse the repository at this point in the history

  4. Changes as discussed

    @grolu
    grolu committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    f6c9dbc View commit details
    Browse the repository at this point in the history