Draft: upstream changes by FSI Inf

main changes:

• pfandcha (captcha with pfand-location images)

marked this merge request as draft

By simeon on 2024-04-03T13:28:41

added 69 commits

• 8ba2d926...bbc848a5 - 3 commits from branch i4:master
• bbc848a5...55c12905 - 56 earlier commits
• 9f98539c - Add "pfandcha" captcha
• bc89ad8b - pfandcha: Fix css with bootstrap
• 85dfcc73 - pfandcha: Timeout pfandcha after inacitivity
• ba9570f2 - Make pfandcha configurable
• eefc17a9 - pfandcha: Do not ask user twice for pfandcha on same day
• e37c8b67 - settings: Show comment and creation date for rfid token
• 86d4f2cf - settings: Submit settings on enter
• b453f7fd - admin/UserIdentifier: Show comment and creation date
• e0c66b00 - settings: Show rfid comment in notification mail
• fa35803d - pfandcha: Add new bad picture

Compare with previous version

By simeon on 2024-04-03T13:39:07

This merge request can be ignored, we will split the commits into separate merge requests.

By Tom Kunze on 2024-04-08T16:56:11

added 61 commits

• 1afe282c - 1 commit from branch i4:master
• 1afe282c...1955c1a8 - 50 earlier commits
• 1f0ca7df - Add "pfandcha" captcha
• 139728d9 - pfandcha: Fix css with bootstrap
• bad07e08 - pfandcha: Timeout pfandcha after inacitivity
• 9e202157 - Make pfandcha configurable
• 98eb35ac - pfandcha: Do not ask user twice for pfandcha on same day
• 00a497c2 - settings: Show comment and creation date for rfid token
• 3a5651f4 - settings: Submit settings on enter
• 031fd857 - admin/UserIdentifier: Show comment and creation date
• 7597ab12 - settings: Show rfid comment in notification mail
• 03fb0b69 - pfandcha: Add new bad picture

Compare with previous version

By Tom Kunze on 2024-05-05T00:04:43

added 3 commits

• 21aa8517 - feat(Pfandcha)!: Rework Pfandcha-Triggering-System and implement Pfandcha-reprive product
• 445b577b - fix(pfandcha): performance improvements for DB queries and renaming of variables
• f0b67489 - chore(pfandcha): Add pfandcha reprive Documentation

Compare with previous version

By herkulessi on 2024-05-24T18:11:57

added 1 commit

• 857fc485 - feat(Pfandcha)!: Rework Pfandcha-Triggering-System and implement Pfandcha-reprive product

Compare with previous version

By Tom Kunze on 2024-05-24T18:17:19