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

add Oidc preferred username #3629

Merged
merged 42 commits into from
May 25, 2021
Merged

add Oidc preferred username #3629

merged 42 commits into from
May 25, 2021

Commits on Apr 3, 2021

  1. table Users add column PreferredUsername

    @vdiskg
    vdiskg committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    55e471e View commit details
    Browse the repository at this point in the history

  2. Users add PreferredUsername sql

    @vdiskg
    vdiskg committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    e97c949 View commit details
    Browse the repository at this point in the history

  3. Users add PreferredUsername page

    @vdiskg
    vdiskg committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    48ef240 View commit details
    Browse the repository at this point in the history

  4. Users add PreferredUsername app page

    @vdiskg
    vdiskg committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    a9d4510 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2021

  1. update user's info after login

    @vdiskg
    vdiskg committed Apr 4, 2021
    Configuration menu
    Copy the full SHA
    1561c5e View commit details
    Browse the repository at this point in the history

  2. sql

    @vdiskg
    vdiskg committed Apr 4, 2021
    Configuration menu
    Copy the full SHA
    6487608 View commit details
    Browse the repository at this point in the history

  3. fix unit test

    @vdiskg
    vdiskg committed Apr 4, 2021
    Configuration menu
    Copy the full SHA
    0f7f5e9 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. change the page

    @vdiskg
    vdiskg committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    20f8f39 View commit details
    Browse the repository at this point in the history

  2. fix the unit test timeout

    @vdiskg
    vdiskg committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    723e068 View commit details
    Browse the repository at this point in the history

  3. commit page add preferred username

    @vdiskg
    vdiskg committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    db6afc9 View commit details
    Browse the repository at this point in the history

  4. namespace page add preferred username

    @vdiskg
    vdiskg committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    1d4f575 View commit details
    Browse the repository at this point in the history

  5. release history page add preferred username

    @vdiskg
    vdiskg committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    7850814 View commit details
    Browse the repository at this point in the history

  6. preferred username sql

    @vdiskg
    vdiskg committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    4f477e7 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2021

  1. move logic to service

    @vdiskg
    vdiskg committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    106d1f8 View commit details
    Browse the repository at this point in the history

  2. fix unit test time out

    @vdiskg
    vdiskg committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    abe329b View commit details
    Browse the repository at this point in the history

  3. namespaceService unit test

    @vdiskg
    vdiskg committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    4d074e8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into oidc-preferred-username

    @vdiskg
    vdiskg authored Apr 10, 2021
    Configuration menu
    Copy the full SHA
    21d928a View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2021

  1. enricher

    @vdiskg
    vdiskg committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    5fd63e2 View commit details
    Browse the repository at this point in the history

  2. name space enrich change

    @vdiskg
    vdiskg committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    148289e View commit details
    Browse the repository at this point in the history

  3. CommitService enrich change

    @vdiskg
    vdiskg committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    a61e796 View commit details
    Browse the repository at this point in the history

  4. revert NamespaceBOUtils

    @vdiskg
    vdiskg committed Apr 17, 2021
    Configuration menu
    Copy the full SHA
    78da8f1 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2021

  1. namespace branch page

    @vdiskg
    vdiskg committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    5358d34 View commit details
    Browse the repository at this point in the history

  2. enricher adjust

    @vdiskg
    vdiskg committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    e4de699 View commit details
    Browse the repository at this point in the history

  3. unit test

    @vdiskg
    vdiskg committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    98a3e4f View commit details
    Browse the repository at this point in the history

  4. user manage page

    @vdiskg
    vdiskg committed Apr 22, 2021
    Configuration menu
    Copy the full SHA
    c96dca4 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. nav page user info fix

    @vdiskg
    vdiskg committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    f88773b View commit details
    Browse the repository at this point in the history

Commits on May 8, 2021

  1. temp

    @vdiskg
    vdiskg committed May 8, 2021
    Configuration menu
    Copy the full SHA
    1e63a3b View commit details
    Browse the repository at this point in the history

Commits on May 9, 2021

  1. preferred username enrich adjust

    @vdiskg
    vdiskg committed May 9, 2021
    Configuration menu
    Copy the full SHA
    21580b3 View commit details
    Browse the repository at this point in the history

  2. UserDisplayName

    @vdiskg
    vdiskg committed May 9, 2021
    Configuration menu
    Copy the full SHA
    f7ae63a View commit details
    Browse the repository at this point in the history

  3. fix unit test

    @vdiskg
    vdiskg committed May 9, 2021
    Configuration menu
    Copy the full SHA
    8e7b163 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'fix-unit-test' into oidc-pre-username-temp

    @vdiskg
    vdiskg committed May 9, 2021
    Configuration menu
    Copy the full SHA
    030ac20 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'apollo/master' into oidc-preferred-user… 

    …name

# Conflicts:
#	apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java
    @vdiskg
    vdiskg committed May 9, 2021
    Configuration menu
    Copy the full SHA
    1b39773 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2021

  1. Merge branch 'master' into oidc-preferred-username

    @nobodyiam
    nobodyiam authored May 15, 2021
    Configuration menu
    Copy the full SHA
    9e67af2 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2021

  1. Update apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/… 

    …service/NamespaceService.java

Co-authored-by: Jason Song <nobodyiam@gmail.com>
    @vdiskg @nobodyiam
    vdiskg and nobodyiam authored May 22, 2021
    Configuration menu
    Copy the full SHA
    223ef17 View commit details
    Browse the repository at this point in the history

  2. cleanup code

    @vdiskg
    vdiskg committed May 22, 2021
    Configuration menu
    Copy the full SHA
    87b0833 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into oidc-preferred-username

    @nobodyiam
    nobodyiam authored May 22, 2021
    Configuration menu
    Copy the full SHA
    44b6a75 View commit details
    Browse the repository at this point in the history

  4. License

    @vdiskg
    vdiskg committed May 22, 2021
    Configuration menu
    Copy the full SHA
    e04ee8e View commit details
    Browse the repository at this point in the history

Commits on May 25, 2021

  1. add License

    @vdiskg
    vdiskg committed May 25, 2021
    Configuration menu
    Copy the full SHA
    cf72a14 View commit details
    Browse the repository at this point in the history

  2. License

    @vdiskg
    vdiskg committed May 25, 2021
    Configuration menu
    Copy the full SHA
    2c58545 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'oidc-pre-temp-2' into oidc-preferred-username

    @vdiskg
    vdiskg committed May 25, 2021
    Configuration menu
    Copy the full SHA
    021da89 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'apollo/master' into oidc-preferred-user… 

    …name
    @vdiskg
    vdiskg committed May 25, 2021
    Configuration menu
    Copy the full SHA
    31c4f79 View commit details
    Browse the repository at this point in the history

  5. add License

    @vdiskg
    vdiskg committed May 25, 2021
    Configuration menu
    Copy the full SHA
    191cdd4 View commit details
    Browse the repository at this point in the history