8530 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tobias Hößl	7275aa69af	Bugfix: change detection for additional special characters	2021-03-31 21:44:53 +02:00
Emanuel Schütze	2f9b6aba95	Merge pull request #5979 from tsiegleauq/poll-method-makes-sense ... Disable general no/yes depending on poll method	2021-03-25 10:06:58 +01:00
Sean	49dba31d56	Disable general no/yes depending on poll method ... During the creation of an assignment poll: Disable and unset the general yes control if the poll method is "yes" Disables and unset the general no control if the poll method if "no"	2021-03-25 09:55:13 +01:00
Emanuel Schütze	f68fca8c83	Merge pull request #5980 from emanuelschuetze/translations-20210322 ... Updated translations	2021-03-22 21:39:29 +01:00
Emanuel Schütze	2e43a17987	Updated translations	2021-03-22 21:20:15 +01:00
Emanuel Schütze	2e5cea512e	Merge pull request #5957 from CatoTH/bugfix/add-warning-when-editing-motion-with-amendments ... Add a warning when editing a motion with existing amendments	2021-03-22 21:15:02 +01:00
Tobias Hößl	9c2e49692c	Add a warning when editing a motion with existing amendments	2021-03-22 21:00:04 +01:00
Emanuel Schütze	c9b924d79a	Merge pull request #5976 from FinnStutzenstein/fixListOfSpeakerInitialClosed ... Fix LOS initially closed migration issue	2021-03-22 20:48:47 +01:00
Finn Stutzenstein	644d3b2fee	Merge pull request #5977 from FinnStutzenstein/enablePytestInDocker ... Enable pytest in docker	2021-03-22 13:17:30 +01:00
Finn Stutzenstein	f897bb01a3	Enable pytest in docker ... The DJANGO_SETTINGS_MODULE is set in the develop container, so the tests.settings from the setup.cfg was ignored. Executing pytest with DJANGO_SETTINGS_MODULE=tests.settings pytest works fine. The line added in the setup.cfg takes over precedence: It auto-adds the --ds parameter which has a higher precedence than the environment variable. Also removed an unnecessary setting.	2021-03-22 13:01:26 +01:00
Finn Stutzenstein	41a3447357	Fix LOS initially closed migration issue	2021-03-22 08:54:16 +01:00
Finn Stutzenstein	7bbd8688a2	Merge pull request #5970 from FinnStutzenstein/updateClientDeps ... Client dependencies	2021-03-22 08:52:31 +01:00
Finn Stutzenstein	c10a0ad70d	Client dependencies: ... - Update ng2-pdf-viewer - Lock down tsparticles and ng-particles to the version in the package-lock.json. In fresh installs newer versions do not work currently	2021-03-22 07:55:37 +01:00
Emanuel Schütze	3595245663	Merge pull request #5972 from emanuelschuetze/translations20210319 ... Updated translations	2021-03-19 14:39:00 +01:00
Emanuel Schütze	bd29777d83	Updated translations	2021-03-19 14:20:15 +01:00
Emanuel Schütze	eadb0e2f0e	Merge pull request #5971 from emanuelschuetze/autoupdate ... Updated autoupdate service	2021-03-19 10:01:13 +01:00
Emanuel Schütze	d1aba2ef94	Updated autoupdate service	2021-03-19 09:46:07 +01:00
Emanuel Schütze	2e1690d2d0	Merge pull request #5967 from FinnStutzenstein/loginErrorNonActive ... Add login errors for inactive users	2021-03-19 09:42:44 +01:00
Finn Stutzenstein	a48fe86791	Add login errors for inactive users	2021-03-19 07:35:45 +01:00
Finn Stutzenstein	63132fdbc5	Merge pull request #5966 from FinnStutzenstein/smallMediafileFixes ... Small mediafile fixes	2021-03-19 07:34:02 +01:00
Finn Stutzenstein	e45d83de5a	Small mediafile fixes	2021-03-18 15:21:00 +01:00
Finn Stutzenstein	365d0d55ea	Merge pull request #5937 from FinnStutzenstein/deleteUnusedCode ... Delete unused code	2021-03-15 14:52:04 +01:00
Finn Stutzenstein	520915c3f5	Merge pull request #5910 from mdickopp/mdickopp/list-of-speakers-inital-state-configurable ... Make configurable whether a newly created list of speakers is initial…	2021-03-11 08:56:29 +01:00
Emanuel Schütze	b76e75ae96	Merge pull request #5948 from emanuelschuetze/autoupdate ... Updated autoupdate service	2021-03-09 21:08:27 +01:00
Emanuel Schütze	1a538e241d	Updated autoupdate service	2021-03-09 20:49:52 +01:00
Martin Dickopp	a9d223121e	Make configurable whether a newly created list of speakers is initially open or closed	2021-03-08 16:28:00 +01:00
Emanuel Schütze	4d706f648f	Merge pull request #5943 from emanuelschuetze/translationDiffService ... Add translation service to DiffService.	2021-03-08 13:28:59 +01:00
Emanuel Schütze	ba0e9b3bc6	Add translation service to DiffService.	2021-03-08 12:54:22 +01:00
Emanuel Schütze	92afd07b62	Merge pull request #5940 from CatoTH/bugfix/dont-show-diff-view-with-no-crs-on-slides ... Don't show diff view on slides if no change recos exist	2021-03-08 11:49:05 +01:00
Finn Stutzenstein	3ba4f99876	Delete unused code ... @oscar: Only the user restricter is still present in the code since it is needed for whoami	2021-03-08 08:57:21 +01:00
Tobias Hößl	bef322d0a4	Don't show diff view on slides if no change recos exist	2021-03-06 19:16:22 +01:00
Emanuel Schütze	a11682a708	Merge pull request #5939 from emanuelschuetze/translation-20210304 ... Updated translations	2021-03-05 08:33:10 +01:00
Emanuel Schütze	bc9b028624	Updated translations	2021-03-05 07:44:49 +01:00
Emanuel Schütze	291402e159	Merge pull request #5920 from CatoTH/bugfix/inconsistency-amendment-paragraphs ... Bugfix: better handling of inconsistent states in amendments if the b…	2021-03-04 21:26:12 +01:00
Emanuel Schütze	bd7fa9b3db	Merge pull request #5935 from FinnStutzenstein/userAutoupdateOnPermissionChange ... Update users on can_see_extra_data permission change	2021-03-04 21:23:04 +01:00
Tobias Hößl	ac50d6f8dc	Bugfix: better handling of inconsistent states in amendments if the base motion has shrunk	2021-03-04 21:17:14 +01:00
Finn Stutzenstein	265145f001	Merge pull request #5936 from FinnStutzenstein/redisTimeoutErrors ... Attempt on handling timeout errors	2021-03-04 09:09:38 +01:00
Finn Stutzenstein	39fb2fadec	Attempt on handling timeout errors ... This code retries to load sessions three times. If not an error will be thrown. There are other solutions (Like not throwing the error), but I would like to see errors in production usage to see, if this helps or not.	2021-03-04 08:45:45 +01:00
Finn Stutzenstein	d62d1a687b	Merge pull request #5918 from FinnStutzenstein/removeVotedIds ... Remove voted_ids	2021-03-04 08:20:19 +01:00
Finn Stutzenstein	d0c1879521	Update users on can_see_extra_data permission change	2021-03-04 08:20:05 +01:00
Finn Stutzenstein	93da435e7c	Remove voted_id for ongoing polls	2021-03-04 07:56:11 +01:00
Emanuel Schütze	45948c47fb	Merge pull request #5881 from FinnStutzenstein/updateDeps ... Update Dependencies	2021-03-02 23:15:53 +01:00
Finn Stutzenstein	3504a87295	Update Dependencies	2021-03-02 22:53:48 +01:00
Emanuel Schütze	d83b7c0ea9	Merge pull request #5933 from emanuelschuetze/translations-20210302 ... Updated translations	2021-03-02 22:48:41 +01:00
Emanuel Schütze	155ade1a8c	Updated translations	2021-03-02 22:27:45 +01:00
Emanuel Schütze	f80ac1d9c5	Merge pull request #5932 from emanuelschuetze/autoupdate ... Updated autoupdate service	2021-03-01 20:45:56 +01:00
Emanuel Schütze	2c7196493d	Updated autoupdate service	2021-03-01 20:24:19 +01:00
Emanuel Schütze	46223328f7	Merge pull request #5926 from FinnStutzenstein/quotaexceedederror ... Error handling	2021-03-01 17:38:55 +01:00
Finn Stutzenstein	619a698272	Error handling: ... - catch QuotaExceededError - add generic error message to the spinner	2021-03-01 17:10:22 +01:00
GabrielInTheWorld	a450a1dff5	Merge pull request #5898 from GabrielInTheWorld/cleanup-fix-spinner ... Some cleanup in favor of spinner-fixes	2021-03-01 16:49:02 +01:00