Commit Graph

Select branches

Hide Pull Requests

dev-jannik

master

production

stage

#16

#19

#20

#21

#22

#23

#24

#26

#27

#28

#29

#30

#31

#32

#33

#34

#38

#39

#40

#41

#42

#43

#44

#45

#46

#47

#57

#58

#66

#67

#68

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#90

#91

#92

#93

#95

#96

Mono Color

• af2ec6d344 dav_registration: added filter function to select single sport heinzel 2023-02-19 19:23:14 +01:00
• 9abde3ca18 dav_base css: add colorful universal buttons and colored sport specific buttons heinzel 2023-02-19 19:21:23 +01:00
• cb3c9a0e98 Merge pull request 'Merge Makefile into production for CI/CD stuff' (#58) from master into production heinzel 2023-02-17 14:09:15 +01:00
• 082c9f4b74 Added deploy rule to Makefile (used as deploy pipeline for CI/CD) heinzel 2023-02-17 13:17:17 +01:00
• e91941dcff Added Makefile for our buildbot CI/CD heinzel 2023-02-17 08:56:20 +01:00
• c9572d631f Merge pull request 'update production branch' (#57) from master into production heinzel 2023-02-15 19:48:19 +01:00
• b95b33f995 Fixed a oneclickaction test heinzel 2023-02-15 19:39:09 +01:00
• 44a570a8bb Teilnehmer und Tourenleiter in den home_tiles templates gegendert heinzel 2023-02-15 18:47:34 +01:00
• 54ae937e59 Updated event to publish web email template heinzel 2023-02-15 18:26:00 +01:00
• 02bea140d7 Replaced deprecated NullBooleanField with BooleanField heinzel 2023-02-15 18:13:53 +01:00
• 98a6fc3ce7 try to make pylint happy heinzel 2022-06-08 00:08:09 +02:00
• 8610e2a557 BIG UPD: migrate to python 3.10 and django 3.2 heinzel 2022-06-07 16:07:08 +02:00
• 6e67e2767b Merge pull request 'merge new master stuff into production' (#47) from master into production heinzel 2021-01-27 12:13:21 +01:00
• edd4050935 Merge pull request 'FIX previous change' (#46) from heinzel into master heinzel 2021-01-27 12:11:10 +01:00
• 519de281df FIX previous change heinzel 2021-01-27 11:59:51 +01:00
• b603f852a3 Merge pull request 'Update production branch to master' (#45) from master into production heinzel 2021-01-27 11:55:47 +01:00
• 8cd0f8f023 Merge pull request 'UPD: dav_registration: display canceled state of events' (#44) from heinzel into master heinzel 2021-01-27 11:38:54 +01:00
• 2b8c60a675 UPD: dav_registration: display canceled state of events heinzel 2021-01-27 11:11:03 +01:00
• cb364e5745 Merge pull request 'Production environment is updated.' (#43) from master into production heinzel 2021-01-07 14:42:48 +01:00
• 72390e325b Merge branch 'production' into master heinzel 2021-01-07 14:34:35 +01:00
• 4b772e743b Merge pull request 'heinzel' (#42) from heinzel into master heinzel 2021-01-07 14:02:32 +01:00
• 4890c2430f FIX #3a538e45bf heinzel 2021-01-07 13:48:31 +01:00
• 3a538e45bf FIX #e585f6057b heinzel 2021-01-07 13:40:55 +01:00
• c6943971b6 Merge pull request 'UPD: display status flag canceled or realized also if cleared is set' (#41) from heinzel into master heinzel 2021-01-07 13:36:17 +01:00
• e585f6057b UPD: display status flag canceled or realized also if cleared is set heinzel 2021-01-07 13:28:41 +01:00
• 654fb6d220 FIX #269d59f460 heinzel 2021-01-07 13:17:03 +01:00
• 69f4db1774 Merge pull request 'FIX #35 and #36' (#40) from heinzel_canceld into master heinzel 2021-01-07 13:06:53 +01:00
• 269d59f460 FIX #35 and #36: add new event stati canceled and realized heinzel 2021-01-07 12:52:21 +01:00
• 642971e469 UPD: improved sorting of event status in event lists heinzel 2021-01-07 12:50:36 +01:00
• b76fbe71c7 ADD: more colors for bootstrap labels and buttons heinzel 2021-01-07 12:49:12 +01:00
• 2bd994109e Merge pull request 'Merge with master' (#39) from master into production heinzel 2020-12-22 19:45:11 +01:00
• da83b94c9f UPD: updated real timestamp for merging support for reduced fee into production heinzel 2020-12-22 19:41:38 +01:00
• f15d4f7a8e Merge pull request 'Enforce stronger Passwords' (#38) from heinzel_dav_auth into master heinzel 2020-12-22 18:48:46 +01:00
• c3f72a50ff UPD: enable stronger password validation and eventually warning message on login heinzel 2020-12-22 18:42:06 +01:00
• 47dd196c6a UPD: auth: added a custom wordlist password validator heinzel 2020-12-22 17:04:40 +01:00
• 0762876ec5 UPD: auth: added score based password validator heinzel 2020-12-22 15:53:32 +01:00
• 5f296ff1c0 UPD: dav_auth: refactor the ResetPasswordView for better name heinzel 2020-12-22 11:51:59 +01:00
• f3509d3a61 Merge pull request 'FIX 6d5c77ee71fd91669840a41b13ae30378279994d' (#34) from heinzel into master heinzel 2020-12-18 16:50:55 +01:00
• 70c82f9b93 FIX 6d5c77ee71 heinzel 2020-12-18 16:43:23 +01:00
• b89c4d26b3 Merge pull request 'FIX #4' (#33) from heinzel into master heinzel 2020-12-18 15:40:11 +01:00
• 1d248f0519 Merge branch 'master' into heinzel heinzel 2020-12-18 15:39:50 +01:00
• 50c44b4e54 Merge pull request 'FIX #15 and more' (#32) from heinzel into master heinzel 2020-12-18 15:38:24 +01:00
• 6d5c77ee71 FIX #4 heinzel 2020-12-18 15:37:12 +01:00
• 1f674125ec UPD: dav_events: enable save as draft heinzel 2020-12-18 14:30:17 +01:00
• cbc3df97c1 Reduced participant fee: added toggle buttons within office views and improved html heinzel 2020-12-18 11:48:10 +01:00
• dab2e5cb76 FIX: some participant values were removed if participant was edited heinzel 2020-12-18 11:43:35 +01:00
• b44f6df32e Registrations: view to uncheck apply_reduced_fee while accepting heinzel 2020-12-16 17:28:40 +01:00
• d3d63097db FIX f016f4af41 (python2 encoding error) heinzel 2020-12-16 10:32:12 +01:00
• a7fafbe73f UPD: Participants: added help texts to the new fields heinzel 2020-12-16 10:24:17 +01:00
• f016f4af41 UPD: Registration Form: more information about not DAV member heinzel 2020-12-15 11:56:36 +01:00
• 71dae2672d Merge pull request 'support for reduced fee' (#31) from heinzel into master heinzel 2020-12-09 18:13:29 +01:00
• 50d7ef953e satisfy tests heinzel 2020-12-09 17:59:36 +01:00
• baabbba7fb Support for reduced registration fee heinzel 2020-12-09 17:45:15 +01:00
• 3f3bb2512b participants: added support for year of birth heinzel 2020-12-09 13:45:25 +01:00
• c3bbaa7200 satisfy tests heinzel 2020-12-09 13:16:37 +01:00
• 0ff559d548 registration: add support for year of birth heinzel 2020-12-09 10:51:06 +01:00
• 998b4cd5cf Registrations: decollapse events by clicking on the title heinzel 2020-12-09 08:31:41 +01:00
• dc9b0dc640 Merge pull request 'heinzel' (#30) from heinzel into master heinzel 2020-12-08 20:33:37 +01:00
• 45f50e8601 Better icon for untrashing heinzel 2020-12-08 20:27:51 +01:00
• 3dc44187fa Improved display of trashed registrations heinzel 2020-12-08 20:27:16 +01:00
• 56df5c15bc Merge pull request 'fixed trashbin stuff' (#29) from heinzel into master heinzel 2020-12-08 19:37:38 +01:00
• d60f1d9993 Fix migrations for trashbin feature heinzel 2020-12-08 19:08:21 +01:00
• e501ada83f Correct db migration for trashbin feature heinzel 2020-12-08 18:00:23 +01:00
• 0ab60cf473 Merge pull request 'Add trashbin for registrations and participants' (#28) from heinzel into master heinzel 2020-12-08 16:05:43 +01:00
• 7624c3d69b Added restore from trash feature heinzel 2020-12-03 15:50:47 +01:00
• 94595f4785 Add a kind of trashbin for registrations and participants heinzel 2020-12-03 11:47:41 +01:00
• f2f0df3ab3 Merge pull request 'Fix missing bootstrap context label on flags changelog entries' (#27) from heinzel into master heinzel 2020-11-03 14:55:29 +01:00
• fbcb8e5f4e Fix missing bootstrap context label on flags changelog entries heinzel 2020-11-03 14:46:21 +01:00
• 77d18a145a Merge pull request 'Add a simple changelog to the events' (#26) from changelog into master heinzel 2020-11-03 12:34:29 +01:00
• 37519d59e5 Merged migrations and minor improvements heinzel 2020-11-03 11:18:48 +01:00
• 05a4f21559 Merge branch 'master' into branch 'changelog' heinzel 2020-11-03 09:52:52 +01:00
• 9823efc7ac Merge pull request 'Fix 63026e429b5627643c5335b42f5326b059fdec30' (#24) from heinzel into master heinzel 2020-10-15 18:24:49 +02:00
• e3212280b8 Fix 63026e429b heinzel 2020-10-15 18:19:32 +02:00
• 93ad2aea75 Merge pull request 'Fix 63026e429b5627643c5335b42f5326b059fdec30' (#23) from quickfix into master heinzel 2020-10-15 18:10:53 +02:00
• 3a3882080b Fix 63026e429b heinzel 2020-10-15 18:05:49 +02:00
• 48f39956f3 Merge pull request 'Fix #9 - Registrations: Add support for non members' (#22) from heinzel into master heinzel 2020-10-15 17:50:36 +02:00
• a36cb5a336 Merge branch 'master' into heinzel heinzel 2020-10-15 17:50:03 +02:00
• 63026e429b Fix #9 Registrations: Add support for non members heinzel 2020-10-15 17:44:12 +02:00
• fd30652a5b Merge pull request 'dav_events.tests: more info on a sometimes failing OneClickAction test' (#21) from heinzel into master heinzel 2020-10-13 14:42:02 +02:00
• 28a35d98d2 Fix the previous change heinzel 2020-10-13 14:05:44 +02:00
• e44cff343f More Information on a failing test. heinzel 2020-10-13 13:14:33 +02:00
• 4a92b3d73a Merge pull request 'Close #12 and #17' (#20) from heinzel into master heinzel 2020-10-13 12:49:32 +02:00
• 0819b9a38a Close #12 and #17 heinzel 2020-10-13 12:40:40 +02:00
• e68240eb99 Merge pull request 'Close #13' (#19) from heinzel into master heinzel 2020-10-13 12:38:33 +02:00
• 9945bb5880 Close #13 heinzel 2020-10-13 12:27:42 +02:00
• 5237d81551 Create change log entry on status updates heinzel 2020-09-29 22:19:43 +02:00
• 96d6dc72fb Satisfied screenshot tests heinzel 2020-09-29 19:36:42 +02:00
• 09bfbeedc4 Satisfy python2 tests heinzel 2020-09-29 19:02:55 +02:00
• 10ea6affaf Show event change log on event detail page heinzel 2020-09-29 18:24:38 +02:00
• 9addc237bd First things to implement a event change log heinzel 2020-09-29 15:28:48 +02:00
• 6ddef0c736 Merge pull request 'Added migration, created after update' (#16) from heinzel into master heinzel 2020-09-29 08:33:19 +02:00
• 6780bc5635 Added migration, created after update heinzel 2020-09-29 08:23:05 +02:00
• 02bdea21cb FIX: dav_submission: empty timezone and spoofing fields in metadata.txt heinzel 2020-04-28 11:26:13 +02:00
• 142f37faaf FIX: dav_submission: timezone parsing error with CEST heinzel 2020-04-28 10:53:54 +02:00
• 74ab8af520 REV: removed the CI/CD chain scripts heinzel 2020-04-27 22:45:34 +02:00
• 3b7b90405e FIX: tox: django-countries dropped python2 support with version 6 heinzel 2020-04-27 22:43:13 +02:00
• b15dcea7db Merge branch 'master' of https://dev.heinzelwerk.de/git/DAV-KA/django-dav-events Jens Kleineheismann (heinzel) 2020-04-27 22:15:28 +02:00
• 79a43a123f FIX: dav_submission: proper opening metadata.txt files Jens Kleineheismann (heinzel) 2020-04-27 22:12:38 +02:00
• e4b9ceadae FIX: corrected path to manage.py within CI/CD chain heinzel 2020-04-23 13:54:09 +02:00
• 60ec7bd29f UPD: changed the django env directory name heinzel 2020-04-23 13:20:49 +02:00