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.

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

merge: dev to prod #102

Merged
merged 15 commits into from
Oct 13, 2024
Merged

merge: dev to prod #102

merged 15 commits into from
Oct 13, 2024

Commits on Oct 6, 2024

  1. fix:adjust value of options (#86)

    修正以下:
    
    1.刪除高中以下學歷選項
    2.刪除交友相關字眼,並新增選項
    3.調整揪團教育階段敘述
    4.調整學歷敘述
    5.調整性別敘述
    vincentxuu authored Oct 6, 2024
    Configuration menu
    Copy the full SHA
    385e9fc View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Fix/adjust options (#89)

    * fix:adjust value of options
    
    * fix:adjust value of rule
    vincentxuu authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    8ea0691 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    afb7e53 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7e7394a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e25ee2f View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Configuration menu
    Copy the full SHA
    c420a58 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Fix/search group (#95)

    * fix: search group parameters
    
    * fix: create group login redirect
    
    * remove: unused file
    JohnsonMao authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    dcff94f View commit details
    Browse the repository at this point in the history
  2. Fix/privacy policy content (#94)

    * update: update privacy policy and switch from component to inline HTML
    
    * update: remove unused styles and mui components
    
    * update: update privacy policy page styles
    ruby10127130 authored Oct 10, 2024
    Configuration menu
    Copy the full SHA
    5829469 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Configuration menu
    Copy the full SHA
    8e9ec72 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. Feature/empty group list (#96)

    * refactor: group list page
    
    * refactor: change empty cover image
    
    * feat: empty group list ui
    
    * feat: error group list page
    JohnsonMao authored Oct 12, 2024
    Configuration menu
    Copy the full SHA
    4d6b00a View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2024

  1. Configuration menu
    Copy the full SHA
    ee16b24 View commit details
    Browse the repository at this point in the history
  2. Refactor "Contact Group Owner" functionality and add login popup (#99)

    * refactor: contact popup
    
    * refactor: login flow
    JohnsonMao authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    2626c6d View commit details
    Browse the repository at this point in the history
  3. Update/term pages (#100)

    * feat: add styles for terms
    
    * remove: remove unused component AboutUs
    
    * feat: refactor component in terms and add pages
    
    * refactor: component in terms
    
    * add: terms/ipr
    
    * add: terms/service
    
    * update: update routes of /privacypolicy
    
    * update: update sitemap
    
    * feat: add terms links on footer
    ruby10127130 authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    047158f View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'upstream/prod' into dev

    # Conflicts:
    #	components/Group/Form/useGroupForm.jsx
    #	components/Group/detail/Contact/index.jsx
    #	pages/login/index.jsx
    #	pages/login/popup/index.jsx
    #	utils/openLoginWindow.js
    JohnsonMao committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    5f6114b View commit details
    Browse the repository at this point in the history
  5. Merge pull request #101 from JohnsonMao/dev

    merge: resolve merge conflicts
    JohnsonMao authored Oct 13, 2024
    Configuration menu
    Copy the full SHA
    218b596 View commit details
    Browse the repository at this point in the history