Commit Graph

335 Commits

Author SHA1 Message Date
05a4f21559 Merge branch 'master' into branch 'changelog' 2020-11-03 09:52:52 +01:00
9823efc7ac Merge pull request 'Fix 63026e429b5627643c5335b42f5326b059fdec30' (#24) from heinzel into master
All checks were successful
buildbot/tox Build done.
Reviewed-on: #24
2020-10-15 18:24:49 +02:00
e3212280b8 Fix 63026e429b
All checks were successful
buildbot/tox Build done.
2020-10-15 18:19:32 +02:00
93ad2aea75 Merge pull request 'Fix 63026e429b5627643c5335b42f5326b059fdec30' (#23) from quickfix into master
All checks were successful
buildbot/tox Build done.
Reviewed-on: #23
2020-10-15 18:10:53 +02:00
3a3882080b Fix 63026e429b
All checks were successful
buildbot/tox Build done.
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
All checks were successful
buildbot/tox Build done.
Reviewed-on: #22
2020-10-15 17:50:36 +02:00
a36cb5a336 Merge branch 'master' into heinzel
Some checks failed
buildbot/tox Build done.
2020-10-15 17:50:03 +02:00
63026e429b Fix #9 Registrations: Add support for non members
All checks were successful
buildbot/tox Build done.
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
All checks were successful
buildbot/tox Build done.
Reviewed-on: #21
2020-10-13 14:42:02 +02:00
28a35d98d2 Fix the previous change
All checks were successful
buildbot/tox Build done.
2020-10-13 14:05:44 +02:00
e44cff343f More Information on a failing test.
Some checks failed
buildbot/tox Build done.
dav_events.tests: sometimes an OneclickActionTest failes without
providing enough information.
2020-10-13 13:14:33 +02:00
4a92b3d73a Merge pull request 'Close #12 and #17' (#20) from heinzel into master
All checks were successful
buildbot/tox Build done.
Reviewed-on: #20
2020-10-13 12:49:32 +02:00
0819b9a38a Close #12 and #17
All checks were successful
buildbot/tox Build done.
- Added Help-Texts (Mouse-Over-Questionmarks) to the
  Event-Registraions-View.
- Answered registrations will be shown but muted.
2020-10-13 12:40:40 +02:00
e68240eb99 Merge pull request 'Close #13' (#19) from heinzel into master
Some checks failed
buildbot/tox Build done.
Reviewed-on: #19
2020-10-13 12:38:33 +02:00
9945bb5880 Close #13
All checks were successful
buildbot/tox Build done.
dav_events/Anmeldungen: Mitgliedsmummer wird nun im Info-Tooltip
angezeigt.
2020-10-13 12:27:42 +02:00
5237d81551 Create change log entry on status updates 2020-09-29 22:19:43 +02:00
96d6dc72fb Satisfied screenshot tests 2020-09-29 19:36:42 +02:00
09bfbeedc4 Satisfy python2 tests 2020-09-29 19:02:55 +02:00
10ea6affaf Show event change log on event detail page 2020-09-29 18:24:38 +02:00
9addc237bd First things to implement a event change log 2020-09-29 15:28:48 +02:00
6ddef0c736 Merge pull request 'Added migration, created after update' (#16) from heinzel into master
All checks were successful
buildbot/tox Build done.
Reviewed-on: #16
2020-09-29 08:33:19 +02:00
6780bc5635 Added migration, created after update
All checks were successful
buildbot/tox Build done.
2020-09-29 08:23:05 +02:00
02bdea21cb FIX: dav_submission: empty timezone and spoofing fields in metadata.txt
All checks were successful
buildbot/tox Build done.
2020-04-28 11:26:13 +02:00
142f37faaf FIX: dav_submission: timezone parsing error with CEST
All checks were successful
buildbot/tox Build done.
The timezone within metadata.txt will now be written as Europe/Berlin instead of CET or CEST,
because pytz does not recognize CEST and thus will raise an UnknownTimezoneError.
2020-04-28 10:53:54 +02:00
74ab8af520 REV: removed the CI/CD chain scripts
All checks were successful
buildbot/tox Build done.
It was a bad idea.
2020-04-27 22:45:34 +02:00
3b7b90405e FIX: tox: django-countries dropped python2 support with version 6 2020-04-27 22:43:13 +02:00
Jens Kleineheismann (heinzel)
b15dcea7db Merge branch 'master' of https://dev.heinzelwerk.de/git/DAV-KA/django-dav-events
Some checks failed
buildbot/tox Build done.
2020-04-27 22:15:28 +02:00
Jens Kleineheismann (heinzel)
79a43a123f FIX: dav_submission: proper opening metadata.txt files
After porting to our new host, an encoding error was thrown while reading metadata.txt.
2020-04-27 22:12:38 +02:00
e4b9ceadae FIX: corrected path to manage.py within CI/CD chain
Some checks failed
buildbot/tox Build done.
buildbot/django-dav-events-install Build done.
2020-04-23 13:54:09 +02:00
60ec7bd29f UPD: changed the django env directory name
Some checks failed
buildbot/tox Build done.
buildbot/django-dav-events-install Build done.
2020-04-23 13:20:49 +02:00
8386431238 FIX: corrected paths within CI/CD chain
Some checks failed
buildbot/tox Build done.
buildbot/django-dav-events-install Build done.
2020-04-23 12:33:51 +02:00
69a8b0c003 ADD: support for heinzelwerk CI/CD chain
Some checks failed
buildbot/tox Build done.
buildbot/django-dav-events-install Build done.
2020-04-23 12:24:21 +02:00
105e227580 Updated copyright information
All checks were successful
buildbot/tox Build done.
2020-01-14 14:47:50 +01:00
9534c4a038 Added support for tox testing 2020-01-14 14:40:04 +01:00
8ab2f818e4 Events: added new test data (without sensitive information) 2020-01-14 11:56:13 +01:00
fcca7aac72 dav_events: change event order in django admin 2019-12-02 10:37:37 +01:00
c74126f558 UPD: a) increased char limit for description, b) improved NewSubmissionMail 2019-11-08 13:17:42 +01:00
4ef91076e0 FIX: dav_submission: filter non ascii-chars in directory and file names. 2019-11-08 12:23:57 +01:00
96ad5b30d4 FIX: setup permission check based on group membership.
former permission check, based on django model permission won't work,
because we have no model, that would create the permission.
2019-11-08 11:17:25 +01:00
8bd936d2ca Closes #1
dav_submission: Texte von Christoph eingebaut.
2019-11-08 10:41:29 +01:00
eba8409256 dav_submission: added group to submission list. Improved E-Mail. 2019-11-07 08:59:45 +01:00
6f999e419d dav_submission: added email notification, zip-download and permission
check.
2019-11-06 13:25:06 +01:00
bcacb033df dav_submission: added first stuff for downloading submissions. 2019-11-05 17:33:28 +01:00
924b1a8a93 dav_submission: changed some texts, after another feedback round with
manu.
2019-11-05 14:39:25 +01:00
d27988d774 Merge branch 'master' of https://heinzelwelt.de/vcs/python/django-dav-events 2019-10-23 16:53:28 +02:00
f4fd5a997c UPD: TODO 2019-10-23 16:52:28 +02:00
0a5175419e FIX: dav_events: string that contains realnames was not unicode. 2019-10-01 09:52:46 +02:00
ad0584c726 UPD: dav_events: updated default config. 2019-08-29 10:57:59 +02:00
cbc69d4589 ADD: add a cleared event status to indicate the financal clearance. 2019-08-29 10:29:14 +02:00
51f276d719 FIX: update email tests, after changing the email templates. 2019-08-29 10:28:25 +02:00