OpenSlides

Author	SHA1	Message	Date
Tobias Hößl	afff1f35f8	Solving two bugs in the diff	2017-02-15 20:23:29 +01:00
Emanuel Schütze	be342f752f	Merge pull request #2966 from emanuelschuetze/issue2956 Send only data to client which user is allowed to see (Fixed #2956).	2017-02-15 20:18:45 +01:00
Emanuel Schütze	ae6496852e	Merge pull request #2959 from emanuelschuetze/issue2954 Added missing topic text to agenda csv export (Fixed #2954).	2017-02-15 20:18:01 +01:00
Norman Jäckel	1a53c7c3cc	Fixed write settings command for Windows portable version. Fixed #2947 .	2017-02-15 17:07:59 +01:00
Emanuel Schütze	3e92799838	Send only data to client which user is allowed to see (Fixed #2956 ). Fixed get_restricted_data functions for motion and mediafiles.	2017-02-15 16:51:44 +01:00
Emanuel Schütze	aa0791fc34	Added missing topic text to agenda csv export (Fixed #2954 ).	2017-02-15 14:46:25 +01:00
Sean Engelhardt	4eefde839b	pdf w.o linen numbers and change rec. (fixes #2962 )	2017-02-15 14:23:28 +01:00
Oskar Hahn	26b7f2879c	Let CollectionElement fail early Fixes #2835 Fixes #2904	2017-02-12 14:15:58 +01:00
Emanuel Schütze	1c79e2c8ee	Update version to 2.1b4-dev	2017-02-10 23:40:18 +01:00
Emanuel Schütze	2aae6d43eb	Release 2.1b3	2017-02-10 23:39:52 +01:00
Emanuel Schütze	75fa1fdb7b	Merge pull request #2945 from emanuelschuetze/assignment-projector-fix Fixed outdated assignment phases variable in projetor.js.	2017-02-10 23:36:15 +01:00
Emanuel Schütze	67b5b4ca32	Updated German translations.	2017-02-10 23:28:38 +01:00
Emanuel Schütze	41b30d70b6	Fixed outdated assignment phases variable in projetor.js. Removed wrong translation string.	2017-02-10 23:26:38 +01:00
Emanuel Schütze	1230f4a29a	New full text search on client-side (Fixed #2865 ). Removed server-side search by whoosh.	2017-02-10 22:52:08 +01:00
Emanuel Schütze	311b134d81	Merge pull request #2939 from FinnStutzenstein/Encoding Added UTF-8 byte order mark for csv export	2017-02-10 21:23:09 +01:00
FinnStutzenstein	30a3382bd1	Added UTF-8 byte order mark for csv export and global csv separator config	2017-02-10 20:47:57 +01:00
Norman Jäckel	97de8cf785	Merge pull request #2942 from FinnStutzenstein/Issue2864 check if startup promise is resolved	2017-02-10 14:25:19 +01:00
FinnStutzenstein	8f613177cb	check if startup promise is resolved	2017-02-10 10:23:46 +01:00
FinnStutzenstein	b73c50a4f9	Fixed missing <p> tags for motion import and some improvements.	2017-02-10 09:11:45 +01:00
Norman Jäckel	160333beea	Merge pull request #2931 from FinnStutzenstein/Issue2669 Reorganize the current list of speakers. Fixes #2669 and find()-calls	2017-02-09 20:06:43 +01:00
FinnStutzenstein	3c36cd5757	Reorganize the current list of speakers. Fixes #2669 and find()-calls.	2017-02-07 12:24:54 +01:00
Emanuel Schütze	eb0d34d212	Merge pull request #2937 from FinnStutzenstein/Issue2560 Inline edit the ballot description (closes #2560)	2017-02-07 12:00:56 +01:00
FinnStutzenstein	38279f4895	Inline edit the ballot description (closes #2560 )	2017-02-07 11:53:09 +01:00
Emanuel Schütze	b4eff0ea1a	Updated German translations.	2017-02-07 09:16:12 +01:00
Emanuel Schütze	f66e551eaa	Merge pull request #2936 from FinnStutzenstein/MotionReason Set resaon on save with CKEditor (fixes #2934)	2017-02-06 17:29:09 +01:00
FinnStutzenstein	bacadd6931	Set resaon on save with CKEditor (fixes #2934 )	2017-02-06 14:50:51 +01:00
Emanuel Schütze	12b50a0d68	Merge pull request #2935 from emanuelschuetze/motion-pdf-subtitle PDF Layout improvements	2017-02-06 14:44:06 +01:00
Norman Jäckel	2e410599bb	Merge pull request #2932 from emanuelschuetze/fix-category-numbering Fixed motion numbering in category sort view.	2017-02-06 14:29:19 +01:00
Emanuel Schütze	80b9ce138f	PDF Layout improvements - Added parent motion into subtitle of motion pdf. (for amendments only). - Adapted page margin and footer. - Use same line height also for outside line numbering. - Add more margin-top for motion reason heading.	2017-02-06 14:22:13 +01:00
Emanuel Schütze	f238125a23	Fixed motion numbering in category sort view. Removed blanks if MOTION_IDENTIFIER_WITHOUT_BLANK is True.	2017-02-06 12:11:50 +01:00
Emanuel Schütze	341916123c	Fix word-wrap for long motion identifier in Firefox.	2017-02-03 14:02:36 +01:00
Emanuel Schütze	3ca254c88e	Show/hide internal items in agenda sort view.	2017-02-03 12:50:57 +01:00
Emanuel Schütze	e7ee8fbc07	Fixed some minor template styles. Use always css class 'btn-sm' for buttons and 'input-sm' for inputs in list and detail templates for consistent appearance.	2017-02-03 12:50:57 +01:00
Emanuel Schütze	bbd8782c4c	Fix 'follow recommendation for all motions' function. in motion block detail view	2017-02-03 12:50:52 +01:00
Norman Jäckel	6f05fc09ce	Merge pull request #2929 from FinnStutzenstein/Issue2927 Fixing merge conflicts (fixes #2927)	2017-02-03 11:54:21 +01:00
Norman Jäckel	aade91cead	Merge pull request #2926 from emanuelschuetze/issue-2923 Fixed dynamic pdf header and footer for worker (Fixed #2923).	2017-02-03 11:53:34 +01:00
Emanuel Schütze	3d60238ce1	Fixed dynamic pdf header/footer and table border (Fixed #2923 ). Updated pdfmake to 0.1.25. Fixed some pdf style issues. Updated gulp watch task.	2017-02-03 11:33:46 +01:00
FinnStutzenstein	4bc9a26c4c	Fixing merge conflicts (fixes #2927 )	2017-02-03 08:40:48 +01:00
Norman Jäckel	8c53b53a9d	Added server side sort view for agenda items. See #2452 .	2017-02-01 14:23:59 +01:00
Emanuel Schütze	bcff33330c	Merge pull request #2922 from normanjaeckel/Console Removed console.log call.	2017-02-01 13:36:00 +01:00
Norman Jäckel	9ff9ac92be	Removed console.log call.	2017-02-01 12:55:26 +01:00
Norman Jäckel	b6db7d481b	Merge pull request #2895 from FinnStutzenstein/Issue2885 Possibility to send extra startup data (closes #2885)	2017-02-01 11:45:21 +01:00
FinnStutzenstein	aed18205c4	showing config save status (closes #2842 )	2017-01-31 18:54:02 +01:00
FinnStutzenstein	49e32d8e57	Possibility to send extra startup data (closes #2885 )	2017-01-31 13:17:42 +01:00
Emanuel Schütze	c8cd1a7210	Merge pull request #2917 from FinnStutzenstein/Worker Use workers for pdf generation	2017-01-31 12:02:43 +01:00
FinnStutzenstein	e1b4c1fc68	Used worker for pdf generation. Moved pdfmake.createPdf() into a web worker thread to prevent blocking UI and max_script_runtime error in browser. Used gulp to manage separate worker files (pdf-worker and pdf-worker-lib).	2017-01-30 23:03:29 +01:00
Emanuel Schütze	f5fab05388	Merge pull request #2920 from emanuelschuetze/fixAssignmentVoteOrder Fixed wrong order of assignment votes caused by redis cache.	2017-01-30 22:57:45 +01:00
Emanuel Schütze	83e16b0b09	Fixed wrong order of assignment votes caused by redis cache.	2017-01-30 21:33:41 +01:00
Emanuel Schütze	39037af662	Merge pull request #2896 from FinnStutzenstein/Issue2871 Prevent XSS-attacks (fixes #2871)	2017-01-30 21:11:46 +01:00
FinnStutzenstein	d55d374211	Prevent XSS-attacks (fixes #2871 )	2017-01-30 21:04:41 +01:00
Oskar Hahn	6b5c329605	Fix the migration of the groups. Fixes #2915	2017-01-27 11:59:31 +01:00
Emanuel Schütze	1d969838f2	Update version to 2.1b3-dev	2017-01-26 21:47:11 +01:00
Emanuel Schütze	e2fb1a60a1	Release 2.1b2	2017-01-26 21:46:21 +01:00
Emanuel Schütze	f10a3ffcb3	Merge pull request #2913 from emanuelschuetze/translations Updated translations (CS, ES, PT, FR).	2017-01-26 21:42:57 +01:00
Emanuel Schütze	8234340a0c	Merge pull request #2909 from ostcar/rework_auth Created a function to convert anything possible to a user-collection-element or None	2017-01-26 21:42:40 +01:00
Emanuel Schütze	b3800ad873	Updated translations (CS, ES, PT, FR).	2017-01-26 21:37:29 +01:00
Norman Jäckel	ad937aecb3	Typos and small changes.	2017-01-26 21:35:26 +01:00
Emanuel Schütze	c36835a40e	Merge pull request #2910 from emanuelschuetze/redis-prefix Use custom redis prefix for asgi and cache entries.	2017-01-26 21:24:05 +01:00
Oskar Hahn	5dcfc69ff8	Update settings.py.tpl Also the last line of a dict should end with a ',' or with the closing }	2017-01-26 21:17:36 +01:00
Emanuel Schütze	98e6f703e1	Use custom redis prefix for asgi and cache entries. Note: These prefix have to be unique for each OpenSlides instance!	2017-01-26 21:17:32 +01:00
Norman Jäckel	2872cd437c	Fixed bug in motion set_identifier method. Fixed #2911 .	2017-01-26 21:03:10 +01:00
Oskar Hahn	2daafa8db9	Created a function to convert anything possible to a user-collectoin-element or None Changed user.has_perm(...) to has_perm(user, ...) at any place. Removed old code	2017-01-26 18:57:10 +01:00
Emanuel Schütze	8897e22df0	Merge pull request #2907 from emanuelschuetze/pagination Used better pagination for agenda, motions and users.	2017-01-25 21:23:45 +01:00
FinnStutzenstein	35903cbe97	Watch perms in client (closes #1855 )	2017-01-25 20:19:25 +01:00
Emanuel Schütze	df3e691734	Used better pagination for agenda, motions and users. to increase the browser performance while switching between apps.	2017-01-25 19:51:51 +01:00
Norman Jäckel	df60700612	Merge pull request #2882 from normanjaeckel/ChannelSendWait Let channels' send method wait and retry if channel layer is full.	2017-01-25 16:40:43 +01:00
Emanuel Schütze	0d30c72270	Added trim function for get_full_name/get_short_name. Required by submitter comparison for motion import.	2017-01-25 14:38:51 +01:00
Norman Jäckel	e0d5f6d92f	Merge pull request #2881 from ostcar/has_perm_with_id Changed the function has_perm to support an user id or None as the fi…	2017-01-24 22:17:12 +01:00
Oskar Hahn	44474049c3	Added docstrings	2017-01-24 15:16:29 +01:00
Oskar Hahn	fccde8de11	Changed the function has_perm to support an user id or None as the first argument. Also fixt the case, where an anonymous user connects to the websocket connection. Also added a function anonymous_is_enabled() to see, if the anyonmous user is enabled. Added pip freeze to travis to see installed versions.	2017-01-24 15:16:29 +01:00
FinnStutzenstein	40c2cdbe50	Fixing missing ballot resolver	2017-01-24 12:40:44 +01:00
FinnStutzenstein	9247009f1c	Csv export for IE (closes #2898 )	2017-01-23 16:24:25 +01:00
FinnStutzenstein	2b8a1168e0	Removing unnecessary resolvers (closes #2869 , closes #2892 )	2017-01-20 11:52:27 +01:00
Norman Jäckel	a724898ba3	Merge pull request #2875 from matakuka/removespeakers delete list of speaker error messages (closes #2237)	2017-01-19 13:22:28 +01:00
Emanuel Schütze	8daaebbcd0	Updated translation resource and German translation file.	2017-01-19 10:43:04 +01:00
Emanuel Schütze	b2dfc9b44e	Fixed translation strings.	2017-01-19 10:42:26 +01:00
Emanuel Schütze	52602d8330	Merge pull request #2884 from FinnStutzenstein/MotionProject Reorder projection of motions (fixes #2883)	2017-01-18 19:07:01 +01:00
Norman Jäckel	f271d8bb47	Fixed error when running manage.py collectstatic. Fixed #2861 .	2017-01-18 15:33:45 +01:00
Maximilian Krambach	929a7e5e89	delete list of speaker error messages (closes #2237 )	2017-01-16 18:37:59 +01:00
FinnStutzenstein	2ac7df2ee6	Reorder projection of motions (fixes #2883 )	2017-01-16 15:15:29 +01:00
FinnStutzenstein	bd0073d2f7	StartUp improvements	2017-01-16 14:32:10 +01:00
Norman Jäckel	bb8748a506	Let channels' send method wait and retry if channel layer is full. Fixed #2353 .	2017-01-15 22:01:09 +01:00
Emanuel Schütze	e9e0280a13	Merge pull request #2878 from FinnStutzenstein/MotionProjectFix Hotfix for motion projection	2017-01-15 13:42:06 +01:00
Norman Jäckel	0546639934	Merge pull request #2866 from FinnStutzenstein/Issue2843 smoothly scroll projector	2017-01-15 13:34:51 +01:00
Emanuel Schütze	4a7ffe9da9	Moved CKEDITOR_BASEPATH into openslides-libs.js (Fixed #2787 )	2017-01-15 13:04:31 +01:00
Emanuel Schütze	befff17969	Merge pull request #2873 from normanjaeckel/MotionCommentProtection Fixed bug in relation for motion comment. Fixed #2568.	2017-01-15 12:27:17 +01:00
Emanuel Schütze	1672c2de66	Merge pull request #2872 from normanjaeckel/AgendaComment Fixed security issue #2850: Comments were shown for unprivileged users.	2017-01-15 12:23:22 +01:00
Norman Jäckel	9250055e35	Merge pull request #2876 from emanuelschuetze/issue2763 Adapted motion DOCX template.	2017-01-15 12:21:27 +01:00
Emanuel Schütze	0eb4f67a48	Use always '/' at the end of projector url. e.g. '/projector/1/' or '/real-projetor/1/'	2017-01-15 12:13:46 +01:00
FinnStutzenstein	b419818b20	Hotfix for motion projection	2017-01-15 12:04:16 +01:00
Emanuel Schütze	986e8cc4f6	Adapted motion DOCX template (Fixed #2763 ).	2017-01-15 10:59:09 +01:00
FinnStutzenstein	a3b7b92239	smoothly scroll projector	2017-01-15 10:56:26 +01:00
Norman Jäckel	c6b1df9e24	Fixed security issue #2850 : Comments were shown for unprivileged users.	2017-01-15 10:26:37 +01:00
Norman Jäckel	f086d055b6	Fixed bug in relation for motion comment. Fixed #2568 .	2017-01-15 10:20:45 +01:00
Emanuel Schütze	624fcc663b	Merge pull request #2863 from FinnStutzenstein/StartUp Start up	2017-01-14 21:46:16 +01:00
FinnStutzenstein	a6d1eeb9c3	Worked on startup process. - fix group view on reload	2017-01-14 21:23:05 +01:00
Norman Jäckel	481a36501f	Refactored WhoAmI view and startup process.	2017-01-14 21:22:40 +01:00
Norman Jäckel	8bb0918372	Merge pull request #2825 from FinnStutzenstein/CsvImports New csv import for users and topics	2017-01-14 20:52:09 +01:00
Oskar Hahn	ebf686ef34	Send all data to the client at startup	2017-01-14 20:42:38 +01:00
FinnStutzenstein	397d659f0b	New csv import for users and topics	2017-01-14 18:29:05 +01:00
Norman Jäckel	4b03a7ad5b	Merge pull request #2831 from normanjaeckel/UserLoginTimestamp Skipped autoupdate for user during login. See #2804.	2017-01-14 17:48:32 +01:00
Norman Jäckel	acab868c79	Quickfix for #2865 . The problem is not completely solved.	2017-01-14 17:15:30 +01:00
Norman Jäckel	aefd5073a7	Skipped autoupdate for user during login. See #2804 .	2017-01-14 16:45:14 +01:00
Norman Jäckel	560b820b57	Merge pull request #2855 from emanuelschuetze/issue2623 Validates open posts field of assignment form (Fixes #2623)	2017-01-14 16:16:35 +01:00
Emanuel Schütze	4faf580239	Validates open posts field of assignment form (Fixes #2623 )	2017-01-14 15:30:02 +01:00
Norman Jäckel	286119108c	Merge pull request #2860 from FinnStutzenstein/Issue2852 adding permission checks	2017-01-14 15:12:19 +01:00
Norman Jäckel	3600dd58f0	Merge pull request #2858 from emanuelschuetze/issue2142 Assignment list: Used number of candidates, removed number of needed …	2017-01-14 15:11:21 +01:00
Emanuel Schütze	527f949968	Assignment list: Used number of candidates, removed number of needed candidates (Fixes #2142 )	2017-01-14 12:55:51 +01:00
Emanuel Schütze	d76162e3b0	Increased the cache option MAX_ENTRIES from 1000 to 10000 (Fixes #2828 ).	2017-01-14 12:46:23 +01:00
FinnStutzenstein	794db79511	adding permission checks	2017-01-14 12:13:38 +01:00
Emanuel Schütze	458a7cf7c4	Merge pull request #2846 from normanjaeckel/MotionBlockSecu Fixed motion create view. Fixed #2506.	2017-01-14 12:10:51 +01:00
Emanuel Schütze	8c4b38f018	Merge pull request #2847 from FinnStutzenstein/Issue2844 Group order and hide internal items filter	2017-01-14 11:39:51 +01:00
Emanuel Schütze	8c9bde27fb	Merge pull request #2853 from normanjaeckel/ManagePy Added error message for unknown args. Fixed #2200.	2017-01-14 11:39:17 +01:00
Norman Jäckel	a918361ec5	Fixed motion create view. Fixed #2506 .	2017-01-14 11:38:20 +01:00
FinnStutzenstein	f092d6670d	Group order, hide internal items filter, hide comment in agenda list view	2017-01-14 10:51:07 +01:00
Norman Jäckel	aa47ecbf8a	Added error message for unknown args. Fixed #2200 .	2017-01-14 10:48:41 +01:00
Emanuel Schütze	99a771ac6c	Merge pull request #2845 from FinnStutzenstein/Issue2833 Fixing user list view with restricted permissions (closes #2833)	2017-01-14 10:47:12 +01:00
Norman Jäckel	663feff806	Merge pull request #2848 from emanuelschuetze/issue2421 Added text to empty assignment poll result slide (Fixed #2421)	2017-01-14 10:41:24 +01:00
Emanuel Schütze	35a5d4fe3b	Merge pull request #2839 from FinnStutzenstein/Issue2838 Fixing #2838	2017-01-14 10:40:57 +01:00
Emanuel Schütze	113aac59b3	Added text to empty assignment poll result slide (Fixed #2421 )	2017-01-14 10:21:19 +01:00
FinnStutzenstein	76e6bac422	Fixing #2838	2017-01-14 10:21:14 +01:00
FinnStutzenstein	c0f092d811	Fixing user list view with restricted permissions (closes #2833 )	2017-01-14 09:57:45 +01:00
Norman Jäckel	d22dff2743	Merge pull request #2841 from flanagan/remove-summary Removed recommendation motion summary on slide.	2017-01-13 21:32:50 +01:00
Meinert Leinigen	d133199a73	Removed Recommendation motion summary	2017-01-13 21:28:03 +01:00
Oskar Hahn	1dc671430a	Fix channels	2017-01-13 20:53:06 +01:00
Oskar Hahn	728576d514	Performance improvements * Add caching support to users/group * Add a function has_perm that works with the cache. * Removed our session backend so other session backends (without the database) can be used	2017-01-13 13:37:18 +01:00
FinnStutzenstein	b44b58393d	Motion comments inline editing	2017-01-11 20:59:50 +01:00
Emanuel Schütze	a6807d77bf	Added groups_id to management command 'createopenslidesuser'.	2017-01-11 13:46:56 +01:00
Emanuel Schütze	962c06c85f	Merge pull request #2820 from FinnStutzenstein/Issue2667 Change user import table	2017-01-10 21:22:39 +01:00
Norman Jäckel	8e385199d5	Merge pull request #2826 from FinnStutzenstein/Issue2805 Do not enable inline editing for non privileged users	2017-01-10 21:13:52 +01:00
Oskar Hahn	97b21427aa	Change the way that missing cache ids are found. This is probalby faster but in any way it maks debugging a lot easier. To go though a big list in a for-loop is no fun at all.	2017-01-10 20:50:44 +01:00
FinnStutzenstein	cf7033e033	Do not enable inline editing for non privileged users	2017-01-09 16:03:09 +01:00
Emanuel Schütze	17b951058b	Merge pull request #2821 from emanuelschuetze/no-amendments Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.	2017-01-09 14:33:57 +01:00
Emanuel Schütze	41124a53ca	Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS. Set settings value to False to disable new amendment button in motion detail template. Default: True.	2017-01-09 14:25:28 +01:00
FinnStutzenstein	a9fbbb522e	Change user import table	2017-01-09 14:22:32 +01:00
Norman Jäckel	58d8f68cc5	Merge pull request #2814 from FinnStutzenstein/ConfigEditor Use ckeditor in config	2017-01-09 14:19:32 +01:00
Emanuel Schütze	6502f36a90	Merge pull request #2796 from FinnStutzenstein/Issue2548 Project change recommendations	2017-01-09 09:27:46 +01:00
Norman Jäckel	1a88f0985a	Merge pull request #2818 from emanuelschuetze/motion-identifier-without-blanks Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.	2017-01-08 13:43:20 +01:00
FinnStutzenstein	e8fa488d60	Project change recommendations	2017-01-07 14:48:11 +01:00
FinnStutzenstein	4530a5faed	Use ckeditor in config	2017-01-07 14:45:58 +01:00
Emanuel Schütze	f4d468a6f6	Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS. Allow to remove all whitespaces from motion identifier if settings value is True. Default: False. Example: "B 1 - Ä 1" -> "B1-Ä1"	2017-01-06 21:38:08 +01:00
Emanuel Schütze	11c0b0cc3f	Merge pull request #2816 from FinnStutzenstein/Issue2127 Use ckeditor to edit projector messages	2017-01-06 21:28:48 +01:00
FinnStutzenstein	c3fc7d0f1b	Do not project more than one message	2017-01-06 19:48:37 +01:00
FinnStutzenstein	6e7321d2a3	disable edit button if it is not possible to edit	2017-01-06 14:51:27 +01:00
FinnStutzenstein	f37ad0f6c3	Use ckeditor to edit projector messages	2017-01-06 12:45:30 +01:00
Maximilian Krambach	a31ffd1009	print correct number of ballots (closes #2504 )	2017-01-06 11:39:55 +01:00
Emanuel Schütze	cc0c0bf0d4	Merge pull request #2783 from FinnStutzenstein/PapaParse New csv import using PapaParse	2017-01-06 11:33:06 +01:00
Norman Jäckel	c12d985ab6	Merge pull request #2810 from tsiegleauq/issue2665-qr-code-pdf Add QR code in user access list pdf (fixes #2665)	2017-01-06 11:08:22 +01:00
FinnStutzenstein	f5fa3575df	New csv import using PapaParse	2017-01-06 10:50:03 +01:00
Emanuel Schütze	388e6353cc	Show qr codes in access data pdf only if config fields are set. Disable footer with page numbers.	2017-01-04 22:43:17 +01:00
Sean Engelhardt	9abf9d5d57	Add QR codes to access data list (fixes #2665 )	2017-01-04 15:50:20 +01:00
Maximilian Krambach	912dc1af8f	Bind mediafile to projector scope (fixes #2706 )	2016-12-29 11:37:56 +01:00
Norman Jäckel	900ddaabb3	Merge pull request #2803 from emanuelschuetze/participant-number2 Added "No." for participant number in get_full_name().	2016-12-21 12:33:12 +01:00
Emanuel Schütze	c79e779934	Added "No." for participant number in get_full_name().	2016-12-21 12:08:37 +01:00
Norman Jäckel	7b0dca84d2	Merge pull request #2801 from FinnStutzenstein/Issue2754 More select mode options for users	2016-12-21 11:57:20 +01:00
Norman Jäckel	286643ddd2	Merge pull request #2797 from FinnStutzenstein/Issue2653 projector language (closes #2653)	2016-12-21 11:55:49 +01:00
Norman Jäckel	bfa0b4b3fe	Merge pull request #2800 from FinnStutzenstein/Issue2748 Consistent time handling and generic time converter code	2016-12-21 11:52:47 +01:00
FinnStutzenstein	365c122edd	More select mode options for users	2016-12-21 10:42:34 +01:00
FinnStutzenstein	f9f64b3e31	projector language (closes #2653 )	2016-12-21 10:41:06 +01:00
FinnStutzenstein	6454853bf6	Consistent time handling and generic time converter code	2016-12-21 10:09:27 +01:00
Emanuel Schütze	be66a26353	Move participant number to the end of get_full_name().	2016-12-21 08:59:50 +01:00
Emanuel Schütze	16ff9200a9	Merge pull request #2782 from FinnStutzenstein/AssignmentSort Sort candidates in assignments	2016-12-19 19:47:38 +01:00
Emanuel Schütze	ff444eaa5d	Merge pull request #2795 from CatoTH/Issue2777-pdf-problems Bugfix for PDF-export - fixes #2777	2016-12-19 19:46:44 +01:00
Tobias Hößl	159720b983	Bugfix for PDF-export - fixes #2777	2016-12-19 16:17:36 +01:00
FinnStutzenstein	3b1ab265eb	Sort candidates in assignments	2016-12-19 16:03:45 +01:00
FinnStutzenstein	a24b4aed99	cookie handling on login	2016-12-19 14:14:46 +01:00
Norman Jäckel	655a1b8f71	Update version to 2.1b2-dev	2016-12-16 23:54:23 +01:00
Norman Jäckel	789a3c308b	Release 2.1b1	2016-12-16 23:54:23 +01:00
Emanuel Schütze	01ab52a637	Use Roboto Medium font for some more 'bold' classes.	2016-12-16 22:10:56 +01:00
Emanuel Schütze	82396a784d	Fixing some remarks for CKEditor PR#2770	2016-12-16 21:43:19 +01:00
Tobias Hößl	08cb6a3d1b	Bugfix for line numbering with CKeditor	2016-12-16 21:43:19 +01:00
Maximilian Krambach	58b8066249	Going back from TinyMCE to CKEditor - Update CKEditor toolbar - CKEditor: new formating options and stripping empty paragraphs from imports - fix for other clipboard html cases not beginning with 'p' tag - Added RemoveFormat button to ckditor toolbar. - Reorder bower.json - inline editor and working on line numbers and language setting - line numbering in inline edit - changed allowed content, line number display, editor toggling - included "justify" in ckeditor - reload original text after ckeditor is disabled - Reorder and extend ckeditor toolbar. - fixed save button trigger and inserted a revert button - set language on editor load (works for inline case only)	2016-12-16 21:43:19 +01:00
Norman Jäckel	4ebb8023e3	Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix Bugfix for #2770	2016-12-16 20:32:54 +01:00
Emanuel Schütze	abe6c0f589	Merge pull request #2786 from normanjaeckel/PatchInMediafile Changed PATCH to PUT for mediafile update. See #1871.	2016-12-16 19:15:25 +01:00
Emanuel Schütze	cd89f72a17	Merge pull request #2778 from emanuelschuetze/inject-improvement Speed up autoupdates	2016-12-16 19:12:45 +01:00
Emanuel Schütze	4b9be816b3	Speed up autoupdates Use 'bulk mode' for DS.inject by calling inject only once per each collection.	2016-12-16 18:55:24 +01:00
Norman Jäckel	75f4c55181	Removed viewpoint for Django url patterns. Fixed #1453 .	2016-12-16 17:01:34 +01:00
Norman Jäckel	11e39e4ed8	Changed PATCH to PUT for mediafile update. See #1871 .	2016-12-16 16:58:31 +01:00
Tobias Hößl	46cf26481e	Bugfix for #2770	2016-12-14 22:28:44 +01:00
Norman Jäckel	1221ef4f02	Rearrange client mediafile app.	2016-12-14 17:16:42 +01:00
Norman Jäckel	deb5c5f4b3	Merge pull request #2774 from matakuka/language Change the language selector to the languages' own names	2016-12-14 16:38:24 +01:00
Maximilian Krambach	0e6324b252	Change the language selector to the languages' own names	2016-12-14 15:25:38 +01:00
Sean Engelhardt	41ceb4ef9d	add special voting values for missed options (fixes #2709 )	2016-12-14 14:05:03 +01:00
Norman Jäckel	cebfbf5b8d	Merge pull request #2633 from normanjaeckel/SquishMigrations Prepare migrations for 2.1b1.	2016-12-13 23:28:56 +01:00
Emanuel Schütze	218b4bc7f4	Remove old countdowns and messages in core migrations.	2016-12-13 17:04:25 +01:00
Emanuel Schütze	78361308aa	Updated EN+DE translations.	2016-12-13 12:20:14 +01:00
Norman Jäckel	3096958ba9	Prepare migrations for 2.1b1. Agenda, Assignments, Core, Mediafiles, Motions, Users. Topics are already done.	2016-12-13 11:58:36 +01:00
Norman Jäckel	c1d4927a9b	Merge pull request #2764 from FinnStutzenstein/Issue2754 More motion select mode options and layout changes for guests	2016-12-13 11:57:51 +01:00
FinnStutzenstein	dbdaa9748c	More motion select mode options and layout changes for guests	2016-12-13 11:27:44 +01:00
Norman Jäckel	6a58174e25	Merge pull request #2765 from FinnStutzenstein/Issue2451 rename mediafiles private flag to hidden	2016-12-13 11:15:53 +01:00
Emanuel Schütze	a9cc8fcb37	Some template style and translation fixes.	2016-12-12 20:30:50 +01:00
FinnStutzenstein	6bbbf30d94	rename mediafiles private flag to hidden	2016-12-12 16:23:31 +01:00
Norman Jäckel	99db9b71b7	Merge pull request #2760 from normanjaeckel/MotionTextIntro Added global config for motion preamble.	2016-12-12 16:23:18 +01:00
Emanuel Schütze	32b7ddedce	Template fixes for motion preamble (#2760 ).	2016-12-12 16:14:32 +01:00
Emanuel Schütze	2bf1b3d827	Merge pull request #2755 from normanjaeckel/StatePermission Fixed state flag required permission to see.	2016-12-12 13:49:07 +01:00
Emanuel Schütze	8780c47fc1	Minor fixes (Fixes #2750 ) - Use <ul> instead of <ol> for candidate lists. - Fix sorting by assignment_related_users.length in list view (Fixes #2750). - Apply category and motion block for new amendments.	2016-12-12 12:58:58 +01:00
Norman Jäckel	7772f60bd4	Added global config for motion preamble.	2016-12-12 12:51:27 +01:00
Norman Jäckel	6dc598800d	Fixed state flag required permission to see.	2016-12-11 22:02:16 +01:00
Emanuel Schütze	116c3702f2	Updated German translations. Added missing translation filter.	2016-12-11 13:37:26 +01:00
Emanuel Schütze	cd08f02949	Updated EN translation file.	2016-12-10 11:14:08 +01:00
Emanuel Schütze	43cdfd3836	Merge pull request #2752 from FinnStutzenstein/MotionState Adding 'done' option in motion state filter	2016-12-09 22:36:32 +01:00
Emanuel Schütze	8289306569	Merge pull request #2746 from emanuelschuetze/fonts Use Roboto font in all templates.	2016-12-09 22:26:38 +01:00
Emanuel Schütze	0bef3d751e	Merge pull request #2742 from emanuelschuetze/missing-translations Mark missing translation strings in table headers.	2016-12-09 15:22:03 +01:00
FinnStutzenstein	efaa00483c	Adding 'done' option in motion state filter	2016-12-09 15:18:35 +01:00
Norman Jäckel	c2edf134e2	Merge pull request #2751 from FinnStutzenstein/Issue2747 Some stylistic changes and new motion filter option	2016-12-09 15:16:50 +01:00
Emanuel Schütze	358fd59d3c	Merge pull request #2749 from FinnStutzenstein/Issue2666 changing user import (closes #2666)	2016-12-09 15:14:42 +01:00
Emanuel Schütze	f6d01c1d17	Mark missing translation strings in table headers.	2016-12-09 15:13:35 +01:00
Emanuel Schütze	fb7b265826	Use Roboto font in all templates. - Only install needed font files for Roboto and Roboto Condensed which strongly reduced the directory size of 'static/font'. - Make it easier to adjust custom font by using global css font definition in app.css and projector.css. - Remove Open Sans font.	2016-12-09 15:10:31 +01:00
FinnStutzenstein	acba95f8a4	changing user import (closes #2666 )	2016-12-09 15:02:32 +01:00
FinnStutzenstein	f7fcb69cc2	Some stylistic changes and new motion filter option	2016-12-09 14:58:15 +01:00
FinnStutzenstein	36c8477c7f	no nav underline glitch	2016-12-09 13:51:23 +01:00
FinnStutzenstein	eca93594d7	Moving csv exports in seperate files (closes #2728 )	2016-12-09 08:08:38 +01:00
Norman Jäckel	787805efa6	Merge pull request #2744 from tsiegleauq/issue2576-parsing-does-not-end add precise text decoration (fixes #2576)	2016-12-07 22:14:49 +01:00
sean	b1f4def743	add precise text decoration (fixes #2576 )	2016-12-07 21:41:55 +01:00
Emanuel Schütze	c363fff3ba	Remove sidebox from assignment slide Feedback from serveral users: open posts and state are not very useful on slide and should be removed.	2016-12-07 21:00:13 +01:00
Emanuel Schütze	8bd03bafdb	Rename first/last name to given name/surname (Fixes #2564 ).	2016-12-07 19:49:25 +01:00
Norman Jäckel	4e5adb74e3	Merge pull request #2739 from CatoTH/Issue2561-pdf-line-numbering-in-lists Attempt to mitigate the list / line number problem	2016-12-07 11:34:50 +01:00
Norman Jäckel	b27a975075	Merge pull request #2737 from FinnStutzenstein/Issue2730 Use session cookies and store filter settings in sessionStorage	2016-12-07 11:25:06 +01:00
FinnStutzenstein	acb5a6dcf9	Use session cookies and store filter settings in sessionStorage	2016-12-07 08:01:33 +01:00
Tobias Hößl	2cb1429c8d	First attempt to mitigate the list / line number problem	2016-12-06 22:12:29 +01:00
FinnStutzenstein	29ae600194	Dynamic webpage title	2016-12-05 18:00:52 +01:00
Emanuel Schütze	a716910b63	Merge pull request #2734 from emanuelschuetze/issue2727 Hot fix for cache update while user import (Fixes #2727).	2016-12-05 13:25:11 +01:00
Emanuel Schütze	405fb1b9d1	Merge pull request #2733 from normanjaeckel/CategorySort Category sort	2016-12-05 13:24:45 +01:00
Emanuel Schütze	b36560bffb	Hot fix for cache update while user import (Fixes #2727 ).	2016-12-05 13:17:35 +01:00
Emanuel Schütze	3888632e14	Merge pull request #2735 from normanjaeckel/FixStatus Fixed typo.	2016-12-05 13:09:25 +01:00
Norman Jäckel	e180b1df29	Fixed sorting of motions in a category. Changed identifiers of amendments during sorting. Fixed #2701 .	2016-12-05 12:59:46 +01:00
Norman Jäckel	8b6844675e	Merge pull request #2732 from CatoTH/bugfix-typo-in-variable-name Typo in variable name	2016-12-05 12:58:56 +01:00
Norman Jäckel	d8c7eda587	Fixed typo.	2016-12-05 12:40:28 +01:00
Norman Jäckel	d0ed0cea23	Improved speed of motion numbering.	2016-12-03 20:57:00 +01:00
Tobias Hößl	940fb14ad6	Typo in variable name	2016-12-03 14:50:39 +01:00
Emanuel Schütze	9009c9e2e9	Updated translations for EN/DE. Fix translation string.	2016-12-02 16:30:03 +01:00
Emanuel Schütze	486f0601eb	Merge pull request #2721 from FinnStutzenstein/AgendaTable Agenda table	2016-12-02 15:59:57 +01:00
Emanuel Schütze	0698327427	Fix minor remarks for #2271 .	2016-12-02 15:49:21 +01:00
Emanuel Schütze	4c37fd8e62	Merge pull request #2726 from normanjaeckel/FollowRecommendationButton Added button to motion detail view to follow recommendation. Closed #…	2016-12-02 15:40:33 +01:00
FinnStutzenstein	ee5adb8fd2	New AgendaTable	2016-12-02 15:18:32 +01:00
Norman Jäckel	49dca65640	Added button to motion detail view to follow recommendation. Closed #2700 .	2016-12-02 14:57:45 +01:00
Norman Jäckel	4d288ec9b2	Merge pull request #2724 from emanuelschuetze/posts Rename 'posts' to 'persons' in assigment templates.	2016-12-02 14:47:11 +01:00
Norman Jäckel	926d04f610	Merge pull request #2723 from FinnStutzenstein/Clock Fixing the clock	2016-12-02 14:46:43 +01:00
Emanuel Schütze	65337ae2d2	Rename 'posts' to 'persons' in assigment templates.	2016-12-02 14:41:34 +01:00
Norman Jäckel	dc0559ef38	Merge pull request #2722 from FinnStutzenstein/Issue2126 Show countdown above messageoverlay (closes #2126)	2016-12-02 14:26:15 +01:00
Norman Jäckel	1ca0b7f291	Merge pull request #2719 from FinnStutzenstein/Issue2693 Translate legal notice	2016-12-02 14:25:51 +01:00
FinnStutzenstein	7e18061e53	Fixing the clock	2016-12-02 14:17:37 +01:00
FinnStutzenstein	cc8cf1ef7a	Show countdown above messageoverlay (closes #2126 )	2016-12-02 12:31:10 +01:00
Emanuel Schütze	7fa5d3b9bb	Merge pull request #2713 from normanjaeckel/SettingsForClient Added settings for client to basic JavaScript code on client startup.…	2016-12-02 10:38:18 +01:00
Emanuel Schütze	a1e33b99d4	Merge pull request #2718 from normanjaeckel/ApplyMotionText Changed config to apply motion text for new amendmend. Closed #2714.	2016-12-02 08:51:46 +01:00
FinnStutzenstein	0f89205038	Translate legal notice	2016-12-02 08:10:06 +01:00
Norman Jäckel	81a01156c1	Changed config to apply motion text for new amendmend. Closed #2714 .	2016-12-02 00:12:37 +01:00
Emanuel Schütze	52b9c651bb	Fixed motion pdf layout for voting result and summary change recommendations	2016-12-01 22:56:42 +01:00
Norman Jäckel	526a5478f7	Added settings for client to basic JavaScript code on client startup. Closed #2697 .	2016-12-01 15:21:11 +01:00
Norman Jäckel	cdc37b4dd5	Merge pull request #2703 from normanjaeckel/LeadingZero Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696.	2016-12-01 14:46:15 +01:00
Norman Jäckel	59599bfba0	Merge pull request #2712 from emanuelschuetze/fixes Minor fixes (Fixes #2710)	2016-12-01 14:42:56 +01:00
Norman Jäckel	ad651300d9	Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696 .	2016-12-01 14:41:12 +01:00
Norman Jäckel	639978a5dc	Refactor motion ans assignment percent and majority calculation.	2016-12-01 14:35:35 +01:00
Maximilian Krambach	32aaaf5b9e	Majority calculation for assignments. Majorities when config YN(A) and simple voting method.	2016-12-01 14:35:35 +01:00
Emanuel Schütze	670251fba9	Minor fixes (Fixes #2710 ) - motion form: show supporters field - motion block slide: show motion identifiers in columns - item list: show open link for motion blocks - use right pdfmake-dist name in bower.json	2016-12-01 14:29:31 +01:00
Emanuel Schütze	9440842e6a	Merge pull request #2708 from emanuelschuetze/issue2626 Improved wording for recommendation config (Fixes #2626)	2016-12-01 11:29:29 +01:00
Emanuel Schütze	80f4cf8f2d	Improved wording for recommendation config (Fixes #2626 ) - updated config label and helptext - added recommendation also to motion slide	2016-12-01 11:05:11 +01:00
Emanuel Schütze	9dd44edb9e	Merge pull request #2698 from FinnStutzenstein/Issue2531 Translate default projector (closes #2531)	2016-12-01 11:02:02 +01:00
Norman Jäckel	510d60ef0f	Merge pull request #2702 from tsiegleauq/assignmentImprove2559 improves the assignments (fixes #2559)	2016-12-01 10:25:57 +01:00
Norman Jäckel	de00e35064	Merge pull request #2704 from tsiegleauq/motionDiffBox Adds the diff-summary box for motions	2016-12-01 10:25:05 +01:00
Norman Jäckel	6aa3ea0d63	Merge pull request #2627 from CatoTH/change-recommendations-inline-diff Showing Diff inline	2016-12-01 10:24:18 +01:00
FinnStutzenstein	b0c94888ce	Translate default projector (closes #2531 )	2016-12-01 07:48:26 +01:00
Emanuel Schütze	bc312efbb9	Fix JS error after project pdf file.	2016-11-30 22:26:11 +01:00
Emanuel Schütze	5ab8b3172b	Merge pull request #2699 from normanjaeckel/TrivialChange Fixed trivial change (disable versioning) checkboxes.	2016-11-30 21:39:50 +01:00
Emanuel Schütze	c466af760c	Motion PDF: Fix line numbers and style in summary box.	2016-11-30 21:13:12 +01:00
Emanuel Schütze	17c464bafa	Merge pull request #2688 from FinnStutzenstein/AssignmentsTable New assignment and mediafile tables and table generics	2016-11-30 14:29:13 +01:00
Sean Engelhardt	8f0c419c3e	Adds the diff-summary box for motions	2016-11-30 14:29:09 +01:00
Sean Engelhardt	2bb440b2aa	improves the assignments (fixes #2559 )	2016-11-30 10:57:51 +01:00
Norman Jäckel	e601ee8e24	Fixed trivial change (disable versioning) checkboxes.	2016-11-29 16:39:54 +01:00
FinnStutzenstein	4f717b6610	New assignment and mediafile tables and table generics	2016-11-29 16:29:29 +01:00
Norman Jäckel	0605395da2	Merge pull request #2687 from FinnStutzenstein/Issue2341 Use plugin verbose name in permission matrix (fixes #2341)	2016-11-29 12:52:30 +01:00
FinnStutzenstein	0446855920	Use pugin verbose name in permission matrix (fixes #2341 )	2016-11-29 11:17:50 +01:00
Emanuel Schütze	5312d44235	Merge pull request #2651 from CatoTH/editing-change-recommendations Editing change recommendations	2016-11-28 21:31:22 +01:00
Emanuel Schütze	b11463fc60	Merge pull request #2690 from CatoTH/bugfix-incorrectly-merging-words Bugfix for merging change recommendations	2016-11-28 21:28:38 +01:00
Emanuel Schütze	a30085f756	Merge pull request #2632 from CatoTH/explicitly-enter-change-recommendation-type Allow to explicitly set the type of a change recommendation	2016-11-28 20:57:21 +01:00
Emanuel Schütze	ddfafd327b	Merge pull request #2655 from CatoTH/Issue2615-line-selection-improvements A small tooltip after selecting the first line when creating a change recommendation	2016-11-28 20:45:07 +01:00
Emanuel Schütze	b971c8db54	Merge pull request #2691 from emanuelschuetze/dialog-improvements Improved forms in ng-dialogs.	2016-11-28 20:41:20 +01:00
Norman Jäckel	7e45e8a9a5	Merge pull request #2689 from FinnStutzenstein/lineNumberFix Missing changes from PR 2678	2016-11-28 20:37:05 +01:00
Emanuel Schütze	e865cfe105	Improved forms in ng-dialogs. - users: use form field in grid layout and add more option to reduce scrolling of long dialog. - agenda/motions/assignment: show parent agenda item field for create dialog only (to prevent corrupt agenda by action 'set my child item as my new parent item') - refactor ng dialog and formly code.	2016-11-27 22:57:56 +01:00
Tobias Hößl	bce74cac2f	Bugfix for merging change recommendations	2016-11-26 21:48:56 +01:00
Tobias Hößl	2958a401ad	Showing Diff inline	2016-11-26 16:50:32 +01:00
Tobias Hößl	f380f63851	A proposition so mitigate #2615	2016-11-26 12:34:26 +01:00
Emanuel Schütze	fb646df1fd	Merge pull request #2680 from FinnStutzenstein/MultiprojectorThings Some improvements for Multiprojector	2016-11-25 15:45:40 +01:00
FinnStutzenstein	51cab5a8c9	Missing changes from PR 2678	2016-11-25 13:23:07 +01:00
Norman Jäckel	d068765db9	Merge pull request #2678 from CatoTH/goto-line-numbers-always-available Make line highlighting and 'Goto'-Feature available on all modes	2016-11-24 00:09:22 +01:00
Norman Jäckel	36dc957f19	Changed tooltips.	2016-11-24 00:07:50 +01:00
Norman Jäckel	d9236c1920	Merge pull request #2681 from FinnStutzenstein/Issue2671 fixing duration in topic import (fixes #2671)	2016-11-24 00:03:52 +01:00
Tobias Hößl	fd82ae348e	Editing change recommendations	2016-11-23 23:42:24 +01:00
Emanuel Schütze	14d00cc404	Merge pull request #2649 from CatoTH/bugfix-disabling-inline-editing Bugfix disabling inline editing	2016-11-23 22:03:31 +01:00
FinnStutzenstein	219204087a	fixing duration in topic import (fixes #2671 )	2016-11-21 15:24:11 +01:00
FinnStutzenstein	88537cf67e	Some improvements for Multiprojector	2016-11-21 15:01:54 +01:00
Emanuel Schütze	829acce22d	Merge pull request #2648 from normanjaeckel/FixBroadcastOnDelete Fixed projector broadcast if projector is deleted. Fixed #2646.	2016-11-20 22:43:47 +01:00
Tobias Hößl	c888419527	Make line highlighting and 'Goto'-Feature available on all modes	2016-11-20 21:55:03 +01:00
Tobias Hößl	ec635d97ee	Bugfix: Affected lines were selectable right after creating a change recommendation	2016-11-19 13:33:06 +01:00
Tobias Hößl	f9325069cf	Bugfix: Calling editing dialog during inline editing	2016-11-19 13:19:08 +01:00
Norman Jäckel	28059698c7	Fixed projector broadcast if projector is deleted. Fixed #2646 .	2016-11-19 13:04:24 +01:00
FinnStutzenstein	0cc8a81320	countdown and message models (closes #2464 )	2016-11-19 12:37:33 +01:00
Tobias Hößl	771f087ade	Allow to explicitly set the type of a change recommendation	2016-11-19 11:57:54 +01:00
Emanuel Schütze	707029c1c3	Updated translation files - EN resources for django and angular-gettext - DE translations - PT translations	2016-11-18 11:24:09 +01:00
Norman Jäckel	a6ec032590	Merge pull request #2642 from emanuelschuetze/cleanup-pdf Remove unused serverside pdf file from users app.	2016-11-18 11:03:23 +01:00
Emanuel Schütze	9c58efbdae	Remove unused serverside pdf file from users app.	2016-11-18 10:50:56 +01:00
Norman Jäckel	9375727f1f	Merge pull request #2631 from CatoTH/change-change-recommendation-views Overhaul change recommendation statuses	2016-11-18 10:49:38 +01:00
Norman Jäckel	9b6fe6e3a2	Merge pull request #2641 from FinnStutzenstein/Issue2609 check if pdf is encrypted (closes #2609)	2016-11-18 10:33:46 +01:00
FinnStutzenstein	e0f78b16a0	New table design for users	2016-11-18 09:42:29 +01:00
FinnStutzenstein	975a76daf4	check if pdf is encrypted	2016-11-18 09:40:36 +01:00
Tobias Hößl	32d3d804b1	Overhaul change recommendation statuses	2016-11-16 22:42:22 +01:00
Emanuel Schütze	f9f9934722	Fixed missplaced comma in pdf header (Fixed #2639 )	2016-11-16 21:05:04 +01:00
Norman Jäckel	e8bf67b185	Merge pull request #2637 from emanuelschuetze/fix-translations Fixed missing translations (Fixed #2616, fixed #2625)	2016-11-15 23:27:02 +01:00
Norman Jäckel	35e54eecbd	Merge pull request #2629 from CatoTH/Issue2617-switch-back-to-original-view Switch back to original view after deleting last change recommendation (Closes #2617)	2016-11-15 23:14:03 +01:00
Norman Jäckel	5899c41840	Merge pull request #2628 from CatoTH/bugfix-wrong-caching-of-extracted-lines Bugfix: Caching of extracted line numbers was invalid…	2016-11-15 23:13:13 +01:00
Emanuel Schütze	f8958e36a6	Fixed missing translations (Fixed #2616 , fixed #2625 )	2016-11-15 21:18:06 +01:00
Emanuel Schütze	2399a8121a	Merge pull request #2634 from normanjaeckel/FixMotionComment Fixed motion projector if comment field is None. Fixed #2614.	2016-11-15 21:01:24 +01:00
Emanuel Schütze	bbdb273a01	Merge pull request #2630 from CatoTH/translation-bugfix Translation Bugfix - Missing line number in german translation	2016-11-15 20:35:20 +01:00
Emanuel Schütze	4d54a2b575	Merge pull request #2622 from FinnStutzenstein/Issue2566 Hotfix for Issue #2566	2016-11-15 20:24:47 +01:00
Emanuel Schütze	b9a325ba5d	Merge pull request #2620 from FinnStutzenstein/Issue2590 Highlighting motions for multiprojector and move httpProvider (fixes …	2016-11-15 20:21:19 +01:00
FinnStutzenstein	4b8fc5fa19	Highlighting motions for multiprojector and move httpProvider (fixes #2590 )	2016-11-15 13:09:56 +01:00
FinnStutzenstein	1ca390876b	Hotfix for Issue #2566	2016-11-15 11:40:59 +01:00
Emanuel Schütze	4e1fdc6b22	Updated PDF layout - use default font for pdf from vfs_font.js remove base64 encoding function on server side - use recommendation config value in motion detail template	2016-11-14 18:52:50 +01:00
Emanuel Schütze	18accc58ae	Merge pull request #2610 from tsiegleauq/electionListPdfMake ElectionList over PdfMake	2016-11-14 18:05:03 +01:00
Emanuel Schütze	ff359ea629	Improved assignments and motions pdf. Load all users in pdfmake function - not in state resolver of assignment list.	2016-11-14 17:55:50 +01:00
Norman Jäckel	5a78f1c510	Fixed motion projector if comment field is None. Fixed #2614 .	2016-11-14 13:16:34 +01:00
Tobias Hößl	2fe1940802	Translation Bugfix	2016-11-13 11:51:27 +01:00
Tobias Hößl	fca2605a2b	Switch back to original view after deleting last change recommendation	2016-11-13 11:45:22 +01:00
Tobias Hößl	4ac7f48bec	Bugfix: Caching of extracted line numbers was invalid when a fragment was passed as an argument	2016-11-13 10:20:00 +01:00
Emanuel Schütze	e49411250a	Merge pull request #2558 from FinnStutzenstein/Issue2462 change all isProjected functions (closes #2462)	2016-11-11 15:57:56 +01:00
Norman Jäckel	67aa92a7ac	Merge pull request #2619 from FinnStutzenstein/Issue2573 No overrun of identifier col in motion table (closes #2573)	2016-11-11 13:21:25 +01:00
FinnStutzenstein	133d0c3a0f	fixing motion block list layout	2016-11-11 10:59:38 +01:00
FinnStutzenstein	fbeacd97f8	No overrun of identifier col in motion table (closes #2573 )	2016-11-11 09:40:30 +01:00
FinnStutzenstein	af9755cb9a	changed all project functions	2016-11-11 09:37:37 +01:00
Emanuel Schütze	22ab7a15a3	Merge pull request #2608 from emanuelschuetze/issue-2339 Load angular-gettext language files from plugin (Fixed #2339)	2016-11-10 13:00:53 +01:00
Emanuel Schütze	3b41f99a6f	Load angular-gettext language files from plugin (Fixed #2339 ) Add new OpenSlidesPlugins provider where plugins can be registered.	2016-11-10 12:51:16 +01:00
Norman Jäckel	9a51bbe663	Update createopenslidesuser.py	2016-11-10 11:11:27 +01:00
André Böhlke	01e27c5713	add command for creating an openslides user	2016-11-10 09:15:21 +01:00
Sean Engelhardt	7069326655	ElectionList over PdfMake	2016-11-09 20:23:01 +01:00
Norman Jäckel	bc321bd714	Merge pull request #2605 from ostcar/fix_permission Fixes user permissions	2016-11-08 23:50:39 +01:00
Oskar Hahn	a47e30c8f1	Fixes user permissions Fix #2597	2016-11-08 23:13:15 +01:00
Emanuel Schütze	fbc4344ab9	Merge pull request #2604 from normanjaeckel/FixGroupUpdate Fixed group update method. Fixed #2541.	2016-11-08 22:45:38 +01:00
Norman Jäckel	7aa110aca6	Merge pull request #2599 from FinnStutzenstein/Issue2118 check for cookies (closes #2118)	2016-11-08 22:39:40 +01:00
Norman Jäckel	2fae952edd	Fixed group update method. Fixed #2541 .	2016-11-08 22:36:57 +01:00
Norman Jäckel	4d80914b8a	Fixed zoom and scroll, fixed #2547 .	2016-11-08 21:29:26 +01:00
Norman Jäckel	db38e5e075	Merge pull request #2476 from ostcar/remove_serverside_pdf Removed old code needed be the server to serve pdf	2016-11-08 15:12:45 +01:00
Norman Jäckel	8f099114bb	Merge pull request #2587 from FinnStutzenstein/Issue2544 Block deleting of the last group with user manage permissions	2016-11-08 15:04:24 +01:00
Norman Jäckel	30fd55409b	Merge pull request #2598 from emanuelschuetze/template-fixes Template fixes.	2016-11-08 14:45:28 +01:00
Emanuel Schütze	4eecd59e52	Updated German translations.	2016-11-08 14:37:12 +01:00
FinnStutzenstein	43d9733881	fixing current list of speakers	2016-11-08 13:00:50 +01:00
FinnStutzenstein	410ac00a44	check for cookies (closes #2118 )	2016-11-08 12:46:19 +01:00
FinnStutzenstein	8d4742ed29	Style fix in current list of speakers template	2016-11-08 12:21:53 +01:00
Emanuel Schütze	92a9a36188	Template fixes. - Improved motion majority calculation form. - Show special values without percentage. - Fix JS errors.	2016-11-08 12:14:24 +01:00
Emanuel Schütze	55a8c4e33a	Removed unused python user functions (Fixed #2594 ). Now get_short_name() and get_full_name() are used on client side only.	2016-11-07 15:58:20 +01:00
Oskar Hahn	7281aa57b8	Removed old code needed be the server to serve pdf	2016-11-07 15:54:29 +01:00
Emanuel Schütze	2824a6b3d2	Merge pull request #2591 from emanuelschuetze/users-import Improve importing and sorting of users	2016-11-07 15:17:30 +01:00
Emanuel Schütze	5b544ceed2	Improve importing and sorting of users * Add is_present field for csv import of users. * Refactor JS functions get_full_name and get_short_name (Fixes #2136). - Show participant number in get_full_name() output. - Sort users by first or last name. - Extend config option to sort users. - Mark unused Python methods get_short_name and get_full_name.	2016-11-07 15:04:30 +01:00
Emanuel Schütze	8c07884746	Merge pull request #2586 from FinnStutzenstein/Issue2543 Just protect default group (fixes #2543)	2016-11-04 15:51:40 +01:00
Emanuel Schütze	3225cdd1a9	Merge pull request #2589 from normanjaeckel/ConfigLabelHelpText Changed label and help text of assignment config for 100-%-base.	2016-11-04 15:45:19 +01:00
Norman Jäckel	19a76f5d3d	Changed label and help text of assignment config for 100-%-base.	2016-11-04 12:02:16 +01:00
FinnStutzenstein	4a1df35a50	Block deleting of the last group with user manage permissions (closes #2544 )	2016-11-04 10:04:21 +01:00
FinnStutzenstein	67f3a1294d	Just protect default group (fixes #2543 )	2016-11-04 08:30:58 +01:00
Emanuel Schütze	b297bab5b5	Fix merge conflict in core/base.js	2016-11-02 22:05:07 +01:00
Emanuel Schütze	ef36962221	Merge pull request #2580 from tsiegleauq/accessDataListPdfMake Creates the access data list with PdfMake	2016-11-02 14:53:50 +01:00
Norman Jäckel	8c4a69dfb2	Merge pull request #2570 from emanuelschuetze/fix-inmemory-cache Fix updating of motion comments for inmemory cache.	2016-11-02 14:24:30 +01:00
Sean Engelhardt	34f74da58d	Creates the access data list with PdfMake	2016-11-02 14:19:57 +01:00
Emanuel Schütze	e315cbad89	Fix regression with projector loading. Projector requires Editor provider in core/base.js instead of site.js because MotionComments (in motions/base.js) uses now Editor factory.	2016-11-02 14:10:59 +01:00
Emanuel Schütze	2c09b409d7	Fix updating of motion comments for inmemory cache. get_restricted_data() has to use deepcopy(full_data) instead of full_data.copy().	2016-11-02 14:07:24 +01:00
Norman Jäckel	8ec6681e81	Merge pull request #2578 from emanuelschuetze/fix-2115 Allow to resize tinymce editor (Fixes #2115)	2016-11-02 13:30:49 +01:00
Emanuel Schütze	caf52094a4	Allow to resize tinymce editor (Fixes #2115 )	2016-11-02 10:35:18 +01:00
Emanuel Schütze	c5ffa13436	Updated German translations.	2016-11-02 09:06:55 +01:00
Emanuel Schütze	259189c280	Updated template-en.po resource.	2016-11-02 00:22:13 +01:00
Emanuel Schütze	7ce479a511	Merge pull request #2535 from emanuelschuetze/state-recommendation-extra-fields Added new motion state flags to show an additional fields	2016-11-02 00:19:32 +01:00
Norman Jäckel	50868d1432	Merge pull request #2567 from emanuelschuetze/fix-translation-strings Fixed translation issues.	2016-11-01 23:58:43 +01:00
Emanuel Schütze	befb8083bf	Merge pull request #2537 from CatoTH/line-number-and-diff-caching Caching results of insertLineNumbers and extractRangeByLineNumbers	2016-11-01 23:41:29 +01:00
Emanuel Schütze	b08ca4be02	Merge pull request #2534 from tsiegleauq/electionsListPdfMake Creates the Election documents using PdfMake	2016-11-01 23:40:42 +01:00
Emanuel Schütze	78765ae9ed	Added new motion state flags to show an additional fields ... to extend state name and recommendation label. Hide forState and forRecommendation fields in motion form and detail view (comment section).	2016-11-01 23:37:39 +01:00
Emanuel Schütze	4b124a629b	Fixed translation issues.	2016-11-01 23:32:39 +01:00
Tobias Hößl	36e519a798	Caching results of insertLineNumbers and extractRangeByLineNumbers	2016-11-01 23:29:32 +01:00
Sean Engelhardt	14ca655aa2	Creates the Election documents using PdfMake	2016-11-01 23:18:19 +01:00
Norman Jäckel	b0ff8375a8	Merge pull request #2539 from CatoTH/bugfix-open-motions-in-original-view Bugfix: Always open motions in original view	2016-11-01 22:56:33 +01:00
Norman Jäckel	3c48df1245	Merge pull request #2540 from CatoTH/diff-formattings-in-pdf Colors / text-Decorations for insered / deleted text	2016-11-01 22:55:25 +01:00
Norman Jäckel	378fb46fb2	Merge pull request #2562 from emanuelschuetze/comments-editor Use tinymce editor for motion comment fields.	2016-11-01 22:54:58 +01:00
Emanuel Schütze	41a4e35592	Use tinymce editor for motion comment fields.	2016-11-01 17:37:32 +01:00
FinnStutzenstein	58dd2f2b30	change all isProjected functions (closes #2462 )	2016-11-01 10:31:28 +01:00
Tobias Hößl	03ef217c4e	Colors / text-Decorations for insered / deleted text; hide line numbers in inserted text	2016-10-29 16:23:16 +02:00
Tobias Hößl	efe90c4e4d	Always open motions in original view	2016-10-29 14:30:25 +02:00
Emanuel Schütze	2a36a0e84e	Use version 2.1-dev.	2016-10-27 14:10:20 +02:00
Norman Jäckel	632fd68564	Fixed error in README and help texts of start script. Fixed #2532 .	2016-10-26 14:58:46 +02:00
Norman Jäckel	ee235309ed	Merge pull request #2523 from FinnStutzenstein/Issue2517 change dropdown for project agenda (closes #2517)	2016-10-26 14:56:18 +02:00
Norman Jäckel	f5b37c1b84	Merge pull request #2530 from emanuelschuetze/pagination Fix pagination and indentation of lists in import views.	2016-10-26 14:55:44 +02:00
Emanuel Schütze	4646cebe55	Merge pull request #2526 from FinnStutzenstein/Issue2448 Adding sortingoptions for creation date and last modified (closes #2448)	2016-10-25 14:53:58 +02:00
Emanuel Schütze	147e4ab219	Merge pull request #2527 from FinnStutzenstein/Issue2522 fixing topics import (closes #2522)	2016-10-25 14:46:12 +02:00
Emanuel Schütze	435e333bbb	Fix pagination and indentation of lists in import views.	2016-10-25 13:45:54 +02:00
Emanuel Schütze	21e6903368	Fix to show election results without ng-init. ng-init does not watch for autoupdates.	2016-10-25 10:44:17 +02:00
FinnStutzenstein	fc21713bb4	Adding sortingoptions for creationdate and last modified (closes #2448 )	2016-10-25 10:03:01 +02:00
FinnStutzenstein	e267784173	fixing topics import (closes #2522 )	2016-10-24 16:38:43 +02:00
Norman Jäckel	9ca15fd0b8	Fixed migrations by skipping autoupdate.	2016-10-24 10:42:34 +02:00
FinnStutzenstein	2f03777d56	change dropdown for project agenda (closes #2517 )	2016-10-21 13:11:25 +02:00
FinnStutzenstein	111b9e3fd7	use check icon and no post request on deselect (fixes #2471 )	2016-10-21 09:39:04 +02:00
Emanuel Schütze	dc1c958e0f	Merge pull request #2514 from FinnStutzenstein/Issue2494 Round corners for projectorbuttons (fixes #2494)	2016-10-18 13:01:49 +02:00
FinnStutzenstein	6ca3c07e1f	Round corners for projectorbuttons (fixes #2494 )	2016-10-18 12:48:19 +02:00
Emanuel Schütze	8172984a4d	Updated translation resource. Updated German translations. Fixed translation strings.	2016-10-17 23:30:18 +02:00
Emanuel Schütze	35a69254af	Updated EN translation resources.	2016-10-17 22:07:25 +02:00
Emanuel Schütze	68139ff5be	Merge pull request #2512 from FinnStutzenstein/Issue2470 key value switched in angular foreach (fixes #2470)	2016-10-17 22:05:55 +02:00
Norman Jäckel	676e783039	Merge pull request #2516 from FinnStutzenstein/Issue2502 Remove chat history	2016-10-17 21:48:34 +02:00
Norman Jäckel	f2fa8de7be	Merge pull request #2495 from normanjaeckel/MotionBlock Motion block	2016-10-17 21:29:31 +02:00
Emanuel Schütze	29638cc702	Recreated migrations file for motionBlock. Minor template fixes for motionBlock.	2016-10-17 21:18:31 +02:00
Norman Jäckel	20f8875dcd	Added view to follow recommendations. for all motions of a motion block	2016-10-17 21:02:50 +02:00
Emanuel Schuetze	0270c31b32	Template improvements for motion blocks. Fixed $stateProvider to allow camelCase in state name (Fixed #2479) - Refactor generic templateUrl function. - Rename MotionBlock templates. - Rename MotionBlock controller.	2016-10-17 20:58:10 +02:00
Norman Jäckel	700c86a24c	New feature blocks for motions. - Added ListView, DetailView, UpdateForm and connection to agenda item for MotionBlock. - Added slide and projection default. - Added custom manager for motion blocks. - Enabled current list of speakers slide and overlay for motion block.	2016-10-17 20:54:26 +02:00
Norman Jäckel	8d494ddef9	Merge pull request #2511 from FinnStutzenstein/Issue2465 Rename AdditionalId to arg (closes #2465)	2016-10-17 20:45:23 +02:00
Tobias Hößl	228abf5cee	Change recommendations	2016-10-17 19:37:32 +02:00
Norman Jäckel	e944f6368b	Merge pull request #2509 from matakuka/majorities Majorities (issue #2258)	2016-10-17 17:15:15 +02:00
Emanuel Schütze	7ada65a628	Optimized template and translation for majority feature.	2016-10-17 17:03:42 +02:00
Norman Jäckel	45aa4146da	Refactored majority calculation. Added cache for MotionPollDetailCtrl.	2016-10-17 17:03:42 +02:00
Maximilian Krambach	e5e1e3e8ba	Majority test for motions	2016-10-17 17:03:31 +02:00
Norman Jäckel	639748bb3b	Added view to clear the chatbox.	2016-10-17 16:56:19 +02:00
FinnStutzenstein	7965fd3fce	Button for deleting chat history	2016-10-17 15:04:06 +02:00
Emanuel Schütze	208d94a91b	Support https as websocket protocol (wss).	2016-10-17 11:31:27 +02:00
FinnStutzenstein	5272a3c1bb	key value switched in angular foreach (fixes #2470 )	2016-10-17 08:58:43 +02:00
FinnStutzenstein	7fcbed051c	Rename AdditionalId to arg (closes #2465 )	2016-10-17 08:10:52 +02:00
André Böhlke	cced97d9fb	password change command	2016-10-14 16:01:46 +02:00
Norman Jäckel	447339ec33	Merge pull request #2508 from tsiegleauq/userListPdfMake Create the user list over pdfmake	2016-10-14 11:50:31 +02:00
Sean Engelhardt	54fc500d04	Create the user list over pdfmake	2016-10-12 16:52:24 +02:00
Maximilian Krambach	88674da36a	list-of-speakers overlay (fixes #2211 )	2016-10-12 15:45:21 +02:00
Norman Jäckel	1a54d1f4c6	Merge pull request #2505 from emanuelschuetze/fix-autoupdate-for-polls Fixed autoupdate for motion and assigment polls.	2016-10-12 11:34:09 +02:00
Emanuel Schuetze	d2acbdda70	Fixed autoupdate for motion and assigment polls. Send autoupdate once only after all votes are saved. Disable autoupdate for saving incompleted vote results.	2016-10-12 11:23:53 +02:00
Emanuel Schütze	6f70fb630c	Merge pull request #2498 from tsiegleauq/agendaPDFmake Generate agendas using pdfmake	2016-10-12 10:27:46 +02:00
Sean Engelhardt	345328357f	Generate agendas using pdfmake	2016-10-11 18:10:33 +02:00
Norman Jäckel	1b218843ef	Merge pull request #2491 from emanuelschuetze/template-fixes Template fixes	2016-10-07 20:07:11 +02:00
Emanuel Schuetze	af10c5aa3d	Fixed typo in projector autoupdate (Fixes #2492 )	2016-10-07 17:02:55 +02:00
Emanuel Schuetze	f7d10b417e	Template fixes - motion list: show category and tags dropdown for manager only - manage projector: fix submenu buttons and css classes	2016-10-07 11:42:33 +02:00
FinnStutzenstein	f1c58f98e8	Using a datetimepicker for agenda start time (closes #2413 and fixes #2440 )	2016-10-06 22:12:51 +02:00
Emanuel Schuetze	0a2759c3ce	Updated missing German translations.	2016-10-06 21:12:31 +02:00
Sean Engelhardt	5040caba5c	moves pdfmake related code in own files (fixes #2307 )	2016-10-05 11:27:22 +02:00
Oskar Hahn	e209dd6dfe	Support to send many objects through the autoupdate system	2016-10-04 18:10:04 +02:00
Emanuel Schuetze	d7a22c371e	Minor changes - Show workflow field in motion form only if more than one workflows exists. - Reorder the fields category, tags and origin in motion detail. - Fix translation string 'Line numbering'. - Fix padding in motion list.	2016-10-04 15:06:50 +02:00
Emanuel Schuetze	2b206a9e72	Updated German tranlsations.	2016-10-04 13:22:39 +02:00
Emanuel Schuetze	4075c1aa3f	Fixed translations strings. Updated template-en.pot.	2016-10-04 12:04:55 +02:00
Emanuel Schuetze	72651f5bbc	Updated translation resource files.	2016-10-04 11:16:03 +02:00
Emanuel Schütze	e64a1bf19c	Merge pull request #2478 from emanuelschuetze/ui-improvements UI improvements	2016-10-04 10:59:21 +02:00
Emanuel Schuetze	bc72089973	UI improvements - item list: reorder buttons - motion list: * move hover menu for edit/delete below submitters * limit submitters to one - motion detail: * show ol flush left * use 2 or 3 columns in meta box * use small buttons for line numbering controls * group line number controls in grey tool bar. * Show motion comments div only if user is allowed. - motion config: * Deativate comments by default. * Deactivate recommendations for motions by default. - item detail: Show needed buttons only. - assignment detail: Improve ballot tabs. - general: * move pdf button to right * move 'back to overview' button to left * update label vor countdown option	2016-10-04 10:51:19 +02:00
Oskar Hahn	c4f6477a4d	Merge pull request #2475 from normanjaeckel/FixBroadcast Fixed broadcast. Fixed #2467.	2016-10-01 15:49:07 +02:00
Norman Jäckel	2e7555e720	Fixed broadcast. Fixed #2467 .	2016-10-01 14:37:04 +02:00
Oskar Hahn	962deca506	Send full_data through the channel. Saves db queries.	2016-10-01 13:57:53 +02:00
Oskar Hahn	97bd526dd7	Fix config cache key	2016-10-01 12:37:43 +02:00
Oskar Hahn	98bab9b358	Fix tests and remove old code.	2016-10-01 01:49:27 +02:00
Norman Jäckel	039795beb7	Refactored projector requirements system for autoupdate.	2016-10-01 01:49:17 +02:00
Oskar Hahn	ac9c9f4ec3	More tests, development instructions and small changes.	2016-10-01 01:48:30 +02:00
Norman Jäckel	7cd70a568c	Added docstrings. Small changes.	2016-10-01 01:48:18 +02:00
Oskar Hahn	368873e738	Adds a cache system to the CollectionElement and add a Collection class that can be used to call a collection used this for the list and receive rest api.	2016-09-30 21:37:52 +02:00
Emanuel Schuetze	720c7e76a5	Hot fix for broadcast (will improved later).	2016-09-30 21:20:30 +02:00
Emanuel Schuetze	6f2a509ebf	Fix mediafile control buttons for fullscreen and play.	2016-09-30 19:59:53 +02:00
Norman Jäckel	8427ffd816	Small changes for multiple projector feature.	2016-09-30 19:11:33 +02:00

... 7 8 9 10 11 ...

3488 Commits