Merge with master #39

Merged

heinzel merged 61 commits from master into production 2020-12-22 19:45:12 +01:00

Conversation 0 Commits 61 Files Changed 70 +2529 -270

heinzel commented 2020-12-22 19:44:59 +01:00

Owner

Copy Link

No description provided.

heinzel added 61 commits 2020-12-22 19:45:00 +01:00

Added migration, created after update 6780bc5635

Merge pull request 'Added migration, created after update' (#16) from heinzel into master ... 6ddef0c736

Reviewed-on: #16

First things to implement a event change log 9addc237bd

Show event change log on event detail page 10ea6affaf

Satisfy python2 tests 09bfbeedc4

Satisfied screenshot tests 96d6dc72fb

Create change log entry on status updates 5237d81551

Close #13 ... 9945bb5880

dav_events/Anmeldungen: Mitgliedsmummer wird nun im Info-Tooltip
angezeigt.

Merge pull request 'Close #13' (#19) from heinzel into master ... e68240eb99

Reviewed-on: #19

Close #12 and #17 ... 0819b9a38a

- Added Help-Texts (Mouse-Over-Questionmarks) to the
  Event-Registraions-View.
- Answered registrations will be shown but muted.

Merge pull request 'Close #12 and #17' (#20) from heinzel into master ... 4a92b3d73a

Reviewed-on: #20

More Information on a failing test. ... e44cff343f

dav_events.tests: sometimes an OneclickActionTest failes without
providing enough information.

Fix the previous change 28a35d98d2

Merge pull request 'dav_events.tests: more info on a sometimes failing OneClickAction test' (#21) from heinzel into master ... fd30652a5b

Reviewed-on: #21

Fix #9 Registrations: Add support for non members 63026e429b

Merge branch 'master' into heinzel a36cb5a336

Merge pull request 'Fix #9 - Registrations: Add support for non members' (#22) from heinzel into master ... 48f39956f3

Reviewed-on: #22

Fix 63026e429b 3a3882080b

Merge pull request 'Fix 63026e429b5627643c5335b42f5326b059fdec30' (#23) from quickfix into master ... 93ad2aea75

Reviewed-on: #23

Fix 63026e429b e3212280b8

Merge pull request 'Fix 63026e429b5627643c5335b42f5326b059fdec30' (#24) from heinzel into master ... 9823efc7ac

Reviewed-on: #24

Merge branch 'master' into branch 'changelog' 05a4f21559

Merged migrations and minor improvements 37519d59e5

Merge pull request 'Add a simple changelog to the events' (#26) from changelog into master ... 77d18a145a

Reviewed-on: #26

Fix missing bootstrap context label on flags changelog entries fbcb8e5f4e

Merge pull request 'Fix missing bootstrap context label on flags changelog entries' (#27) from heinzel into master ... f2f0df3ab3

Reviewed-on: #27

Add a kind of trashbin for registrations and participants 94595f4785

Added restore from trash feature 7624c3d69b

Merge pull request 'Add trashbin for registrations and participants' (#28) from heinzel into master ... 0ab60cf473

Reviewed-on: #28

Correct db migration for trashbin feature e501ada83f

Fix migrations for trashbin feature d60f1d9993

Merge pull request 'fixed trashbin stuff' (#29) from heinzel into master ... 56df5c15bc

Reviewed-on: #29

Improved display of trashed registrations 3dc44187fa

Better icon for untrashing 45f50e8601

Merge pull request 'heinzel' (#30) from heinzel into master ... dc9b0dc640

Reviewed-on: #30

Registrations: decollapse events by clicking on the title 998b4cd5cf

registration: add support for year of birth ... 0ff559d548

this is only in dav_registration for now. dav_events is following.

satisfy tests c3bbaa7200

participants: added support for year of birth 3f3bb2512b

Support for reduced registration fee baabbba7fb

satisfy tests 50d7ef953e

Merge pull request 'support for reduced fee' (#31) from heinzel into master ... 71dae2672d

Reviewed-on: #31

UPD: Registration Form: more information about not DAV member f016f4af41

UPD: Participants: added help texts to the new fields a7fafbe73f

FIX f016f4af41 (python2 encoding error) d3d63097db

Registrations: view to uncheck apply_reduced_fee while accepting b44f6df32e

FIX: some participant values were removed if participant was edited ... dab2e5cb76

Some participant fields were not included in the form template and
thus every time the form was saved those values were emptied.
We exclude those fileds now within the form class.

Reduced participant fee: added toggle buttons within office views and ... cbc3df97c1

improved html

UPD: dav_events: enable save as draft 1f674125ec

FIX #4 6d5c77ee71

Merge pull request 'FIX #15 and more' (#32) from heinzel into master ... 50c44b4e54

Reviewed-on: #32

Merge branch 'master' into heinzel 1d248f0519

Merge pull request 'FIX #4' (#33) from heinzel into master ... b89c4d26b3

Reviewed-on: #33

FIX 6d5c77ee71 70c82f9b93

Merge pull request 'FIX 6d5c77ee71fd91669840a41b13ae30378279994d' (#34) from heinzel into master ... f3509d3a61

Reviewed-on: #34

UPD: dav_auth: refactor the ResetPasswordView for better name 5f296ff1c0

UPD: auth: added score based password validator 0762876ec5

UPD: auth: added a custom wordlist password validator 47dd196c6a

UPD: enable stronger password validation and eventually warning message on login c3f72a50ff

Merge pull request 'Enforce stronger Passwords' (#38) from heinzel_dav_auth into master ... f15d4f7a8e

Reviewed-on: #38

UPD: updated real timestamp for merging support for reduced fee into ... da83b94c9f

production

heinzel merged commit 2bd994109e into production 2020-12-22 19:45:12 +01:00

heinzel referenced this issue from a commit 2020-12-22 19:45:12 +01:00

Merge pull request 'Merge with master' (#39) from master into production

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

Anmeldung

Zusammenhang mit der Teilnehmeranmeldung

Design

Zusammenhang mit dem Seitendesign

Veröffentlichung

Zusammenhang mit dem Veröffentlichungsworkflow

Workflow

Zusammenhang mit dem gesamten Veranstaltungsworkflow

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No Label

Milestone

No items

No Milestone

Assignees

Clear assignees

erik heinzel jannik

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: DAV-KA/django-dav-events#39