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 user status filter to admin user management page #16770

Merged
merged 40 commits into from
Oct 12, 2021
Merged

Add user status filter to admin user management page #16770

merged 40 commits into from
Oct 12, 2021

Commits on Aug 22, 2021

  1. Admin can filter user list by status

    @wxiaoguang
    wxiaoguang committed Aug 22, 2021
    Configuration menu
    Copy the full SHA
    d5adeee View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2021

  1. introduce window.config.PageData to pass template data to javascript … 

    …module and small refactor

move legacy window.ActivityTopAuthors to window.config.PageData.ActivityTopAuthors
make HTML structure more IDE-friendly in footer.tmpl and head.tmpl
remove incorrect <style class="list-search-style"></style> in head.tmpl
use log.Error instead of log.Critical in admin user search
    @wxiaoguang
    wxiaoguang committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    0b2604b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    921e3d8 View commit details
    Browse the repository at this point in the history

  3. revert ActivityTopAuthors related changes, maybe a new PR is needed

    @wxiaoguang
    wxiaoguang committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    dbf21d2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'admin-user-list-filter' of github.com:wxiaoguang/gitea … 

    …into admin-user-list-filter
    @wxiaoguang
    wxiaoguang committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    3f2a934 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2021

  1. use LEFT JOIN instead of SubQuery when admin filters users by 2fa. re… 

    …vert non-en locale.
    @wxiaoguang
    wxiaoguang committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    30f7430 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'go-gitea/main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    79a2be0 View commit details
    Browse the repository at this point in the history

  3. use OptionalBool instead of status map

    @wxiaoguang
    wxiaoguang committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    6ec918e View commit details
    Browse the repository at this point in the history

  4. refactor SearchUserOptions.toConds to SearchUserOptions.toSearchQuery… 

    …Base
    @wxiaoguang
    wxiaoguang committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    e133612 View commit details
    Browse the repository at this point in the history

  5. add unit test for user search

    @wxiaoguang
    wxiaoguang committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    86a245a View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2021

  1. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    eba00ca View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2021

  1. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Sep 1, 2021
    Configuration menu
    Copy the full SHA
    5cf8f29 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2021

  1. only allow admin to use filters to search users

    @wxiaoguang
    wxiaoguang committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    3296672 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    21869fa View commit details
    Browse the repository at this point in the history

  3. reformat

    @wxiaoguang
    wxiaoguang committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    f6f06f2 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2021

  1. fix search query: Where and Join

    @wxiaoguang
    wxiaoguang committed Sep 4, 2021
    Configuration menu
    Copy the full SHA
    df32fb4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Sep 4, 2021
    Configuration menu
    Copy the full SHA
    3e9a588 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2021

  1. Merge branch 'main' into admin-user-list-filter 

    # Conflicts:
#	models/user.go
    @wxiaoguang
    wxiaoguang committed Sep 18, 2021
    Configuration menu
    Copy the full SHA
    9ddc61c View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2021

  1. Merge branch 'main' into admin-user-list-filter 

    # Conflicts:
#	models/user.go
    @wxiaoguang
    wxiaoguang committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    db75013 View commit details
    Browse the repository at this point in the history

  2. fix merge conflict

    @wxiaoguang
    wxiaoguang committed Sep 22, 2021
    Configuration menu
    Copy the full SHA
    89b3564 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2021

  1. Merge branch 'main' into admin-user-list-filter 

    # Conflicts:
#	models/user.go
    @wxiaoguang
    wxiaoguang committed Sep 26, 2021
    Configuration menu
    Copy the full SHA
    a660168 View commit details
    Browse the repository at this point in the history

  2. fix merge

    @wxiaoguang
    wxiaoguang committed Sep 26, 2021
    Configuration menu
    Copy the full SHA
    6bf9c07 View commit details
    Browse the repository at this point in the history

  3. fix unit test

    @wxiaoguang
    wxiaoguang committed Sep 26, 2021
    Configuration menu
    Copy the full SHA
    a0a963a View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2021

  1. refactor

    @wxiaoguang
    wxiaoguang committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    2148ce5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    1fe17b3 View commit details
    Browse the repository at this point in the history

  3. fix lint

    @wxiaoguang
    wxiaoguang committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    892613d View commit details
    Browse the repository at this point in the history

  4. fix sort order

    @wxiaoguang
    wxiaoguang committed Sep 27, 2021
    Configuration menu
    Copy the full SHA
    d76cd6d View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2021

  1. fix sql table name quote, clean up

    @wxiaoguang
    wxiaoguang committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    96cc571 View commit details
    Browse the repository at this point in the history

  2. only query fields of user table

    @wxiaoguang
    wxiaoguang committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    1806f1a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    508fded View commit details
    Browse the repository at this point in the history

  4. clean

    @wxiaoguang
    wxiaoguang committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    7f35e9c View commit details
    Browse the repository at this point in the history

  5. fix comment and lint

    @wxiaoguang
    wxiaoguang committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    a2bbf4c View commit details
    Browse the repository at this point in the history

  6. clean and try unit test for mssql

    @wxiaoguang
    wxiaoguang committed Sep 28, 2021
    Configuration menu
    Copy the full SHA
    8b4c540 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2021

  1. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    c8c5263 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2021

  1. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Oct 9, 2021
    Configuration menu
    Copy the full SHA
    65c2378 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2021

  1. Merge branch 'main' into admin-user-list-filter 

    # Conflicts:
#	web_src/js/index.js
    @wxiaoguang
    wxiaoguang committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    fb92420 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into admin-user-list-filter

    @6543
    6543 committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    821685e View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. refactor

    @wxiaoguang
    wxiaoguang committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    c0a5a39 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into admin-user-list-filter

    @wxiaoguang
    wxiaoguang committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    4b90372 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into admin-user-list-filter

    @lunny
    lunny committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    31135e5 View commit details
    Browse the repository at this point in the history