OpenSlides

Author	SHA1	Message	Date
Emanuel Schütze	ec4873a30c	Merge pull request #3480 from FinnStutzenstein/mediafilesPagination Added pagination for mediafiles (fixes #3448)	2017-11-15 12:28:41 +01:00
FinnStutzenstein	446cab3b44	Added pagination for mediafiles (fixes #3448 )	2017-11-15 12:14:18 +01:00
Emanuel Schütze	de47da646b	Merge pull request #3492 from emanuelschuetze/templateImprovements Template improvements for motions and projector	2017-11-15 12:08:24 +01:00
Emanuel Schütze	b515e68068	Merge pull request #3483 from emanuelschuetze/issue3427 Adds elements to restricted data cache only if cache already exists	2017-11-15 12:05:59 +01:00
Emanuel Schütze	279c2ba796	Adds elements to restricted data cache only if cache already exists (hotfix for #3427 ). Prevents corrupt cache if restricted data cache is cleared while runtime.	2017-11-12 17:39:46 +01:00
Emanuel Schütze	702b452b6e	Template improvements for motions and projector - Use same title layout for (current) list of speakers slide. - Set default choose for current list of speakers slide to 'project as slide' if more than one projectors available. - Remove additional control bottons in list of speakers view to stop/end current/next speech. (User should better use the start/stop buttons behind the speaker names.) - Fix typo in projection defaults. - Set sidebox in motion slide to fix position (should not scroll). - Fix order of amendments in motion detail template. - Increase font size of motion block items on slide.	2017-11-12 17:23:05 +01:00
FinnStutzenstein	db9e132e08	Fix the motion detail template	2017-11-10 17:27:39 +01:00
FinnStutzenstein	bb322b7793	fixed client site lockout protection (fixed #3467 )	2017-11-07 09:57:09 +01:00
Norman Jäckel	9fd0121132	Merge pull request #3476 from emanuelschuetze/motionTitle Do not show identifier in motion detail template twice.	2017-11-03 22:04:32 +01:00
Emanuel Schütze	b76fd2303c	Do not show identifier in motion detail template twice.	2017-11-03 17:02:55 +01:00
FinnStutzenstein	3affb27507	Motion block slide layout	2017-11-03 14:52:31 +01:00
FinnStutzenstein	b7da8cf7ec	Do not show identifier in motion slide twice	2017-11-03 13:06:51 +01:00
Emanuel Schütze	bed42b5c66	Merge pull request #3472 from FinnStutzenstein/templateChanges Template changes and IE fix	2017-11-03 12:55:17 +01:00
FinnStutzenstein	9e46924c77	Template changes and IE fix - Fix IE11 that projector shows JS error if 'startsWith' is used. Projector was updated very slowly. - Hide the valid/invalid/casted ballot rows on projector if empty. - Use 80% width for motion reason in PDF.	2017-11-03 12:36:03 +01:00
Emanuel Schütze	432ab9068d	Merge pull request #3473 from FinnStutzenstein/zoomcontent Do not zoom slideheaders	2017-11-03 12:33:42 +01:00
FinnStutzenstein	323534700c	Do not zoom slideheaders	2017-11-03 12:17:29 +01:00
Emanuel Schütze	5558ba3fc6	Merge pull request #3470 from FinnStutzenstein/SpeakersInMotionListView Showing the number of next speakers in motion list view	2017-11-03 10:55:13 +01:00
Emanuel Schütze	969274faf3	Merge pull request #3471 from FinnStutzenstein/hideWrongErrorMessageInProjector hide 'undefined' error message	2017-11-03 10:47:49 +01:00
Emanuel Schütze	4cbf7d6c9f	Merge pull request #3469 from FinnStutzenstein/CountdownRace Bundle autoupdates for beginning a speech	2017-11-03 10:47:22 +01:00
FinnStutzenstein	1236fee7ee	Showing the number of next speakers in motion list view	2017-11-03 10:29:34 +01:00
FinnStutzenstein	834ed77a2c	Bundle autoupdates for beginning a speech	2017-11-03 10:27:45 +01:00
FinnStutzenstein	84f755a6e5	hide 'undefined' error message	2017-11-03 10:25:22 +01:00
Emanuel Schütze	3706a36051	Updated German translations.	2017-11-03 09:16:08 +01:00
Tobias Hößl	e18f22f200	Break lines in nodes that have already been parsed	2017-11-02 09:16:36 +01:00
Emanuel Schütze	c40ae6e9d1	Merge pull request #3465 from CatoTH/Bugfix-More-Tolerant-Diff Better handling of inserted paragraphs	2017-11-02 09:11:28 +01:00
FinnStutzenstein	5e8662e470	Motion optimizations	2017-11-02 08:50:33 +01:00
Tobias Hößl	6891471c45	Better handling of inserted paragraphs	2017-11-01 10:29:18 +01:00
Emanuel Schütze	a8ff32bbb1	Merge pull request #3442 from FinnStutzenstein/MotionIdentifierInTitle Show motion identifier in (current) list of speakers	2017-11-01 10:23:19 +01:00
FinnStutzenstein	39bd6653f0	Show motion identifier in (current) list of speakers	2017-11-01 09:58:22 +01:00
Norman Jäckel	6767dbc40a	Merge pull request #3457 from CatoTH/Bugfix-Fail-Less-Dramatically-With-Inconsistent-Data2 try/catch for inconsistent data	2017-10-29 17:59:18 +01:00
Norman Jäckel	452ecfbbd0	Merge pull request #3454 from FinnStutzenstein/UserFormFix Fixed user form for groups with ids greater than 9	2017-10-29 17:57:18 +01:00
Norman Jäckel	e259e10202	Merge pull request #3461 from FinnStutzenstein/followRecommendationAutoCopy Update state field when following a recommendation	2017-10-29 17:53:30 +01:00
Norman Jäckel	50bed94249	Merge pull request #3463 from FinnStutzenstein/PdfListstyle Implement list styles in pdf (fixes #3338)	2017-10-29 17:52:59 +01:00
Emanuel Schütze	b50d5e10ee	Added '!' as new split separator for better motion diff view.	2017-10-27 14:50:38 +02:00
FinnStutzenstein	78f5d1f516	Implement list styles in pdf (fixes #3338 )	2017-10-27 14:35:09 +02:00
FinnStutzenstein	1c508765fa	Update state field when following a recommendation	2017-10-27 12:36:31 +02:00
Tobias Hößl	5fd8741fdb	try/catch for inconsistent data	2017-10-24 20:06:04 +02:00
FinnStutzenstein	f479a7a1ab	Fixed user form for groups with ids greater than 9	2017-10-24 10:23:49 +02:00
Norman Jäckel	73407133bd	Merge pull request #3444 from FinnStutzenstein/ScrollTopOnPageChange Go to top on a page change	2017-10-22 15:35:12 +02:00
Norman Jäckel	d175e4a200	Merge pull request #3452 from FinnStutzenstein/Plugin Added TemplateHooks for the protocol plugin.	2017-10-19 21:21:49 +02:00
FinnStutzenstein	9c657016e3	Added TemplateHooks for the protocol plugin.	2017-10-18 11:35:22 +02:00
Emanuel Schütze	4ff7d0b7dc	Merge pull request #3450 from CatoTH/Bugfix-Disable-Change-Ratio Disable change ratio detection / Fix marking unchanged dangling line as changed	2017-10-16 13:05:35 +02:00
Tobias Hößl	e651c124e4	Disable change ratio detection / Fix for marking unchanged line as changed	2017-10-16 12:27:44 +02:00
Emanuel Schütze	5eda3131a8	Merge pull request #3449 from emanuelschuetze/motionTemplateImprovements Motion template improvements (Fixed #3303)	2017-10-16 12:10:00 +02:00
Emanuel Schütze	c02f00da7d	Merge pull request #3446 from FinnStutzenstein/Identifier New motion identifier behavior	2017-10-16 12:08:53 +02:00
Emanuel Schütze	17959bd9c5	Motion template improvements (Fixed #3303 ) - Sort categories drop downs by config value (name or prefix) (fixed #3303). - Show comment fiels in pdf without "Comment" as prefix. - Improved heading style in web and pdf. - Added motion block to motion pdf.	2017-10-16 09:35:06 +02:00
Emanuel Schütze	721064700a	Merge pull request #3441 from FinnStutzenstein/CommentsFilterMove Move comments filter behind motion block filter	2017-10-13 23:38:45 +02:00
Norman Jäckel	611776d38c	Merge pull request #3445 from FinnStutzenstein/MotionTextFullWidth Limit the reason display width	2017-10-13 18:35:47 +02:00
Norman Jäckel	cd2316652d	Merge pull request #3443 from FinnStutzenstein/ResetCountdown Reset Countdown when a speech was ended	2017-10-13 18:23:34 +02:00
Norman Jäckel	9b64bd5646	Merge pull request #3438 from FinnStutzenstein/PDF Fixing multiline headers in PDF	2017-10-13 18:21:34 +02:00
Norman Jäckel	487b286b79	Merge pull request #3436 from FinnStutzenstein/Remarks Fixed all remarks	2017-10-13 18:20:45 +02:00
FinnStutzenstein	5b9933e930	Move comments filter behind motion block filter	2017-10-13 14:25:31 +02:00
FinnStutzenstein	1da34f744f	New motion identifier behavior	2017-10-13 14:06:01 +02:00
FinnStutzenstein	5f45e2d748	Fixed all remarks	2017-10-13 12:02:23 +02:00
FinnStutzenstein	96cd3405aa	Go to top on a page change	2017-10-13 11:46:41 +02:00
FinnStutzenstein	6584c7b035	Limit the reason display width	2017-10-13 11:16:01 +02:00
FinnStutzenstein	256c12af8e	Reset Countdown when a speech was ended	2017-10-13 11:13:31 +02:00
Norman Jäckel	3c9ae628e8	Merge pull request #3439 from FinnStutzenstein/PdfInsertFix Fixed indention of inserted paragraphes	2017-10-12 20:29:41 +02:00
Tobias Hößl	a09a12c55c	Diff: use comma as a word separator	2017-10-11 22:15:12 +02:00
FinnStutzenstein	fc185e2eeb	Fixing multiline headers in PDF	2017-10-11 14:21:35 +02:00
FinnStutzenstein	b8e23e6a4f	Fixed indention of inserted paragraphes	2017-10-11 14:04:31 +02:00
Emanuel Schütze	84e2ec2a29	Updated German translations.	2017-10-05 13:33:32 +02:00
Emanuel Schütze	18d138ebf1	Merge pull request #3433 from emanuelschuetze/layoutIssues Fixed minor layout issues on projector and pdf.	2017-10-05 13:29:38 +02:00
Emanuel Schütze	886d76ff06	Merge pull request #3432 from emanuelschuetze/additionalOptions Added new motion configs to hide reason/recommendation on projector.	2017-10-05 13:29:12 +02:00
Emanuel Schütze	02857bdbf1	Fixed minor layout issues on projector and pdf. Especially for motion diff view.	2017-10-05 13:05:49 +02:00
Emanuel Schütze	0a04ee0716	Added new motion configs to hide reason/recommendation on projector.	2017-10-05 12:54:40 +02:00
FinnStutzenstein	46364a84e1	Generate webclient-realm.js while collecting staticfiles (fixes #3422 )	2017-10-04 12:26:30 +02:00
Emanuel Schütze	de9c54513d	Merge pull request #3430 from FinnStutzenstein/AgendaFix Fixed projecting subitems	2017-09-28 11:40:47 +02:00
FinnStutzenstein	343ddf5ac5	Fixed projecting subitems	2017-09-28 11:33:33 +02:00
FinnStutzenstein	2ba1fe2a0f	Instructions for using Nginx in big mode	2017-09-28 09:35:05 +02:00
FinnStutzenstein	5862e054e3	Naive projector prioritization	2017-09-27 14:46:16 +02:00
Emanuel Schütze	c269ae5cf8	Merge pull request #3419 from FinnStutzenstein/ViewCaching Index and Webclient View caching	2017-09-27 13:21:46 +02:00
FinnStutzenstein	178948b269	Index and Webclient View caching	2017-09-27 12:50:59 +02:00
Emanuel Schütze	231a056790	Merge pull request #3418 from FinnStutzenstein/ServeLogos Serve Logos	2017-09-27 10:52:29 +02:00
Emanuel Schütze	0b10933d67	Merge pull request #3417 from FinnStutzenstein/HidePassword Hide password in change password view	2017-09-27 10:52:09 +02:00
FinnStutzenstein	6f33c8a866	Fixing motion comments (fixes #3420 )	2017-09-27 09:20:07 +02:00
FinnStutzenstein	841383d414	Serve Logos	2017-09-26 10:56:43 +02:00
FinnStutzenstein	ab08708ec1	Hide password in change password view	2017-09-26 09:03:05 +02:00
FinnStutzenstein	aa13e5ddd0	Fixing special comments fields, reconnect timeout, minor things.	2017-09-22 13:45:52 +02:00
Emanuel Schütze	6f3e2a74f8	Merge pull request #3410 from CatoTH/Issue3409-Workaround-For-Newlines Line break algorithm should not be distracted by newline characters	2017-09-21 16:35:14 +02:00
Emanuel Schütze	c68688c2ff	Merge pull request #3414 from FinnStutzenstein/Fixes Motion comments fix and close open dialogs if a relogin is necessary	2017-09-21 16:29:32 +02:00
Tobias Hößl	ee37cfed9c	Line break algorithm should not be distracted by newline characters - Cancel out newlines inserted when inline-editing motions - Bugfix for newlines after BRs	2017-09-21 16:24:54 +02:00
FinnStutzenstein	a4ae174a94	Fixing motion access permissions	2017-09-21 12:43:07 +02:00
FinnStutzenstein	31708df436	Motion comments fix and close open dialogs if a relogin is necessary	2017-09-20 07:34:57 +02:00
Emanuel Schütze	61f59b962d	Merge pull request #3411 from emanuelschuetze/stylistic-remarks Fixed two stylistic remarks.	2017-09-18 11:16:39 +02:00
Emanuel Schütze	e313731c9e	Merge pull request #3408 from CatoTH/Issue3401-Inline-Diff-When-First-Word-Changed Inline-Diff when the first word in a paragraph is replaced - fixes #3401	2017-09-18 11:15:52 +02:00
Tobias Hößl	8650bc0401	Inline-Diff works when the first word in a paragraph is being replaced - fixes #3401	2017-09-18 11:05:00 +02:00
Emanuel Schütze	6f4d122e0f	Fixed two stylistic remarks.	2017-09-18 09:40:57 +02:00
Tobias Hößl	da8f825d42	Sort attributes before applying the diff - fixes #3402	2017-09-16 14:06:12 +02:00
Emanuel Schütze	b824e0387c	Merge pull request #3390 from ostcar/rewrite_restricted_data CollectionElement and Autoupdate cleanups to help mypy	2017-09-15 12:23:50 +02:00
Oskar Hahn	d7db714562	CollectionElement and Autoupdate cleanups * change get_restricted_data and get_projector_data to always use a list * Add typings to all get_restricted_data and get_projector_data methods * Replace CollectionElementList with a real list * Fixed arguments of inform_deleted_data * Moved CollectionElementCache to cache.py and refactored it * Run tests with cache enabled (using fakeredis)	2017-09-15 12:11:32 +02:00
Emanuel Schütze	483410fe0c	Updated German translations.	2017-09-15 12:08:26 +02:00
Emanuel Schütze	4565e7e4a6	Merge pull request #3400 from FinnStutzenstein/UserAutoupdate Autoupdates on user login (fixes #3395, fixes #3392)	2017-09-15 11:48:35 +02:00
FinnStutzenstein	c580ee4c8d	Goto top link, improved title, stylistic changes, and more	2017-09-15 11:06:19 +02:00
Emanuel Schütze	2c4a1d5a6c	Merge pull request #3376 from FinnStutzenstein/MotionCommentsRework Rework on motion comments.	2017-09-15 10:59:02 +02:00
Emanuel Schütze	83f67b23c9	Merge pull request #3403 from ostcar/optional_restricted_data_cache Make RestrictedDataCache optional	2017-09-15 10:56:22 +02:00
FinnStutzenstein	16abfd0dbf	Autoupdates on user login (fixes #3395 , fixes #3392 )	2017-09-15 10:40:04 +02:00
Oskar Hahn	faf44602cb	Make RestrictedDataCache optional	2017-09-15 09:55:21 +02:00
Norman Jäckel	0eccd78b78	Merge pull request #3384 from FinnStutzenstein/SecureMedifiles Secure Mediafiles and check view permissions	2017-09-14 20:31:33 +02:00
FinnStutzenstein	288a706d01	Rework on motion comments (fixes #3350 ).	2017-09-12 14:58:43 +02:00
FinnStutzenstein	8adf2a6729	Clear the identifier_number on identifier reset (fixes #3353 )	2017-09-08 22:09:25 +02:00
Emanuel Schütze	3a25e87330	Merge pull request #3366 from FinnStutzenstein/Issue3363 New permission for managing lists of speakers (fixes #3363)	2017-09-08 22:05:32 +02:00
Emanuel Schütze	62f0f23228	Merge pull request #3393 from FinnStutzenstein/Issue3389 Pagination for assingment list (fixes #3389)	2017-09-08 21:57:25 +02:00
FinnStutzenstein	4472734d09	New permission for managing lists of speakers (fixes #3363 )	2017-09-08 21:55:42 +02:00
FinnStutzenstein	dc03a67281	Pagination for assingment list (fixes #3389 )	2017-09-08 21:45:37 +02:00
Emanuel Schütze	29f60fc6aa	Fixed motion detail style issues - margin in motion diff view - personal note box	2017-09-08 18:25:48 +02:00
Emanuel Schütze	1e1e7637f9	Merge pull request #3379 from FinnStutzenstein/AgentaTitle New layout for agenda list slide, fixing long titles in agenda list v…	2017-09-08 15:16:52 +02:00
Oskar Hahn	0978cfd5d5	Add restricted_data_cache This replaces the startup cache	2017-09-06 18:06:57 +02:00
Oskar Hahn	71e154ec6d	Merge pull request #3382 from ostcar/remove_dispatch Rewrite projector_element without dispatch	2017-09-06 18:06:39 +02:00
Oskar Hahn	b80e95a321	Rewrite projector_element without dispatch	2017-09-05 22:46:13 +02:00
Norman Jäckel	c9ad15621c	Merge pull request #3383 from FinnStutzenstein/CustomTranslations Custom Translations	2017-09-05 22:15:21 +02:00
FinnStutzenstein	b35ea2ea5b	New layout for agenda list slide, fixing long titles in agenda list view, fixing mediafiles in fullscreen (fixes #3369 )	2017-09-05 15:30:59 +02:00
Emanuel Schütze	b416786b40	Merge pull request #3360 from FinnStutzenstein/PinPersonalNote Pin personal note.	2017-09-05 09:52:31 +02:00
FinnStutzenstein	02428eb8f0	Pin personal note.	2017-09-05 08:24:16 +02:00
FinnStutzenstein	b30919eada	Custom Translations	2017-09-05 08:04:02 +02:00
Oskar Hahn	be94e97889	more typings	2017-09-03 18:34:55 +02:00
Norman Jäckel	438318d3d0	Merge pull request #3386 from emanuelschuetze/fixReasonInlineEditing Fixed inline editing of motion reason.	2017-09-01 20:41:09 +02:00
Norman Jäckel	fcbe70f742	Merge pull request #3388 from ostcar/fix_3377 Fix PersonalNoteAccessPermissions for anonymous user	2017-09-01 20:33:59 +02:00
FinnStutzenstein	ab1f745be2	Secure Mediafiles and check view permissions	2017-09-01 14:29:46 +02:00
Oskar Hahn	24b07da7b4	Fix PersonalNoteAccessPermissions for anonymous user fixes: #3377	2017-08-31 22:00:22 +02:00
Emanuel Schütze	f4ac0dd30d	Fixed inline editing of motion reason.	2017-08-30 19:23:52 +02:00
Emanuel Schütze	b806e24f87	Updated German translations.	2017-08-30 17:40:26 +02:00
Emanuel Schütze	97a1431c32	Merge pull request #3372 from FinnStutzenstein/Issue3365 Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367)	2017-08-29 11:44:47 +02:00
Emanuel Schütze	0dda74b99b	Merge pull request #3375 from emanuelschuetze/ckeditor Updated to ckeditor 4.7.2	2017-08-29 11:36:58 +02:00
FinnStutzenstein	7d333d4f3b	Multiselect filter for motion comments, filter and sorting fixes (fixes #3365 , fixes #3367 )	2017-08-29 11:36:00 +02:00
Emanuel Schütze	7d6e1f1b97	Merge pull request #3371 from ostcar/new_config Rewrite config to have id field	2017-08-29 11:31:43 +02:00
Emanuel Schütze	e2e6c8c4b4	Updated to ckeditor 4.7.2	2017-08-29 11:26:18 +02:00
Norman Jäckel	0f322720a4	Merge pull request #3374 from emanuelschuetze/fix-pdf-error-for-reason Fixed pdf generation error for motion reason.	2017-08-28 21:07:39 +02:00
Norman Jäckel	ffde351718	Merge pull request #3368 from FinnStutzenstein/Issue3364 Different ckeditor toolbar for inline editing	2017-08-28 20:59:44 +02:00
Norman Jäckel	1ca829f902	Merge pull request #3361 from FinnStutzenstein/ReasonInlineEditing Inline editing for motion reason	2017-08-28 20:53:28 +02:00
Emanuel Schütze	96d3b4178a	Fixed pdf generation error for motion reason.	2017-08-24 19:07:01 +02:00
FinnStutzenstein	efbb68cf55	Different ckeditor toolbar for inline editing	2017-08-24 18:49:54 +02:00
Oskar Hahn	87b889fbf2	Rewrite config to have id field	2017-08-24 15:02:42 +02:00
Oskar Hahn	9d1ebac86e	Add typing (#3370 ) Add typing	2017-08-23 20:51:06 +02:00
FinnStutzenstein	0f6d2d431c	Inline editing for motion reason	2017-08-23 09:42:10 +02:00
Norman Jäckel	c4fe50b38d	Merge pull request #3362 from FinnStutzenstein/ScrollImprovement Scroll improvement	2017-08-18 14:30:43 +02:00
Norman Jäckel	effe42464f	Merge pull request #3355 from FinnStutzenstein/Issue3169 Mediafile fullscreen (fixes #3169)	2017-08-18 14:26:38 +02:00
Norman Jäckel	acdb66ee36	Merge pull request #3354 from FinnStutzenstein/AssignmentSelectAllFix Fixing selecting all of assignments	2017-08-18 14:25:09 +02:00
Norman Jäckel	8f9d6fcc07	Merge pull request #3359 from FinnStutzenstein/MediafilesLayout Fixing layout issues in mediafiles list view	2017-08-18 14:24:38 +02:00
FinnStutzenstein	94a58afbdf	Scroll improvement	2017-08-18 11:55:52 +02:00
FinnStutzenstein	4ec4694f01	Fixing layout issues in mediafiles list view	2017-08-18 08:06:13 +02:00
FinnStutzenstein	07e584ae63	Mediafile fullscreen (fixes #3169 )	2017-08-16 14:42:19 +02:00
FinnStutzenstein	c72399ff9b	Config for projector header and footer	2017-08-16 14:39:58 +02:00
Emanuel Schütze	14e38861c7	Merge pull request #3342 from FinnStutzenstein/Umlaute Fixing strange umlauts when copy text from word	2017-08-16 14:11:28 +02:00
FinnStutzenstein	0a1432f047	Fixing strage umlauts when copy text from word	2017-08-16 11:49:31 +02:00
Norman Jäckel	40e3958a7d	Merge pull request #3351 from FinnStutzenstein/NoSpecialCommentsInConfig Exclude special comments in comment field settings; fixing the inline…	2017-08-16 11:45:28 +02:00
Norman Jäckel	76ff708e0e	Merge pull request #3348 from FinnStutzenstein/Issue3344 Default sorting for users, mediafiles and assignments (fixes #3344)	2017-08-16 11:44:24 +02:00
Norman Jäckel	0fe7b6bf7d	Merge pull request #3337 from FinnStutzenstein/CKEditorImages Custom CKEditor plugin for browsing mediafiles	2017-08-16 11:41:55 +02:00
FinnStutzenstein	b63262c943	Custom CKEditor plugin for browsing mediafiles	2017-08-16 10:15:34 +02:00
FinnStutzenstein	c36b756f25	Fixing paragraphs in lists when exporting PDF (fixes #3343 )	2017-08-16 09:52:30 +02:00
FinnStutzenstein	1fb9b07c6b	Fixing selecting all of assignments	2017-08-16 09:49:07 +02:00
FinnStutzenstein	a365127a1c	default sorting for users, mediafiles and assignments (fixes #3344 )	2017-08-16 09:13:33 +02:00
FinnStutzenstein	a12440ed2c	Exclude special comments in comment field settings; fixing the inline editiing	2017-08-16 09:09:22 +02:00
Emanuel Schütze	f0d840148e	Merge pull request #3330 from FinnStutzenstein/PluginDev Improvements for plugin integration	2017-08-14 15:06:14 +02:00
Emanuel Schütze	81f841d5e5	Merge pull request #3310 from emanuelschuetze/new-logo Added new logo placeholder for web interface header logo.	2017-08-14 14:50:07 +02:00
FinnStutzenstein	08c9dda1de	Improvements for plugin integration	2017-08-14 14:48:31 +02:00
Emanuel Schütze	32c36996b0	Merge pull request #3345 from FinnStutzenstein/testData some changes in the example data plugin	2017-08-14 10:52:45 +02:00
Emanuel Schütze	298d41def7	Merge pull request #3346 from FinnStutzenstein/Issue3232 removing obsolete merge-before	2017-08-14 10:00:57 +02:00
FinnStutzenstein	727d1341e8	some changes in the example data plugin	2017-08-14 09:56:48 +02:00
FinnStutzenstein	52e2d2ca83	removing obsolete merge-before (fixes #3232 )	2017-08-14 09:51:20 +02:00
Norman Jäckel	e2a32e403d	Merge pull request #3349 from FinnStutzenstein/ColorInPdf Fixing wrong styles in PDF	2017-08-12 13:48:08 +02:00
Norman Jäckel	305356f75f	Unproject elements when they are deleted. Fixed #3292 .	2017-08-12 13:27:23 +02:00
Emanuel Schütze	2c43bfee47	Rework on ballot paper layout for using logos.	2017-08-11 12:50:49 +02:00
FinnStutzenstein	bf56067d17	poll and ballot paper logos	2017-08-11 12:48:48 +02:00
Emanuel Schütze	3e1c1abe14	Added new logo placeholder for web interface header logo.	2017-08-11 12:48:48 +02:00
FinnStutzenstein	5d902d809f	Fixing wrong stlyes in PDF	2017-08-11 10:34:03 +02:00
Tobias Hößl	54e067d9d9	Allow OL[start] - fixes #3339 Style	2017-08-02 21:27:12 +02:00
Norman Jäckel	2aeaf251a2	Merge pull request #3335 from emanuelschuetze/config-order Reorder weight fields of core configs.	2017-07-28 14:53:53 +02:00
Emanuel Schütze	5ee0219702	Reorder weight fields of core configs.	2017-07-28 14:31:59 +02:00
Emanuel Schütze	96be75fc0d	Motion formatting and sort fixes - Adapt font size of outside linenumbers in motion pdf, depending on selected standard font size. - Enlarge width of first column in of meta table of motion pdf. - Fixed order issue in motion list: Sort always by identifier (also after selecting a custom sort parameter).	2017-07-28 14:26:28 +02:00
Emanuel Schütze	c5c15d26b5	Merge pull request #3333 from emanuelschuetze/translations Updated German translations.	2017-07-27 15:24:16 +02:00
Emanuel Schütze	6b291726a4	Updated German translations.	2017-07-27 15:17:40 +02:00
Emanuel Schütze	2dc7db2b8c	Merge pull request #3288 from CatoTH/Issue3269-Issue3232-Split-Elements2 Issue3269 issue3232 split elements2	2017-07-27 15:12:44 +02:00
Emanuel Schütze	3c9a67d084	Merge pull request #3332 from emanuelschuetze/fontsize Added config option for standard font size in PDF.	2017-07-27 15:04:01 +02:00
Tobias Hößl	7b62c60350	Marks split list items with CSS-classes and hides the bullet points - fixes #3269	2017-07-27 14:42:51 +02:00
Emanuel Schütze	d57d3efcf4	Added config option for standard font size in PDF.	2017-07-27 14:36:49 +02:00
Emanuel Schütze	3c747c01e2	Merge pull request #3331 from FinnStutzenstein/no-special-comments-in-export Hide special comments in export	2017-07-27 14:36:04 +02:00
FinnStutzenstein	2e2d28288a	Hide special comments in export	2017-07-27 12:44:13 +02:00
FinnStutzenstein	c65976715e	configvalue for sequential number	2017-07-27 11:15:12 +02:00
FinnStutzenstein	1f59336e3e	Configvalue for pagenumber alignment in PDF	2017-07-27 10:55:40 +02:00
Emanuel Schütze	41ab706939	Merge pull request #3323 from FinnStutzenstein/hide-error-on-load Delay the projector not loaded error.	2017-07-27 10:51:18 +02:00
Norman Jäckel	f806dc4017	Merge pull request #3329 from FinnStutzenstein/category-sort-in-export Add the option to sort the categories different in the motion export	2017-07-27 10:41:02 +02:00
FinnStutzenstein	8560509ace	Delay the projector not loaded error.	2017-07-27 10:06:11 +02:00
FinnStutzenstein	a32b046fa5	Add the option to sort categories different in motion export.	2017-07-27 09:50:03 +02:00
FinnStutzenstein	6c5cc799ca	Fixing mediafiles list view for medifiles without a type	2017-07-26 15:46:14 +02:00
Emanuel Schütze	5644e99b43	Merge pull request #3319 from FinnStutzenstein/docx-text-missing fixing docx parser missing text	2017-07-26 15:03:27 +02:00
Emanuel Schütze	a44b84e836	Merge pull request #3318 from normanjaeckel/CategorySortError Fixed error on category numbering. Fixed #3315.	2017-07-26 14:41:27 +02:00
FinnStutzenstein	9c0a10df63	fixing wrong entered comments	2017-07-20 14:43:58 +02:00
FinnStutzenstein	615327f64d	fixing docx parser missing text	2017-07-19 13:08:31 +02:00
Norman Jäckel	41a70f40df	Fixed error on category numbering. Fixed #3315 .	2017-07-05 22:13:54 +02:00
Norman Jäckel	77a321894b	Merge pull request #3306 from FinnStutzenstein/Issue2862 Remove OPTION request to query permissions (fixes #2862)	2017-07-05 21:26:08 +02:00
Emanuel Schütze	3006cb388f	Merge pull request #3304 from CatoTH/Issue3298-PreventCollidingChangeRecommendations Prevent colliding change recommendations - fixes #3298	2017-06-29 18:18:36 +02:00
Tobias Hößl	65d5bbccd6	Prevent colliding change recommendations - fixes #3298	2017-06-29 18:03:58 +02:00
FinnStutzenstein	90af3e6d1d	remove OPTION request to query permissions (fixes #2862 )	2017-06-29 13:25:52 +02:00
FinnStutzenstein	37eec7d99b	Minor Bugfixes (fixes #3312 , fixes #3313 )	2017-06-29 08:59:41 +02:00
Emanuel Schütze	574d815397	Merge pull request #3311 from FinnStutzenstein/projector-size Projectorsize selection with slider	2017-06-28 12:43:42 +02:00
FinnStutzenstein	2d35b9e371	Projectorsize selection with slider	2017-06-28 09:23:40 +02:00
Emanuel Schütze	b1d98ca33a	Merge pull request #3308 from FinnStutzenstein/agenda-project call the own project method from a content object of an agenda item	2017-06-27 12:53:02 +02:00
Norman Jäckel	029366de5f	Merge pull request #3301 from FinnStutzenstein/related-projected Highlight objects in list view, if related objects are projected	2017-06-21 22:56:15 +02:00
Norman Jäckel	e72af0101c	Merge pull request #3309 from FinnStutzenstein/Issue3307 fix not supported 'startsWith' function in IE11 (fixes #3307)	2017-06-21 21:45:15 +02:00
FinnStutzenstein	f42b6f0d37	fix not supported 'startsWith' function in IE11 (fixes #3307 )	2017-06-21 15:28:43 +02:00
FinnStutzenstein	ef60f5ea44	call the own project method from a content object of an agenda item	2017-06-21 15:09:38 +02:00
FinnStutzenstein	0a1ea46b8d	fix projector reconnecting if websocket is closed	2017-06-21 13:18:06 +02:00
FinnStutzenstein	2536b35c0e	Highlight objects in list view, if related objects are projected	2017-06-21 07:52:10 +02:00
Emanuel Schütze	573fc4da57	Merge pull request #3267 from normanjaeckel/NewPersonalNote Rework on personal notes.	2017-06-16 12:38:40 +02:00
Emanuel Schütze	45a2e3bbc4	Updated js pot file and German translations.	2017-06-16 12:24:11 +02:00
Emanuel Schütze	bef986630e	Merge pull request #3297 from FinnStutzenstein/Issue3295 improved reconnect handling if the server was flushed (fixed #3295)	2017-06-16 07:56:30 +02:00
FinnStutzenstein	4387a56fb1	Improved reconnect handling if the server was flushed (fixed #3295 ). just ping with whoami request	2017-06-16 07:47:17 +02:00
FinnStutzenstein	2e898275cb	Some small changes and bugfixes	2017-06-15 14:25:55 +02:00
Norman Jäckel	eaebeb8f06	Fixed get_projector_data impementation. Closed #3282 .	2017-06-13 22:21:56 +02:00
FinnStutzenstein	c80b0abc82	Personal note: client rework	2017-06-13 20:58:17 +02:00
Norman Jäckel	91d365e386	Rework on personal notes. Fixed #3262 .	2017-06-13 20:58:17 +02:00
Norman Jäckel	7947f2ed34	Merge pull request #3293 from ostcar/no_anonymous_no_cry Block anonymous from websocket, if they are deactivated	2017-06-13 11:34:02 +02:00
Norman Jäckel	260cd5cd16	Merge pull request #3290 from FinnStutzenstein/Issue1533-neu Massimport for users	2017-06-12 22:07:32 +02:00
Norman Jäckel	d1c86e8b0d	Merge pull request #3291 from FinnStutzenstein/userImportFix Fix import on not full populated csv files	2017-06-12 22:04:56 +02:00
Oskar Hahn	8920ffac66	Block anonymous from websocket, if they are deactivated	2017-06-10 09:25:27 +02:00
FinnStutzenstein	8cb6342e73	Fix import on not full populated csv files	2017-06-09 14:57:06 +02:00
FinnStutzenstein	433cdc42fa	Massimport for users	2017-06-08 14:40:29 +02:00
Emanuel Schütze	fb56215a26	Merge pull request #3233 from normanjaeckel/FixFreeUserAgenda Fixes autoupdate bug for a user without user.can_see_name permission …	2017-06-07 21:00:12 +02:00
Norman Jäckel	ea50971ae6	Fixes autoupdate bug for a user without user.can_see_name permission.	2017-06-07 20:55:00 +02:00
Emanuel Schütze	5a945c3a71	Merge pull request #3287 from CatoTH/diff-bugfix Fix a bug where a single moved word was not highlighted in the diff	2017-06-07 20:15:48 +02:00
FinnStutzenstein	9448beb903	Fixes some PDF issues	2017-06-07 07:55:49 +02:00
Tobias Hößl	029ca0b8e3	Fix a bug where a single moved word was not highlighted in the diff	2017-06-06 19:28:52 +02:00
Emanuel Schütze	074559ba23	Merge pull request #3279 from FinnStutzenstein/Issue3273 Fixing linenumbers on page break (fixes #3273)	2017-06-01 15:31:36 +02:00
Emanuel Schütze	53d50242b6	Merge pull request #3274 from FinnStutzenstein/Issue3259 Do not reload all projector elements on every autoupdate (fixes #3259).	2017-06-01 15:24:02 +02:00
FinnStutzenstein	a83cd5b947	Fixing linenumbers on page break (fixes #3273 )	2017-06-01 15:22:52 +02:00
FinnStutzenstein	678a56db08	Do not reload all projector elements on every autoupdate (fixes #3259 ).	2017-06-01 15:01:24 +02:00
Emanuel Schütze	2994f7713b	Hotfix for issue #3282 . (projector autoupdate problem by deleting projected object)	2017-06-01 14:57:33 +02:00
Emanuel Schütze	b48c850e79	Removed empty <span> tags in ckeditor.	2017-05-31 21:35:32 +02:00
FinnStutzenstein	8cd22daff3	Fixed missing styles of headings in motion pdf. Also some refactoring/clean up of pdf code.	2017-05-29 13:03:12 +02:00
Emanuel Schütze	1b6dd93e6e	Merge pull request #3268 from emanuelschuetze/pdf-issue Fixed formatting errors in motion pdf (Fixed #3228).	2017-05-23 22:52:31 +02:00
Emanuel Schütze	eee0e0fc06	Fixed formatting errors in motion pdf (Fixed #3228 ). for diff view	2017-05-23 22:42:14 +02:00
Emanuel Schütze	b9a115d3b8	Merge pull request #3266 from normanjaeckel/RenameFunction Renamed is_user_data_required to required_users. Fixed #3238.	2017-05-23 22:31:28 +02:00
Norman Jäckel	913bec3e53	Renamed is_user_data_required to required_users. Fixed #3238 .	2017-05-22 16:08:52 +02:00
Norman Jäckel	f4c30da4a2	Removed old poll code snippets. Fixed #3179 .	2017-05-22 15:51:55 +02:00
Emanuel Schütze	32610e552c	Changed PdfImageConverter to ImageConverter (Fixed #3263 ).	2017-05-21 22:20:57 +02:00
FinnStutzenstein	e7da35398d	Export personal note and comments in PDFs.	2017-05-19 14:31:58 +02:00
Emanuel Schütze	8abfe91853	Merge pull request #3258 from FinnStutzenstein/docx Rework docx parser, add comments to docx	2017-05-19 14:02:29 +02:00
FinnStutzenstein	f4c4f2553b	Rework docx parser, add comments to docx	2017-05-19 13:55:09 +02:00
FinnStutzenstein	e396347e00	Also notify users when they inline edit a motion (fixes #2360 )	2017-05-19 13:21:19 +02:00
Emanuel Schütze	3b2c7634f0	Merge pull request #3256 from FinnStutzenstein/Issue3243 extending the color parser (fixes #3243)	2017-05-19 08:46:32 +02:00
Norman Jäckel	94aceeffab	Merge pull request #3237 from tsiegleauq/issue3180-scale-images enables pdf image scaling for CKEditor	2017-05-18 21:34:06 +02:00
Tobias Hößl	7109c75246	Remove color styles insert .insert/.delete-Paragraphs - fixes #3247	2017-05-17 21:38:35 +02:00
FinnStutzenstein	a23e263dcb	extending the color parser (fixes #3243 )	2017-05-17 09:13:10 +02:00
FinnStutzenstein	91882f1d13	Improve zip creation and fixing page numbers	2017-05-17 07:54:35 +02:00
Emanuel Schütze	6eec735c8e	Merge pull request #3252 from FinnStutzenstein/PdfZipFilenames Fixing PDF filenames on zip export if no identifier is given	2017-05-16 20:58:28 +02:00
Emanuel Schütze	d5b9a5c590	Merge pull request #3244 from normanjaeckel/Fix3242 Removed default permissions for personal note. Updated Yarn lock. Fix…	2017-05-16 20:26:01 +02:00
Emanuel Schütze	c2a271c422	Merge pull request #3254 from emanuelschuetze/Issue3229-Broken-HTML Detect broken HTML after diff (Fixed #3229)	2017-05-16 14:25:00 +02:00
Tobias Hößl	b340256541	Detect broken HTML after diff (Fixed #3229 )	2017-05-16 12:19:18 +02:00
Emanuel Schütze	f46ad742e3	Merge pull request #3230 from FinnStutzenstein/Issue3219 Cleanup MotionUpdateCtrl (fixes #3219)	2017-05-15 14:17:55 +02:00
Emanuel Schütze	e0661e7343	Merge pull request #3248 from FinnStutzenstein/ExportDialogFilename Fixing error when downloading	2017-05-15 13:45:07 +02:00
Emanuel Schütze	601e2ea2b5	Merge pull request #3249 from FinnStutzenstein/MediafilePdfPageFix Fixing page controls in mediafiles list view	2017-05-15 13:41:50 +02:00
FinnStutzenstein	d1f0b69d35	Fixing PDF filenames on zip export if no identifier is given	2017-05-12 12:02:01 +02:00
FinnStutzenstein	8f070ffaa1	Fixing user list pdf	2017-05-11 12:47:01 +02:00
sean	eb259dc5e2	enables pdf image scaling for CKEditor	2017-05-10 13:50:52 +02:00
FinnStutzenstein	90c8ce5bf0	Fixing page controls in mediafiles list view	2017-05-10 09:26:31 +02:00
FinnStutzenstein	17d9615631	Fixing error when downloading	2017-05-10 09:04:19 +02:00
Norman Jäckel	754116cdca	Removed default permissions for personal note. Updated Yarn lock. Fixed #3242 .	2017-05-09 13:49:56 +02:00
Norman Jäckel	2833341867	Merge pull request #3235 from tsiegleauq/issue3231-long-lines-in-lists fix long lines in pdf list (fixes #3231)	2017-05-08 13:06:48 +02:00
Norman Jäckel	db1d087aa0	Merge pull request #3236 from CatoTH/Issue3226-WhitespacesDisturbingLineExtraction Bugfix: whitespaces were disturbing line extraction - fixes #3226	2017-05-08 13:06:13 +02:00
sean	37b96bb0bc	fix long lines in pdf list (fixes #3231 )	2017-05-07 22:01:50 +02:00
FinnStutzenstein	118cff6964	Fixing wrong err call	2017-05-05 17:25:34 +02:00
Norman Jäckel	ebabc291c5	Refactoring of data parsing for startup and autoupdate.	2017-05-03 08:58:29 +02:00
Oskar Hahn	4963bfa7bf	Changed restricted data parsing. Cached full data on startup.	2017-05-01 21:52:16 +02:00
Tobias Hößl	b0a569fdf3	Bugfix: whitespaces were disturbing line extraction	2017-05-01 15:55:51 +02:00
FinnStutzenstein	adb5185fcc	Cleanup MotionUpdateCtrl (fixes #3219 )	2017-04-28 14:18:29 +02:00
FinnStutzenstein	239d56f350	Fixing PDF in IE11 (fixes #3206 , fixes #3217 )	2017-04-28 13:16:46 +02:00
Emanuel Schütze	c7c7bfca9c	Merge pull request #3222 from emanuelschuetze/translations Updated German translations.	2017-04-27 15:38:10 +02:00
Emanuel Schütze	dd99be5e69	Merge pull request #3221 from normanjaeckel/ChangeKeyError Fixed error for internal function get_model_from_collection_string.	2017-04-27 15:34:39 +02:00
Emanuel Schütze	a77a4edb75	Merge pull request #3220 from normanjaeckel/CleanUp Removed unused lines.	2017-04-27 15:33:42 +02:00
Emanuel Schütze	0cc4b0c578	Updated German translations.	2017-04-27 15:26:35 +02:00
Norman Jäckel	4bdb06bd9b	Fixed error for internal function get_model_from_collection_string.	2017-04-27 15:16:07 +02:00
Norman Jäckel	9781c0b73b	Removed unused lines.	2017-04-27 15:09:42 +02:00
Emanuel Schütze	941ac8809e	Merge pull request #3208 from tsiegleauq/logos-in-pdf add logos in PDF	2017-04-27 15:08:36 +02:00
Emanuel Schütze	9387f83f8a	Merge pull request #3212 from normanjaeckel/Notify Added notify system.	2017-04-27 15:07:15 +02:00
Emanuel Schütze	11aacc71b6	Merge pull request #3216 from ostcar/early_websocket_open Open websocket connections immediately	2017-04-27 13:13:00 +02:00
FinnStutzenstein	349505ac3d	Added a warning, if another user edits the same motion.	2017-04-27 13:09:24 +02:00
Emanuel Schütze	7c8bc935f8	Show pdf footer logo. Fixed layout.	2017-04-27 12:58:11 +02:00
FinnStutzenstein	fb45d30a34	Changed PDF documentProvider to accept images and some cleanup.	2017-04-27 12:58:11 +02:00
Sean Engelhardt	2b94dc5942	Added configurable header and footer logos for PDF.	2017-04-27 12:58:11 +02:00
Oskar Hahn	74c1cc63dc	Open websocket connections immediately Also made a performance boost to get_model_from_collection_string()	2017-04-27 12:54:16 +02:00
Norman Jäckel	bd68997a5d	Added notify system.	2017-04-27 09:30:02 +02:00
FinnStutzenstein	96899f63cc	Personal note (client side)	2017-04-27 09:10:46 +02:00
Norman Jäckel	6aee27e49f	Added personal notes for motions (server side part).	2017-04-27 09:10:46 +02:00
Emanuel Schütze	4cd9d20435	Improved motion catalog pdf for one/mutliple motions.	2017-04-24 14:53:42 +02:00
Emanuel Schütze	9ebf3509c0	Updated translation files and German translation.	2017-04-24 10:44:32 +02:00
Emanuel Schütze	b06f10dea8	Merge pull request #3210 from FinnStutzenstein/SpeakerSort Fixing issue when sorting a new inserted speaker	2017-04-24 09:54:51 +02:00
FinnStutzenstein	7d1b65429e	Fixing issue when sorting a new inserted speaker.	2017-04-24 09:45:53 +02:00
Sean Engelhardt	3cb07c97dc	Added more distance in motion PDF for DEL-tags in new lines (fixes #3205 ).	2017-04-24 09:43:18 +02:00
Norman Jäckel	24e7d42f6f	Merge pull request #3207 from FinnStutzenstein/LogoHeader Configurable projector header	2017-04-21 22:09:18 +02:00
Emanuel Schütze	8c4ec1c218	Merge pull request #3202 from CatoTH/Issue3107-BugfixLineLengthCaching Bugfix: changing line length did not invalidate cache	2017-04-19 15:03:48 +02:00
FinnStutzenstein	61058fac49	Configurable projector header image	2017-04-19 14:54:31 +02:00
Tobias Hößl	9d2edc23e4	Bugfix: changing line length did not invalidate cache	2017-04-19 14:49:43 +02:00
Norman Jäckel	8380e97f93	Merge pull request #3198 from CatoTH/Issue3183-getTextNoLineBreaks Add a parameter 'lineBreaks' to getTextByMode	2017-04-19 14:45:24 +02:00
Emanuel Schütze	3614ba9451	Fixed compare of duplicated users while csv user import.	2017-04-19 13:38:06 +02:00
FinnStutzenstein	d78a7f91bc	Fix clearing empty chat messages (fixes #3192 )	2017-04-19 08:00:18 +02:00
Tobias Hößl	a558e190ea	Add a parameter 'lineBreaks' to getTextByMode	2017-04-18 14:52:15 +02:00
Norman Jäckel	21418f632f	Added support for password validation using Django or custom validators e. g. for minimum password length.	2017-04-13 16:20:38 +02:00
Emanuel Schütze	7d2785b9ec	Merge pull request #3189 from FinnStutzenstein/pdf-zip Pdf zip	2017-04-13 11:54:19 +02:00
Emanuel Schütze	768cc5f711	Merge pull request #3196 from emanuelschuetze/motionCommentRegression Fixed regression that opening of motion create form failed.	2017-04-12 20:12:57 +02:00

... 4 5 6 7 8 ...

3844 Commits