heinzel
cb3c9a0e98
Merge pull request 'Merge Makefile into production for CI/CD stuff' ( #58 ) from master into production
...
Reviewed-on: #58
2023-02-17 14:09:15 +01:00
heinzel
082c9f4b74
Added deploy rule to Makefile (used as deploy pipeline for CI/CD)
buildbot/django-dav-events--test Build done.
2023-02-17 13:17:17 +01:00
heinzel
e91941dcff
Added Makefile for our buildbot CI/CD
2023-02-17 08:56:20 +01:00
heinzel
c9572d631f
Merge pull request 'update production branch' ( #57 ) from master into production
...
Reviewed-on: #57
2023-02-15 19:48:19 +01:00
heinzel
b95b33f995
Fixed a oneclickaction test
2023-02-15 19:39:09 +01:00
heinzel
44a570a8bb
Teilnehmer und Tourenleiter in den home_tiles templates gegendert
2023-02-15 18:47:34 +01:00
heinzel
54ae937e59
Updated event to publish web email template
2023-02-15 18:26:00 +01:00
heinzel
02bea140d7
Replaced deprecated NullBooleanField with BooleanField
2023-02-15 18:13:53 +01:00
heinzel
98a6fc3ce7
try to make pylint happy
2022-06-08 00:08:09 +02:00
heinzel
8610e2a557
BIG UPD: migrate to python 3.10 and django 3.2
2022-06-07 16:07:08 +02:00
heinzel
6e67e2767b
Merge pull request 'merge new master stuff into production' ( #47 ) from master into production
...
Reviewed-on: #47
2021-01-27 12:13:21 +01:00
heinzel
edd4050935
Merge pull request 'FIX previous change' ( #46 ) from heinzel into master
...
Reviewed-on: #46
2021-01-27 12:11:10 +01:00
heinzel
519de281df
FIX previous change
2021-01-27 11:59:51 +01:00
heinzel
b603f852a3
Merge pull request 'Update production branch to master' ( #45 ) from master into production
...
Reviewed-on: #45
2021-01-27 11:55:47 +01:00
heinzel
8cd0f8f023
Merge pull request 'UPD: dav_registration: display canceled state of events' ( #44 ) from heinzel into master
...
Reviewed-on: #44
2021-01-27 11:38:54 +01:00
heinzel
2b8c60a675
UPD: dav_registration: display canceled state of events
2021-01-27 11:11:03 +01:00
heinzel
cb364e5745
Merge pull request 'Production environment is updated.' ( #43 ) from master into production
...
Reviewed-on: #43
2021-01-07 14:42:48 +01:00
heinzel
72390e325b
Merge branch 'production' into master
2021-01-07 14:34:35 +01:00
heinzel
4b772e743b
Merge pull request 'heinzel' ( #42 ) from heinzel into master
...
Reviewed-on: #42
2021-01-07 14:02:32 +01:00
heinzel
4890c2430f
FIX #3a538e45bf
2021-01-07 13:48:31 +01:00
heinzel
3a538e45bf
FIX #e585f6057b
2021-01-07 13:40:55 +01:00
heinzel
c6943971b6
Merge pull request 'UPD: display status flag canceled or realized also if cleared is set' ( #41 ) from heinzel into master
...
Reviewed-on: #41
2021-01-07 13:36:17 +01:00
heinzel
e585f6057b
UPD: display status flag canceled or realized also if cleared is set
2021-01-07 13:28:41 +01:00
heinzel
654fb6d220
FIX #269d59f460
2021-01-07 13:17:03 +01:00
heinzel
69f4db1774
Merge pull request 'FIX #35 and #36 ' ( #40 ) from heinzel_canceld into master
...
Reviewed-on: #40
2021-01-07 13:06:53 +01:00
heinzel
269d59f460
FIX #35 and #36 : add new event stati canceled and realized
2021-01-07 12:52:21 +01:00
heinzel
642971e469
UPD: improved sorting of event status in event lists
2021-01-07 12:50:36 +01:00
heinzel
b76fbe71c7
ADD: more colors for bootstrap labels and buttons
2021-01-07 12:49:12 +01:00
heinzel
2bd994109e
Merge pull request 'Merge with master' ( #39 ) from master into production
...
Reviewed-on: #39
2020-12-22 19:45:11 +01:00
heinzel
da83b94c9f
UPD: updated real timestamp for merging support for reduced fee into
...
production
2020-12-22 19:41:38 +01:00
heinzel
f15d4f7a8e
Merge pull request 'Enforce stronger Passwords' ( #38 ) from heinzel_dav_auth into master
...
Reviewed-on: #38
2020-12-22 18:48:46 +01:00
heinzel
c3f72a50ff
UPD: enable stronger password validation and eventually warning message on login
2020-12-22 18:42:06 +01:00
heinzel
47dd196c6a
UPD: auth: added a custom wordlist password validator
2020-12-22 17:04:40 +01:00
heinzel
0762876ec5
UPD: auth: added score based password validator
2020-12-22 15:53:32 +01:00
heinzel
5f296ff1c0
UPD: dav_auth: refactor the ResetPasswordView for better name
2020-12-22 11:51:59 +01:00
heinzel
f3509d3a61
Merge pull request 'FIX 6d5c77ee71fd91669840a41b13ae30378279994d' ( #34 ) from heinzel into master
...
Reviewed-on: #34
2020-12-18 16:50:55 +01:00
heinzel
70c82f9b93
FIX 6d5c77ee71
2020-12-18 16:43:23 +01:00
heinzel
b89c4d26b3
Merge pull request 'FIX #4 ' ( #33 ) from heinzel into master
...
Reviewed-on: #33
2020-12-18 15:40:11 +01:00
heinzel
1d248f0519
Merge branch 'master' into heinzel
2020-12-18 15:39:50 +01:00
heinzel
50c44b4e54
Merge pull request 'FIX #15 and more' ( #32 ) from heinzel into master
...
Reviewed-on: #32
2020-12-18 15:38:24 +01:00
heinzel
6d5c77ee71
FIX #4
2020-12-18 15:37:12 +01:00
heinzel
1f674125ec
UPD: dav_events: enable save as draft
2020-12-18 14:30:17 +01:00
heinzel
cbc3df97c1
Reduced participant fee: added toggle buttons within office views and
...
improved html
2020-12-18 11:48:10 +01:00
heinzel
dab2e5cb76
FIX: some participant values were removed if participant was edited
...
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.
2020-12-18 11:43:35 +01:00
heinzel
b44f6df32e
Registrations: view to uncheck apply_reduced_fee while accepting
2020-12-16 17:28:40 +01:00
heinzel
d3d63097db
FIX f016f4af41 (python2 encoding error)
2020-12-16 10:32:12 +01:00
heinzel
a7fafbe73f
UPD: Participants: added help texts to the new fields
2020-12-16 10:24:17 +01:00
heinzel
f016f4af41
UPD: Registration Form: more information about not DAV member
2020-12-15 11:56:36 +01:00
heinzel
71dae2672d
Merge pull request 'support for reduced fee' ( #31 ) from heinzel into master
...
Reviewed-on: #31
2020-12-09 18:13:29 +01:00
heinzel
50d7ef953e
satisfy tests
2020-12-09 17:59:36 +01:00
heinzel