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

Sync upstream with no conflict #217

Closed
wants to merge 38 commits into from

Commits on Oct 2, 2024

  1. Split up CfP field config table

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    eeb7e16 View commit details
    Browse the repository at this point in the history
  2. Bump webpack in /src/pretalx/frontend/schedule-editor

    Bumps [webpack](https://github.com/webpack/webpack) from 5.88.2 to 5.94.0.
    - [Release notes](https://github.com/webpack/webpack/releases)
    - [Commits](webpack/webpack@v5.88.2...v5.94.0)
    
    ---
    updated-dependencies:
    - dependency-name: webpack
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    931bfa4 View commit details
    Browse the repository at this point in the history
  3. Remove unused templates

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    712de2f View commit details
    Browse the repository at this point in the history
  4. Fix bad translation

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    5a55cd0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4fe9d15 View commit details
    Browse the repository at this point in the history
  6. Remove pointless info boxes

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    74a3a87 View commit details
    Browse the repository at this point in the history
  7. Reorder email menu

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    a0accf2 View commit details
    Browse the repository at this point in the history
  8. [wip] format html

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    334a6c7 View commit details
    Browse the repository at this point in the history
  9. Update translation files

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    834dcf4 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    79b8af0 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    70a6ba7 View commit details
    Browse the repository at this point in the history
  12. Fix unconfirmed count in dashboard tile

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    5bfe2ab View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    2a00fc3 View commit details
    Browse the repository at this point in the history
  14. Make review permission issues clearer

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    6ccc88a View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    e359aec View commit details
    Browse the repository at this point in the history
  16. Fix non-ascii schedule files some more

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    db88a4e View commit details
    Browse the repository at this point in the history
  17. Retry celery connection on startup

    helps with race conditions
    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    41d2edb View commit details
    Browse the repository at this point in the history
  18. Make sure review phases can't overlap

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    023330d View commit details
    Browse the repository at this point in the history
  19. Fix breaking tests

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    f07e3cc View commit details
    Browse the repository at this point in the history
  20. Fix HTML export hint

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    1ca7c1f View commit details
    Browse the repository at this point in the history
  21. Link to question reminder template on form page

    closes #1752
    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    ead205b View commit details
    Browse the repository at this point in the history
  22. Explain how to use the custom domain setting

    ref #1339
    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    5f5d282 View commit details
    Browse the repository at this point in the history
  23. Update translations

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    8630427 View commit details
    Browse the repository at this point in the history
  24. Remove useless use of method_decorator

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    0ef71e3 View commit details
    Browse the repository at this point in the history
  25. HTML format

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    f1ded6a View commit details
    Browse the repository at this point in the history
  26. Use postgres connection pools

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c2d7ca0 View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    10017c1 View commit details
    Browse the repository at this point in the history
  28. Fix migrate command output filter

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    e3aeeba View commit details
    Browse the repository at this point in the history
  29. Simplify feedback logic

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    1ab05cb View commit details
    Browse the repository at this point in the history
  30. Minor performance improvements

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    409e8ad View commit details
    Browse the repository at this point in the history
  31. Bump rollup in /src/pretalx/frontend/schedule-editor

    Bumps [rollup](https://github.com/rollup/rollup) from 3.29.4 to 3.29.5.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v3.29.4...v3.29.5)
    
    ---
    updated-dependencies:
    - dependency-name: rollup
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    dependabot[bot] authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    b78ccaa View commit details
    Browse the repository at this point in the history
  32. Improve speaker page performance

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    8fdb889 View commit details
    Browse the repository at this point in the history
  33. Sadness

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    6691b11 View commit details
    Browse the repository at this point in the history
  34. 🗺 Update translations (French)

    Currently translated at 99.7% (1550 of 1554 strings)
    
    🗺 Update translations (French)
    
    Currently translated at 99.3% (1544 of 1554 strings)
    
    🗺 Update translations (French)
    
    Currently translated at 98.7% (1535 of 1554 strings)
    
    Co-authored-by: Harrissou Sant-anna <[email protected]>
    Co-authored-by: Weblate <[email protected]>
    Translate-URL: http://translate.pretalx.com/projects/pretalx/pretalx/fr/
    Translation: pretalx/pretalx
    2 people authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    94ff6f8 View commit details
    Browse the repository at this point in the history
  35. Fix bug in cfp editor

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    1e5add4 View commit details
    Browse the repository at this point in the history
  36. Configuration menu
    Copy the full SHA
    7dcc74c View commit details
    Browse the repository at this point in the history
  37. Fix HTML export of non-ascii urls

    closes #1828
    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    6180f38 View commit details
    Browse the repository at this point in the history
  38. Fix hot new bug in feedback page

    rixx authored and lcduong committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    3be9cee View commit details
    Browse the repository at this point in the history