This repository has been archived by the owner on Jun 6, 2024. It is now read-only.
[webportal]resolve duplication and conflict #3006
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ydye
approved these changes
Jun 26, 2019
ydye
added a commit
that referenced
this pull request
Jul 25, 2019
* Authn configuration for login module (#2546) * [Authn] webportal logic to login (#2567) * solve issue * [User manager] User schema and user data's CRUD based on k8s secret (#2677) * [Group manager] group schema and its crud operation based on k8s secret. (#2690) * [Authn] Backend logic of login. (#2625) * [User Manager] API to get a specific user information (#2712) * [RestServer] User&Group API v2 based on new model. (#2722) * [User & Group manager] API Modify (#2810) * Bug Fix. (#2835) * [User & Group Manager] Modify api (#2848) * In user & group create api, change the extension field to optional. (#2853) * [Group & User Manager] Update User Grouplist when deleting a group (#2830) * API modify (#2855) * Fix travis. (#2840) * Api modify (#2868) * Fix issue when deleting namespace. (#2881) * bug fix. * bug fix. * bug fix. * [Restserver] Fix password encrpt issue (#2904) * Update web portal to use user v2 api (#2907) * [Pytlon & https] Support https for pylon. (#2901) * add group, hide user management in aad schema * [webportal] Add token to request /api/v2/user (#2940) * [Rest-server] User Schema Change (#2944) * [webportal]add group (#2945) * add group, hide user management in aad schema(2) * add group, hide user management in aad schema.3 * add group, hide user management in aad schema.4 * [VC map to group] Add grouptype in group.extension and add virtualCluster in user.extension (#2961) * [webportal]group plugin (#2967) * add group, hide user management in aad schema(2) * add group, hide user management in aad schema.3 * add group, hide user management in aad schema.4 * group manege plugin * group manege plugin.2 * group manege plugin.2 * group manege plugin.2 * Update TopBar.jsx * Fix trivas * Fix trivas * Fix trivas * hide group plugin if not admin (#2971) * Fix trivas * Fix trivas * Fix trivas * Fix trivas * conflict solve (#2973) * conflict solve 2 (#2993) * API to get groups's userlist and add or remove an user from a group (#3003) * Add or remove user from a group. * Comments * Comments * Comments * resolve duplication and conflict (#3006) * Comments * Comments * Modify user api url * Modify user api url * Modify group api url * Modify group api url * Modify group api url * Modify group api url * Modify group api url * Modify group api url * Modify group api url * Modify group api url * Modify group api url * Modify group api url * querystring back (#3015) * Modify group api url * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * Token schema compatibility (#3028) * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * hack hack hack * without changing source file when building. * without changing source file when building. * without changing source file when building. * Bug fix * Bug fix * Bug fix * Bug fix * Bug fix * Bug fix * Bug fix * Bug fix * Bug fix * Bug fix * Bug fix * Bug fix * API to create vc and remove vc and do the same operation to group (#3064) * remove unnecessary console. * [Hotfix] Fix AAD group in dedicated vc create/delete (#3143) * add fix * add user * aad fix * update * ut fix * Bug Fix (#3208) * permission fix (#3212) * api fix * api fix * Yuye/api doc update (#3215) * [MS-Graph] [AAD] [Rest-server] Sync user's group from ms-graph api (#3194)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.