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

[pull] master from pycontw:master #75

Merged
merged 36 commits into from
Mar 26, 2024
Merged

[pull] master from pycontw:master #75

merged 36 commits into from
Mar 26, 2024

Commits on Sep 7, 2023

  1. feat(category-filter): add category filter for proposal review table

    @iknowright
    iknowright committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    bad1dec View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. fix(category-filter): add query string for both ordering and category… 

    … work at the same time
    @iknowright
    iknowright committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    daa9f1b View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. feat: update PyConTW 2023 to 2024(BackEnd) 

    feat: update PyConTW 2023 to 2024(BackEnd)
    @SivanYeh
    SivanYeh committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    9a0e16f View commit details
    Browse the repository at this point in the history

  2. Update base.html from 2023 to 2024 

    Co-authored-by: Wei-Hsiang (Matt) Wang <[email protected]>
    @SivanYeh @mattwang44
    SivanYeh and mattwang44 committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    0fa8f3b View commit details
    Browse the repository at this point in the history

  3. Update src/templates/pycontw-2024/contents/_base.html 

    Co-authored-by: Wei-Hsiang (Matt) Wang <[email protected]>
    @SivanYeh @mattwang44
    SivanYeh and mattwang44 committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    9189009 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge pull request #1145 from pycontw/ben/category_filter 

    [Feat] add category filter on review page
    @josix
    josix committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    c520012 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. fix(migration): add migration scripts

    @mattwang44
    mattwang44 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    26d97c3 View commit details
    Browse the repository at this point in the history

  2. fix(assest): fix logo path

    @mattwang44
    mattwang44 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    731cb60 View commit details
    Browse the repository at this point in the history

  3. fix(docker): update uwsgi mount path

    @mattwang44
    mattwang44 committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    3deb4db View commit details
    Browse the repository at this point in the history

  4. fix: dockerfile 

    fix node_modules path for production dockerfile
    @iknowright
    iknowright committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    913fef7 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. Merge pull request #1157 from pycontw/fix_node_not_found

    @josix
    josix committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    8da7a3a View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2024

  1. Merge branch 'master' into 2024-migrate

    @SivanYeh
    SivanYeh committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    d6e616b View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. Merge pull request #1155 from pycontw/2024-migrate 

    feat: update PyConTW 2023 to 2024(BackEnd)
    @SivanYeh
    SivanYeh committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    d3d5005 View commit details
    Browse the repository at this point in the history

  2. feat: update code-of-conduct 2024 version

    @rockleona
    rockleona committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    b920937 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. adjust_conference_date_to_2024 

    update date in 2023 to 2024
    @SivanYeh
    SivanYeh committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    b674918 View commit details
    Browse the repository at this point in the history

  2. Update code-of-conduct.html 

    Differences compare to the provided doc
    @SivanYeh
    SivanYeh committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    a1766ad View commit details
    Browse the repository at this point in the history

  3. update en-coc effective date 

    2023->2024/02/20
    @SivanYeh
    SivanYeh committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    5b265fa View commit details
    Browse the repository at this point in the history

  4. Apply suggestions from code review 

    Co-authored-by: Sivan <[email protected]>
    @rockleona @SivanYeh
    rockleona and SivanYeh committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    267c525 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1161 from rockleona/feat/coc-update 

    feat: update code-of-conduct 2024 version
    @SivanYeh
    SivanYeh committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    d9b684b View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1155 from pycontw/2024-migrate 

    feat: update PyConTW 2023 to 2024(BackEnd)
    @SivanYeh @iknowright
    SivanYeh authored and iknowright committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    5fca928 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. adjustment_from_staging_2024-migrate

    @SivanYeh
    SivanYeh committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    6b90e35 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. Update django.po

    @SivanYeh
    SivanYeh committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    a280a4f View commit details
    Browse the repository at this point in the history

  2. fix typo

    @SivanYeh
    SivanYeh committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    d09ca24 View commit details
    Browse the repository at this point in the history

  3. adjust allowed_host

    @SivanYeh
    SivanYeh committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    b285d42 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into ben/fix-svg-no-show

    @josix
    josix committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    091501a View commit details
    Browse the repository at this point in the history

  5. apply makemigrations and makemessages 

    auto result after two cmd:
$python manage.py makemigrations

$python manage.py makemessages -l en_US -l zh_Hant
    @SivanYeh
    SivanYeh committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    9961b6f View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Merge pull request #1160 from pycontw/ben/fix-svg-no-show 

    fix(Dockerfile): Add mime-support apt package at dockerfile to resolve svg not showing
    @SivanYeh
    SivanYeh committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    8331a9b View commit details
    Browse the repository at this point in the history

  2. feat: add procedure image in CoC

    @rockleona
    rockleona committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    fddc160 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1165 from rockleona/feat/coc-update 

    feat: add procedure image in CoC
    @SivanYeh
    SivanYeh committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    4a2c1db View commit details
    Browse the repository at this point in the history

  4. switch back .python-version to 3.6.8

    @SivanYeh
    SivanYeh committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    5203935 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1164 from pycontw/check_master 

    fix-2024-migrate-error
    @SivanYeh
    SivanYeh committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    a3fa21b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'adjust_conference_date_to_2024'

    @SivanYeh
    SivanYeh committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    d956956 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. remove prefer_time 

    remove prefer_time from src/core/choices.py and src/core/models.py then executed the following:
$ python manage.py makemigrations
$python manage.py makemessages -l en_US -l zh_Hant
    @SivanYeh
    SivanYeh committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    28e454a View commit details
    Browse the repository at this point in the history

  2. remove prefer_time in tests

    @SivanYeh
    SivanYeh committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    dfabd13 View commit details
    Browse the repository at this point in the history

  3. remove prefer_time in messages

    @SivanYeh
    SivanYeh committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    7726ba7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1166 from pycontw/feat-delete-cfp-preferred-date 

    remove prefer_time for cfp
    @SivanYeh
    SivanYeh committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    f44e7ea View commit details
    Browse the repository at this point in the history