3050 Commits

Author	SHA1	Message	Date
Tobias Hößl	d986d551e0	Line numbers and inline editing	2016-08-20 11:18:17 +02:00
Norman Jäckel	5ea9cbf4d1	Merge pull request #2289 from emanuelschuetze/motionpdf ... Minor motion PDF improvements.	2016-08-19 22:42:56 +02:00
Emanuel Schuetze	8a329a81e6	Minor motion PDF improvements.	2016-08-19 22:13:12 +02:00
Norman Jäckel	70a732bce8	Merge pull request #2280 from normanjaeckel/TemplateHook ... Added template hooks for plugins.	2016-08-19 21:13:55 +02:00
Norman Jäckel	c38cf562d5	Added template hooks for plugins.	2016-08-19 21:08:54 +02:00
Thomas Junk	92a541215f	pdfmake incl. fixes	2016-08-19 16:21:46 +02:00
Thomas Junk	546c4e65f6	PDFMake implemented	2016-08-19 14:10:30 +02:00
Finn Stutzenstein	cd1a2735dc	fixes an important typo in category sort	2016-08-19 09:17:28 +02:00
Finn Stutzenstein	ee95af9acc	Added a possibility to sort and renumber all motions in a category	2016-08-18 14:54:09 +02:00
Emanuel Schütze	71c3aa5d5e	Merge pull request #2273 from normanjaeckel/NumberingCategories ... Added possibility to sort motions in category numbering view.	2016-08-17 08:55:19 +02:00
Oskar Hahn	ff658a59c1	The start command uses only one worker (#2271) ... Fixes #2198 after https://github.com/andrewgodwin/channels/pull/298 is part of the next channels release	2016-08-17 07:48:59 +02:00
Norman Jäckel	b0070d13b9	Added possibility to sort motions in category numbering view.	2016-08-16 23:51:12 +02:00
Norman Jäckel	91ebfbac61	Merge pull request #2272 from ostcar/missing_migrations ... Added missing migrations for #2269.	2016-08-16 00:22:47 +02:00
Norman Jäckel	aea602acb9	Merge pull request #2256 from ostcar/fix_2248 ... Only do an autoupdate after an ongoing transaction.	2016-08-16 00:14:15 +02:00
Oskar Hahn	8d58368937	Added missing migrations for #2269	2016-08-15 19:15:05 +02:00
Emanuel Schütze	243ef7ae5d	Merge pull request #2257 from FinnStutzenstein/Issue2249 ... No crash without a browser (fixes #2249)	2016-08-15 09:47:17 +02:00
Oskar Hahn	ee2f6b500b	Only do an autoupdate after an ongoing transaction. ... This needs at least django 1.9 Fixes: #2248	2016-08-13 10:08:10 +02:00
Oskar Hahn	fac9e71c29	Remove default permissions for session ... fixes #2262	2016-08-13 07:37:27 +02:00
Emanuel Schütze	d2c5646ce4	Merge pull request #2254 from matakuka/mini_issues ... Repairs assignment ballots for candidates with structure_level	2016-08-09 20:43:33 +02:00
Emanuel Schütze	320de66783	Merge pull request #2261 from emanuelschuetze/config-translations ... Fixed missing translations of config options (Fixes #2193)	2016-08-09 20:18:49 +02:00
Emanuel Schuetze	282bc45790	Fixed missing translations of config options (Fixes #2193, fixes #2245)	2016-08-09 17:06:24 +02:00
Norman Jäckel	9813edf490	Merge pull request #2252 from ThomasJunk/mediafix ... Added static media handling (Fixes 2223)	2016-08-09 16:03:22 +02:00
Thomas Junk	dec7cb9002	Added static media handling (Fixes #2223) ... Now DEBUG compatible Commit fe64941aab replaced former use of tornado as webserver with django channels. During this, the additional routing path for /media/ was forgotten. This is now fixed. Due to the routing scheme, the static URLS were added beforehand. Adding it afterwards does not work.	2016-08-09 14:56:18 +02:00
Finn Stutzenstein	12af0256dd	No crash without a browser (fixes #2249)	2016-08-09 08:22:04 +02:00
Emanuel Schütze	54ee068057	Merge pull request #2243 from FinnStutzenstein/master ... Fixing issue #2127	2016-08-05 16:13:19 +02:00
Finn Stutzenstein	b115691675	Messages now allow HTML tags (Fixes #2127)	2016-08-05 12:38:19 +02:00
Maximilian Krambach	350a60722c	repairs ballots for candidates with structure_level	2016-08-05 09:53:10 +02:00
Norman Jäckel	81bcb19847	Merge pull request #2221 from matakuka/issue2214 ... Added user field "number" (fixes #2214)	2016-08-04 10:21:17 +02:00
Emanuel Schütze	6cec9e9f87	Merge pull request #2251 from normanjaeckel/WooshAsync ... Used whoosh.writing.AsyncWriter. See #2198.	2016-08-03 21:42:58 +02:00
Maximilian Krambach	371945e36e	adding user field "number" (fixes #2214)	2016-08-03 16:55:03 +02:00
Norman Jäckel	7f1b894db4	Used whoosh.writing.AsyncWriter. See #2198.	2016-08-03 16:46:52 +02:00
Norman Jäckel	f191956dd9	Fixed error in autoupdate. See #2248.	2016-08-03 16:12:52 +02:00
Norman Jäckel	e688a345c0	Merge pull request #2230 from emanuelschuetze/remove-assignment-config ... Remove unused assignment config to publish winner results only.	2016-08-03 15:58:35 +02:00
joelmacht	19592f1eea	Add tags for assingments	2016-08-03 14:48:12 +02:00
Maximilian Krambach	f2f7ddf072	translations issue #2197	2016-08-01 16:23:20 +02:00
Norman Jäckel	d3cd2d72dc	Merge pull request #2225 from normanjaeckel/NumberCategories ... Added viewpoint to number all motions in a category.	2016-07-29 12:30:09 +02:00
Emanuel Schuetze	8d52d4a1c6	Remove unused assignment config to publish winner results only. (Fixes #2145)	2016-07-29 12:29:53 +02:00
Norman Jäckel	646540ee17	Merge pull request #2233 from emanuelschuetze/motionOrigin ... Use origin field in motion detail and list view (Fixes #2227)	2016-07-29 12:16:19 +02:00
Norman Jäckel	7e6dc50b39	Added viewpoint to number all motions in a category.	2016-07-29 11:56:12 +02:00
Emanuel Schuetze	88715646ba	Show user fields is_committee and is_active in list view. (Fixes #2217) ... New icon for is_committee and is_active. Check is_committee field for csv import.	2016-07-29 11:37:51 +02:00
Norman Jäckel	4b9767b09e	Added new user field is_committee and new default group Committees.	2016-07-29 11:37:51 +02:00
Emanuel Schütze	aca01c466c	Merge pull request #2222 from matakuka/issue2210 ... add "delete all speakers" button (feature, issue #2210)	2016-07-28 11:11:31 +02:00
Maximilian Krambach	589137ece7	add "delete all speakers" button (fixes #2210)	2016-07-28 10:51:33 +02:00
Emanuel Schuetze	af16733b36	Use origin field in motion detail and list view (Fixes #2227)	2016-07-27 16:16:22 +02:00
Emanuel Schütze	45321b6139	Merge pull request #2226 from normanjaeckel/MotionOrigin ... Added motion origin field.	2016-07-27 16:14:31 +02:00
Emanuel Schuetze	8208f44108	Updated German translations.	2016-07-27 14:10:04 +02:00
Norman Jäckel	0b9a64f968	Added motion origin field.	2016-07-13 14:45:40 +02:00
Norman Jäckel	2627724c55	Merge pull request #2199 from matakuka/noBrowserLanguage ... sets language to en if no browser language is set	2016-07-11 14:19:14 +02:00
Norman Jäckel	207db4de89	Merge pull request #2186 from tsiegleauq/issue2164 ... Add translatable entries for QuickEdit (Fixes #2164)	2016-07-10 23:24:36 +02:00
Maximilian Krambach	31df629fc9	sets language to en if no browser language is set	2016-07-06 09:52:32 +02:00
Sean Engelhardt	520f8362fa	Add translatable entries for QuickEdit (Fixes #2164)	2016-06-28 14:06:46 +02:00
Emanuel Schuetze	31657d0cf3	Fixed and update English translation strings.	2016-06-28 10:18:43 +02:00
Emanuel Schuetze	31c509f288	Updated EN source translation files.	2016-06-20 21:03:43 +02:00
Norman Jäckel	b45e0ea09f	Fixed coding style.	2016-06-16 10:28:14 +02:00
Maximilian Krambach	a5a00a7eda	Config translations moved to client side (Issue #2093)	2016-06-12 11:46:46 +02:00
Emanuel Schütze	7a94b6511b	Merge pull request #2189 from matakuka/YesNoVotes ... adding option "yes/no for each candidate"	2016-06-12 11:11:10 +02:00
Joel Macht	b7d83e786f	Fix linebreak on tags, add spacing and remove commas (Fixes #2147)	2016-06-10 18:17:42 +02:00
Maximilian Krambach	3157ac59f2	adding option "yes/no for each candidate"	2016-06-10 14:13:01 +02:00
Oskar Hahn	fe64941aab	Big Mode for OpenSlides ... Uses django channels instead of tornado for the autoupdate. Therefore tornado is nolonger a dependency of OpenSlides (but channels). This uses websockets instead of SockJS. Use the flag insecure in the start command to provide static files serving. Use a new session backend that has a ForeignKey to User.	2016-06-09 11:14:39 +02:00
Maximilian Krambach	5061ea1770	typo fixing (issue #2181)	2016-06-08 22:18:35 +02:00
Maximilian Krambach	649300cfb8	Add a back button to tag overview (Fixed #2151)	2016-06-08 16:41:27 +02:00
Norman Jäckel	a8595ab234	Merge pull request #2185 from tsiegleauq/issue2156 ... Fix pagination when agenda got >100 entrys (Fixes #2156)	2016-06-08 10:45:07 +02:00
Norman Jäckel	13e7e1b1e1	Merge pull request #2176 from tsiegleauq/issue2133 ... Limit selection of files to csv and txt (Fixed #2133)	2016-06-08 10:41:52 +02:00
Sean Engelhardt	235eed1172	Fix pagination when agenda got >100 entrys (Fixes #2156)	2016-06-07 14:17:36 +02:00
Sean Engelhardt	62310c83ae	Limit selection of files to csv and txt (Fixed #2133) ... agenda, motions, users csv import	2016-06-07 11:34:02 +02:00
Norman Jäckel	294fb7ebc5	Fixed motion PDF if motions have no identifier. Fixed #2158.	2016-06-06 14:26:16 +02:00
Norman Jäckel	8c5c5dc556	Fixed bug on config view.	2016-06-06 14:19:57 +02:00
Oskar Hahn	f2570551a1	Merge pull request #2175 from ostcar/config ... Redesign of the config variables.	2016-06-04 01:12:50 +02:00
Oskar Hahn	2221b23447	Redesign of the config variables. ... Removed the config cache and created files for each app in which the config variables are defined.	2016-06-03 13:47:54 +02:00
Sean Engelhardt	d0c9450d02	Updated German translations (Fixes #2132)	2016-05-31 15:00:38 +02:00
Oskar Hahn	416c2646fe	Order speaker on projector ... fixes #2138	2016-05-28 19:22:49 +02:00
Emanuel Schütze	61976f47f0	Merge pull request #2144 from normanjaeckel/SettingsFix ... Fixed example text in settings.	2016-05-28 15:42:17 +02:00
Emanuel Schuetze	80b6dcc971	Updated Spanish translation. ... Thanks to johnfelipe! Fixed: Define missing Spanish translation in django settings file.	2016-05-25 09:58:55 +02:00
Norman Jäckel	253d615755	Fixed example text in settings.	2016-05-17 14:16:44 +02:00
Erik Steenman	4b7ba02b7d	Change the z-index of .fullscreen to 100. ... Z-Index 199 places the fullscreen content just below the various projector overlays, such as messages and timers.	2016-05-10 14:51:30 +02:00
Norman Jäckel	e968c88cc1	Update version to 2.0.1-dev	2016-04-17 22:49:17 +02:00
Norman Jäckel	347cf478f8	Release 2.0	2016-04-17 22:49:17 +02:00
Emanuel Schuetze	e0b73ff68a	Use group_id instead of group in User form views	2016-04-17 22:42:56 +02:00
Emanuel Schuetze	e151e7c84c	Fix z-index of chatbox and projector sidebar.	2016-04-17 22:18:16 +02:00
Emanuel Schuetze	06d333c067	Template fixes for better smartphone usage. ... - Remove on-focus-me directive on every list view. (Otherwise smartphones/tablets opens always the keyboard on each list view.) - Make some columns 'optional' in list view to see only the most important columns on small devices. - Add z-index for projector sidebar. Show it in full width on small devices. - Remove padding on small devices.	2016-04-17 19:56:38 +02:00
Emanuel Schuetze	7ebedb1fdd	Use always user.groups_id (Fixes #2081) ... - Fix rest api: send always groups_id (instead of groups). - Fix JS-Data-Store: Add hasMany relations for user.groups. - Fix templates: use field 'groups_id' instead of 'groups'.	2016-04-14 22:13:28 +02:00
Emanuel Schuetze	9481d037e8	Reduce sizes of used logos.	2016-04-13 11:06:50 +02:00
Norman Jäckel	8d5e983d29	Merge pull request #2077 from emanuelschuetze/translations ... Translations	2016-04-12 23:47:38 +02:00
Emanuel Schuetze	b8194a0b54	Updated all translations (angular-gettext).	2016-04-12 22:58:40 +02:00
Emanuel Schuetze	7229c8dc3a	Fix translation strings.	2016-04-12 22:47:46 +02:00
Emanuel Schuetze	7e5ea61b34	Hide candidate list if assignment phase is finished (2).	2016-04-12 22:41:15 +02:00
Emanuel Schuetze	f5125d0d23	Add content object (motion/election) in agenda sort view.	2016-04-12 22:33:53 +02:00
Emanuel Schuetze	07d95fd10a	Allow to show vote value '0' in motion poll result view.	2016-04-12 22:26:13 +02:00
Norman Jäckel	27c8d511f0	Used exit method from sys library. Fixed #2065.	2016-04-07 00:43:53 +02:00
Emanuel Schuetze	cb605d619e	Mark missing translation string.	2016-04-03 11:53:40 +02:00
Norman Jäckel	331da7f300	Update version to 2.0-dev.	2016-03-21 21:13:52 +01:00
Norman Jäckel	5842ad86f4	Release 2.0b5	2016-03-21 21:13:28 +01:00
Norman Jäckel	d51652ff72	Merge pull request #2061 from emanuelschuetze/template-Fixes ... Template fixes	2016-03-21 20:03:43 +01:00
Emanuel Schuetze	4b06fa225f	Updated all translations. (Fixes #2043) ... Thanks to all translators of FR, PT, CS, ES and DE!	2016-03-21 19:57:45 +01:00
Emanuel Schuetze	0565d57789	Template fixes ... - Fix config groups. Use group index instead of group names (with blanks). - Use 100% width for all chosen fields.	2016-03-21 19:56:53 +01:00
Emanuel Schuetze	815f03145c	Use specific host and port for 'openslides start'. (Fixes #1987)	2016-03-21 00:06:15 +01:00
Emanuel Schuetze	fb0fd3fe8c	Updated EN translation resource files.	2016-03-20 23:31:13 +01:00
Norman Jäckel	6d62516499	Merge pull request #2056 from ostcar/master ... Fix #2050	2016-03-20 21:22:11 +01:00
Norman Jäckel	e2383dc770	Merge pull request #2051 from emanuelschuetze/templateFixes2 ... Template improvements	2016-03-20 21:21:52 +01:00
Oskar Hahn	46ba039cd5	Fix #2050	2016-03-20 21:08:57 +01:00
Emanuel Schuetze	3479a0636e	Allow to enter countdown time in seconds or 'mm:ss' format.	2016-03-20 21:07:20 +01:00
Emanuel Schuetze	2af38f75bb	Fix edit current slide button.	2016-03-20 21:07:16 +01:00
Norman Jäckel	7cba7c42a4	Merge pull request #2055 from emanuelschuetze/fix2048 ... Catch JS error "this.getVersion(...) is undefined" (Fixes #2048)	2016-03-20 21:06:39 +01:00
Emanuel Schuetze	85ffe4d8fa	Catch JS error "this.getVersion(...) is undefined" (Fixes #2048)	2016-03-20 20:52:34 +01:00
Norman Jäckel	5af25351fa	Merge pull request #2049 from emanuelschuetze/fix2028 ... Catch 404 errors in resolve promise if user has not all required permissions	2016-03-20 20:48:58 +01:00
Emanuel Schuetze	5e08e073f4	Fix translation strings in motions and users forms.	2016-03-19 13:06:36 +01:00
Emanuel Schuetze	0cd6bb272c	Projector template improvements ... - Vertical centering event title (if no description available) - Fix sorting of main agenda item list. - Show countdowns side-by-side. Allow edit if countdown is running.	2016-03-19 07:30:18 +01:00
Emanuel Schuetze	03f08628c7	Catch 404 errors in resolve promise if user has not all required permissions. ... - fix motion detail/list, agenda item detail, assignment list, mediafile list - add fontpage permission check - use agenda item title for motion title if available (to show item number) - fix groupFilter reset in users list - fix users permission string Fixes #2028. Fixes #2038.	2016-03-18 21:41:16 +01:00
Emanuel Schuetze	9ab182184f	Updated EN translation JS resource.	2016-03-18 20:11:56 +01:00
Emanuel Schuetze	140869ebd7	Fix translation strings.	2016-03-18 20:11:04 +01:00
Emanuel Schuetze	89446ce4f6	Use angular-chosen instead of ui-select for better performance. ... The jQuery select field from angular-chosen is used for all ui-select fields. See https://github.com/leocaseiro/angular-chosen/ Use input delay on users filter field with 'debounce'. Fixed #2006.	2016-03-18 14:37:03 +01:00
Emanuel Schuetze	794fa9faf1	Updated EN translation JS resource file.	2016-03-17 12:48:06 +01:00
Emanuel Schuetze	ace335f7cc	Fix missing translation string.	2016-03-17 12:47:44 +01:00
Emanuel Schuetze	a8d9581664	Allow html in event name and description.	2016-03-14 17:09:37 +01:00
Emanuel Schuetze	1b25d9c376	Added loading spinner icon. ... Only for loading resolve object from server.	2016-03-14 17:09:37 +01:00
Norman Jäckel	15119ab28b	Merge pull request #2041 from emanuelschuetze/fix2020 ... New configs for font color in header and h1 on projector (Fixes #2020)	2016-03-08 23:16:28 +01:00
Emanuel Schuetze	b9fed84732	Updated EN language files.	2016-03-08 23:01:20 +01:00
Emanuel Schuetze	85326d75f2	New configs for font color in header and h1 on projector (Fixes #2020)	2016-03-08 23:01:17 +01:00
Emanuel Schuetze	f47055c13a	Fix 'stop' speech button in Safari (Fixes #2029) ... Use '{}' instead of empty 'JSON.stringify()'.	2016-03-08 20:23:12 +01:00
Norman Jäckel	56936c86ab	Used bulk_create to create the initial projector during migration. Fixed #2035.	2016-03-07 19:09:45 +01:00
Norman Jäckel	ce3576f306	Merge pull request #2034 from emanuelschuetze/fix2005 ... Fix main menu on small devices (Fixes #2005)	2016-03-07 19:00:08 +01:00
Emanuel Schütze	2097121e45	Merge pull request #2030 from normanjaeckel/FixAgendaGetQueryset ... Fixed get_queryset method of ItemViewSet. Fixed #2027.	2016-03-06 22:48:50 +01:00
Emanuel Schuetze	876d9408fe	Fix main menu on small devices (Fixes #2005) ... Use bootstraps navbar-toggle button to bring up a vertical responsive main menu. Some additional responsive CSS impmprovements.	2016-03-06 20:14:52 +01:00
Norman Jäckel	78565ffd25	Updated migrations.	2016-03-06 14:36:50 +01:00
Norman Jäckel	132c6e81ec	Forwarding JSON instead of Django model instances to autoupdate loop. ... - Used raw SQL for createing default projector during inital migration. - Removed default_password and hidden agenda items from autoupdate data for some users. - Removed old get_collection_and_id_from_url() function.	2016-03-06 14:24:53 +01:00
Norman Jäckel	4daa61888f	Massive refactoring for autoupdate optimization.	2016-03-06 14:22:40 +01:00
André Böhlke	3db2f2fc16	"durchstich" for autoupdate optimization	2016-03-06 14:22:40 +01:00
Norman Jäckel	e598b308f0	Merge pull request #2033 from emanuelschuetze/fix1949 ... Allow pdf scrolling on projector (Fixes #1949).	2016-03-06 14:19:06 +01:00
Emanuel Schuetze	b78c9bc7bd	Allow pdf scrolling on projector (Fixes #1949).	2016-03-05 22:44:00 +01:00
Emanuel Schuetze	921ec3ab72	Remove 'can_see_extra_data' permission from registered and anonymous groups. ... Now, only staff users has this permission by default. (Fixed #2004.) Some more work on users/groups template: - Added description to permission string to show that only 'present' and 'comment' fields are affected by this permission. - Allowed to create groups without permissions. - Fixed showing group names in users lists view for staff and normal users.	2016-03-05 22:12:29 +01:00
Norman Jäckel	bc93b61a02	Fixed get_queryset method of ItemViewSet. Fixed #2027.	2016-03-04 11:48:20 +01:00
Emanuel Schuetze	7029852043	Template fixes ... - switch projector live view minimize/maximize buttons - show agenda/item split buttons (project only main agenda items, project subitem) only if subitems are available	2016-03-03 08:46:18 +01:00
Norman Jäckel	7da48efd4c	Fixed TypeError in agenda views. Fixed #2023.	2016-03-03 00:23:41 +01:00
Norman Jäckel	3c6d4d5e30	Fixed gulp jshint task.	2016-03-02 16:51:40 +01:00
Norman Jäckel	de871f3f9c	Squished migrations files.	2016-03-02 14:26:47 +01:00
Norman Jäckel	ca3cfae8b3	Changed name of '--development' option and name of the respective directory. Fixed #2001	2016-03-01 17:38:14 +01:00
Emanuel Schütze	8d1de6923b	Merge pull request #2017 from normanjaeckel/FixMotionPoll ... Fixed error in motion poll serializer. Fixed #2014.	2016-02-28 00:21:04 +01:00
Norman Jäckel	bc49f00c66	Fixed error in motion poll serializer. Fixed #2014.	2016-02-27 21:34:26 +01:00
Norman Jäckel	872d73b5cf	Merge pull request #2016 from normanjaeckel/GetContext ... Rename and refactor some ProjectorElement methods. Fixed #1631.	2016-02-27 21:24:18 +01:00
Norman Jäckel	a2a6637c89	Rename and refactor some ProjectorElement methods. Fixed #1631.	2016-02-27 20:56:03 +01:00
Emanuel Schuetze	1d314db487	Show special vote values for motion polls on projector.	2016-02-27 20:10:24 +01:00
Norman Jäckel	9fbb12944c	Updated start script help text and custom commands. Fixed #1987.	2016-02-25 23:17:04 +01:00
Emanuel Schütze	2b239f2214	Merge pull request #2003 from emanuelschuetze/fix1820 ... Reload after login and logout (Fixes #1820)	2016-02-25 13:51:44 +01:00
Emanuel Schuetze	a6be43809f	Agenda list slide improvements ... - project summary of selected item - show full tree OR main agenda items only - show done items grey (without icon)	2016-02-25 13:37:59 +01:00
Emanuel Schuetze	d3d73a019d	Fix translations in group detail template.	2016-02-25 13:37:55 +01:00
Emanuel Schuetze	06f7515ca4	Reload after login and logout (Fixes #1820) ... Not very nice solution but with DS.clear() we have to do a lot of more work with high effort. Can improved later.	2016-02-25 10:22:05 +01:00
Emanuel Schütze	88b2e8a73e	Merge pull request #2000 from normanjaeckel/VotesQuery ... Optimized number of queries for motion serializing. Fixed #1655.	2016-02-24 11:10:11 +01:00
Norman Jäckel	758180e7cc	Optimized number of queries for motion serializing. Fixed #1655.	2016-02-24 10:30:52 +01:00
Norman Jäckel	544b28cacf	Fixed coding style in some JS files. Fixed #1979.	2016-02-24 09:56:27 +01:00
Norman Jäckel	e57a83f45b	Merge pull request #1997 from emanuelschuetze/fix1817 ... Get success message in user edit form when default password is resetted	2016-02-24 00:45:05 +01:00
Emanuel Schütze	0cbb3fba01	Merge pull request #1996 from normanjaeckel/LanguageHeader ... Added language header to internal server requests. Fixed #1981.	2016-02-23 23:54:44 +01:00
Emanuel Schuetze	bed96f66b0	Get success message in user edit form when default password is resetted (Fixes #1817).	2016-02-23 23:51:42 +01:00
Norman Jäckel	73cc1a5dfb	Merge pull request #1995 from emanuelschuetze/fix1991 ... Add/Remove a group to selected users (Fixes #1991)	2016-02-23 23:37:57 +01:00
Norman Jäckel	3ea4c507cf	Added language header to internal server requests. Fixed #1981.	2016-02-23 23:19:38 +01:00
Emanuel Schuetze	e284b79c8e	Add/Remove a group to selected users (Fixes #1991)	2016-02-23 23:16:13 +01:00
Emanuel Schütze	ca5f707f74	Merge pull request #1994 from normanjaeckel/FileNotFound ... Fixed error if a PDF file was deleted from the server. Fixed #1988.	2016-02-23 22:44:35 +01:00
Norman Jäckel	9a94dfc735	Merge pull request #1993 from emanuelschuetze/fix1710 ... Added motion poll pdf (Fixes #1710).	2016-02-23 22:38:28 +01:00
Norman Jäckel	e8402f6ffa	Fixed error if a PDF file was deleted from the server. Fixed #1988.	2016-02-23 22:35:04 +01:00
Emanuel Schuetze	eebb621a98	Added motion poll pdf (Fixes #1710).	2016-02-23 22:27:03 +01:00
Emanuel Schuetze	16fd87cc93	Use a global variable for the limiting number of users in select fields. (Fixed #1989)	2016-02-23 22:24:41 +01:00
Emanuel Schuetze	0613304724	Use colorpicker for projector header color config.	2016-02-23 22:24:41 +01:00
Emanuel Schuetze	ba49781b39	Show orange countdown in last x seconds of speaking time (add new config)	2016-02-23 22:24:38 +01:00
Emanuel Schuetze	647e62fb0d	Set focus for chat input	2016-02-23 22:24:33 +01:00
Emanuel Schuetze	150744e607	Fixed showing users filters.	2016-02-20 11:35:51 +01:00
Emanuel Schuetze	b0b858a808	Mediafile PDF controls: set 'page-fit' (100%) by default, disabled previous/next buttons	2016-02-20 11:29:38 +01:00
Emanuel Schuetze	de276d951c	Update version to 2.0b5-dev	2016-02-17 21:24:14 +01:00
Emanuel Schuetze	51358aba51	Release 2.0b4	2016-02-17 21:24:14 +01:00
Emanuel Schuetze	0e40735931	Fix motions and users csv import.	2016-02-17 21:19:26 +01:00
Emanuel Schütze	ecb29a1403	Merge pull request #1980 from normanjaeckel/PluginAPI ... Updated API for plugins.	2016-02-17 20:40:40 +01:00
Emanuel Schuetze	8c4d1e24df	Updated all lanuages (JS only)	2016-02-17 20:18:45 +01:00
Emanuel Schuetze	2473a6ef69	Updated angular-gettext EN source.	2016-02-17 17:58:04 +01:00
Emanuel Schuetze	84ea0bf1f5	Several important fixes for beta4 ... - Fix socket error in autoupdate (Check if socket exists) - Add missing translation string for core permission - Fix KeyError in extract_default_password function in users/views.py - Improve Pagination. Fix users list for users without can_see_extra_data permissions. - Limit the number of users in ui-select field - Fix csv header names in users import help text. - Use config options (enable logo/title) on projector. - Nicer font style for main and sub items on agenda slide. - Fix JS error if this.groups is undefined for anonymous.	2016-02-17 17:49:44 +01:00
Norman Jäckel	dcc325c716	Fixed test plugin.	2016-02-16 23:04:26 +01:00
Norman Jäckel	d181eedeb9	Updated API for plugins.	2016-02-16 22:33:41 +01:00
Emanuel Schütze	956bba9a13	Merge pull request #1978 from normanjaeckel/ChangeProfileFix ... Fixed groups attribute of user in the client. Fixed #1974.	2016-02-16 21:02:53 +01:00
Norman Jäckel	df06abe70e	Fixed groups attribute of user in the client. Fixed #1974.	2016-02-16 14:18:20 +01:00
Norman Jäckel	75f4a2e62d	Work on JavaScript coding style.	2016-02-16 00:56:56 +01:00
Norman Jäckel	40a3d4534e	Merge pull request #1972 from emanuelschuetze/tinymce ... Use tinymce instead of CKEditor.	2016-02-16 00:27:58 +01:00
Emanuel Schuetze	16f1ad5731	Use tinymce instead of CKEditor. ... - better integration of tinymce in bower and gulp - Improve support for html tags in reportlab's motion pdf. - Now paste from word works without problems (That was the main reason of switching to tinymce: The data loss problem with MS Word is still unfixed in CKEditor, see https://dev.ckeditor.com/ticket/13174) - The editor is now used for customslides (text), motions (text, reason) and users (about). - Use mediafile image list for tinymce. - Use own repository for tinymce-i18n: OpenSlides/tinymce-i18n	2016-02-16 00:22:01 +01:00
Norman Jäckel	2d5f5c685c	Merge pull request #1964 from emanuelschuetze/assignmentpoll ... Assignmentpoll slide	2016-02-15 23:50:43 +01:00
Emanuel Schuetze	503325220f	Show selected poll on assignment slide.	2016-02-15 23:47:31 +01:00
Emanuel Schuetze	aee8ed2f3b	Template fixes ... - Show correct last speakers on list of speakers slide. - Fixes config input type. - Fixes config style for checkboxes. - Improved line-height on projector for scaling.	2016-02-14 22:19:14 +01:00
Norman Jäckel	cc55aff8cc	Added possibility to hide config variables.	2016-02-14 21:38:26 +01:00
Oskar Hahn	481822219a	Fix autoupdate of motion title ... fix #1954	2016-02-13 07:15:47 +01:00
Norman Jäckel	198f09801c	Fixed error in poll default_votes_validator. Fixed #1967.	2016-02-11 18:02:57 +01:00
Emanuel Schuetze	322957eb7e	Fixed motion edit url.	2016-02-09 23:05:36 +01:00
Emanuel Schuetze	b4cad89939	Use btn-group for projector controls. Added reset scaling.	2016-02-09 22:47:54 +01:00
Emanuel Schuetze	b1dc73ec4d	Use prune_elements for activate mediafile. (Fixed #1910) ... Use page-fit to show pdf in full width. Fix mediafile search result.	2016-02-09 22:38:07 +01:00
Emanuel Schütze	9fda27dfd6	Merge pull request #1965 from normanjaeckel/BadVoteValues ... Fixed validation of default votes in assignment and motion poll. Fixe…	2016-02-09 21:43:11 +01:00
Norman Jäckel	60b6a7efe1	Fixed validation of default votes in assignment and motion poll. Fixed #1959.	2016-02-09 21:14:01 +01:00
Emanuel Schuetze	c383147f7b	Updated German translations for django.po	2016-02-09 16:54:08 +01:00
Emanuel Schuetze	0dd3c3158f	Updated angular-gettext en source file.	2016-02-09 16:49:55 +01:00
Emanuel Schuetze	eae50b46de	Fixed closing tag for correct translation string	2016-02-09 16:49:32 +01:00
Norman Jäckel	0fe2b9cd8a	Merge pull request #1962 from emanuelschuetze/templateFixes3 ... Motion state translation strings are still used by motion pdf.	2016-02-09 09:32:21 +01:00
Emanuel Schuetze	7248673b47	Motion state translation strings are still used by motion pdf. ... Reverted partly the changes in motion/signmals.py by a8544f016d.	2016-02-09 00:11:48 +01:00
Emanuel Schuetze	31102bd9d7	Refactored MotionPoll. ... Use new getVotes function for vote value and percent value. Remove 'to_representation' function in motion serializer.py to get special values in numbers (-1,-2) instead of translated strings.	2016-02-08 23:56:44 +01:00
Norman Jäckel	25a7f59b70	Merge pull request #1950 from normanjaeckel/Worker.js ... Simplified installing of JS and CSS libs. Fixed #1906.	2016-02-08 22:35:28 +01:00
Norman Jäckel	3be21473a4	Merge pull request #1956 from emanuelschuetze/master ... Several template fixes	2016-02-08 22:32:56 +01:00
Emanuel Schütze	6cd3e48e45	Merge pull request #1952 from normanjaeckel/ErrorMessages ... Used 'detail' for all ValidationError messages. See #1946.	2016-02-08 22:22:43 +01:00
Emanuel Schuetze	96b4784d52	Show motion poll results on projector.	2016-02-08 22:15:31 +01:00
Norman Jäckel	87a97edd69	Used 'detail' for all ValidationError messages. See #1946.	2016-02-08 21:52:23 +01:00
Emanuel Schuetze	0a4cdb3717	Used copy of motionpoll for MotionPollUpdate dialog.	2016-02-08 21:41:01 +01:00
Emanuel Schuetze	82f2c4f003	Fixed quickEdit mode in agenda, motion, assignment. ... Refresh motion object after cancel.	2016-02-08 21:37:20 +01:00
Emanuel Schuetze	6ba47a64d3	Agenda list view: allow to delete also motion and assignment items. ... Fixes #1943	2016-02-08 21:07:35 +01:00
Emanuel Schuetze	f89f3a9933	Improved motion state dropdown element.	2016-02-08 20:34:12 +01:00
Emanuel Schuetze	4bbb153c42	Use Roboto font in projector header/footer.	2016-02-08 20:27:59 +01:00
Norman Jäckel	0e784cde31	Fixed problem with some REST requests during autoupdate. Fixed #1935.	2016-02-05 23:55:06 +01:00
Norman Jäckel	8cb74c5e7a	Simplified installing of JS and CSS libs. Fixed #1906.	2016-02-05 23:27:15 +01:00
Norman Jäckel	2ba675c1b6	Fixed assignment PDF. Fixed #1940.	2016-02-05 21:22:47 +01:00
Emanuel Schuetze	494c9aee94	Refactored AssignmentPoll (Fixed #1848) ... Add percents and progressbars. Template fixes and improvements for polls.	2016-02-05 00:32:18 +01:00
Emanuel Schuetze	d92e7e0ecf	Update version to 2.0b4-dev	2016-02-03 21:18:59 +01:00
Emanuel Schuetze	7a785b3092	Release 2.0b3	2016-02-03 21:18:45 +01:00
Emanuel Schuetze	f944efaf76	Show html text in motion and users detail view correctly. ... Remove white-space-pre-line css class.	2016-02-03 21:04:46 +01:00
Emanuel Schuetze	6997e49851	Updated languages DE, PT, FR, CS, ES (angular-gettext only)	2016-02-03 20:27:56 +01:00
Emanuel Schuetze	142ceaaffc	Updated EN source file for angular-gettext.	2016-02-03 15:32:35 +01:00
Oskar Hahn	eef82d7e72	Merge pull request #1936 from emanuelschuetze/pagination ... Add Pagination and improve import.	2016-02-03 15:24:21 +01:00
Oskar Hahn	59294b1fcb	Merge pull request #1937 from emanuelschuetze/mediafileImprovements ... Mediafile: Improvements for pdf presentaiton and list view.	2016-02-03 15:11:41 +01:00
Emanuel Schuetze	af023f30bc	Mediafile: Improvements for pdf presentaiton and list view.	2016-02-03 00:46:17 +01:00
Emanuel Schuetze	8ae3e1d468	Add Pagination and improve import. ... - Use Pagination for users and item list and users import table. - Improve agenda import: Allow to define agenda item stuff like duration, comment, type.	2016-02-02 22:48:06 +01:00
Norman Jäckel	8b72f6d821	Merge pull request #1933 from emanuelschuetze/agendaTree ... Optimize agenda tree save method on client side.	2016-02-01 23:56:20 +01:00
Oskar Hahn	09cbe8c9e4	Fix the autoupdate	2016-02-01 23:21:50 +01:00
Emanuel Schuetze	f30d62a11f	Optimize agenda tree save method on client side. ... with ui-tree Fixes #1660	2016-02-01 23:06:13 +01:00
Oskar Hahn	a2d8b41d55	Merge pull request #1931 from normanjaeckel/LocalHostVar ... Refactored logic in autoupdate.py concerning wsgi network connection …	2016-02-01 21:27:13 +01:00
Oskar Hahn	7d6c202200	Merge pull request #1927 from emanuelschuetze/autoconnect ... Refactor reconnect function of autoupdate.	2016-02-01 21:25:58 +01:00
Norman Jäckel	6541d49c99	Merge pull request #1928 from emanuelschuetze/updateTranslations ... Show missing translations. Updated de and pt.	2016-01-31 10:19:18 +01:00
Emanuel Schuetze	2e0d57d310	Updated EN translation source files.	2016-01-30 11:34:47 +01:00
Norman Jäckel	af0f8fcac6	Refactored logic in autoupdate.py concerning wsgi network connection variables. Fixed #1929."	2016-01-30 10:18:15 +01:00
Norman Jäckel	01aad229fe	Fixed login modal info text. Fixed #1924.	2016-01-30 10:04:20 +01:00
Norman Jäckel	15bb62b39a	Merge pull request #1926 from ostcar/fix_autoreload_in_django_1.9 ... Fix the start command not to reload if debug is False	2016-01-30 09:58:13 +01:00
Emanuel Schuetze	fb41d0a219	Show missing translations. Updated de and pt.	2016-01-30 09:20:53 +01:00
Norman Jäckel	144037ff57	Merge pull request #1922 from ostcar/fix_tornado_on_windows ... fix tornado on windows	2016-01-29 23:30:04 +01:00
Emanuel Schuetze	1216ea99d3	Refactor reconnect function of autoupdate.	2016-01-29 16:30:00 +01:00
Oskar Hahn	fbf8b0aa62	Fix the start command not to reload if debug is False	2016-01-29 09:51:12 +01:00
Emanuel Schuetze	3cd49704fc	Use correct special html character for projector template title.	2016-01-29 09:14:26 +01:00
Oskar Hahn	9292558db7	fix tornado on windows	2016-01-28 16:19:14 +01:00
Norman Jäckel	2aa31bffbf	Updated version to 2.0-dev	2016-01-27 23:41:16 +01:00
Norman Jäckel	95ac91893c	Release 2.0b2	2016-01-27 23:41:16 +01:00
Norman Jäckel	da30be5184	Merge pull request #1919 from emanuelschuetze/fix1904 ... Fixed TypeError caused by #1904.	2016-01-27 23:40:53 +01:00
Emanuel Schuetze	587f397171	Fixed TypeError caused by #1904. ... "Resource.relationList is undefinded" after activating a slide.	2016-01-27 23:35:24 +01:00
Norman Jäckel	1b1d41b9b8	Updated angular-gettext language file.	2016-01-27 22:33:05 +01:00
Norman Jäckel	c4281c6bc7	Merge pull request #1912 from emanuelschuetze/fixAgenda ... Check if user is allowed to see detail view link in agenda list.	2016-01-27 22:25:56 +01:00
Norman Jäckel	70d32f1e47	Merge pull request #1914 from emanuelschuetze/fixGulp ... Fixed gulp 'pot' task. Fixed typos in translation strings.	2016-01-27 22:23:29 +01:00
Norman Jäckel	fea0287a20	Updated translations.	2016-01-27 22:16:54 +01:00
Emanuel Schuetze	3c7d03547c	Set default of item.weigth to 10000. ... So new items are placed at the end of agenda. After sorting weight is updated.	2016-01-27 22:16:46 +01:00
Emanuel Schuetze	0ce0b9cd18	Fixed gulp 'pot' task. Fixed typos in translation strings.	2016-01-27 22:11:24 +01:00
Emanuel Schuetze	fc22711a9c	Check if user is allowed to see detail view link in agenda list. ... Fixes #1886	2016-01-27 21:19:32 +01:00
Norman Jäckel	4aaa474761	Updated language files.	2016-01-27 20:55:27 +01:00
Norman Jäckel	352e32334e	Merge pull request #1901 from emanuelschuetze/fix1895 ... Translate permission strings. (Fixes #1895)	2016-01-27 20:42:07 +01:00
Norman Jäckel	e041656115	Merge pull request #1903 from emanuelschuetze/pdfMediafilePresentation ... Mediafile pdf presentation with angular-pdf and pdf.js (Fixes #1664).	2016-01-27 20:40:23 +01:00
André Böhlke	d3ed15db29	Mediafile pdf presentation with angular-pdf and pdf.js (Fixes #1664). ... Thanks to André Böhlke for contribution core functionality! Some additional template improvements by Emanuel.	2016-01-27 20:36:21 +01:00
Norman Jäckel	f12a1425c0	Merge pull request #1908 from emanuelschuetze/unconnectBar ... Show red bar on top if server is offline (Fixes #1853)	2016-01-27 20:25:33 +01:00
Emanuel Schuetze	deea222434	Translate permission strings. (Fixes #1895) ... Remove unused gettextCatalog content provider.	2016-01-27 20:23:53 +01:00
Norman Jäckel	3ba93c2352	Merge pull request #1904 from ostcar/remove-ds-dependencies ... Remove DS dependencies	2016-01-27 20:17:44 +01:00
Emanuel Schuetze	14e2fedd6b	Show red bar on top if server is offline (Fixes #1853)	2016-01-27 20:14:10 +01:00
Norman Jäckel	b133ef2556	Merge pull request #1909 from emanuelschuetze/remarks1898 ... Fixed remarks from #1898.	2016-01-27 20:09:01 +01:00
Emanuel Schuetze	09b397f3b1	Fixed remarks from #1898.	2016-01-27 20:03:53 +01:00
Oskar Hahn	3b508303a1	Reconnect at once. Do not wait 5 seconds. Add a connected flag to the root scope ... Fixes #1854 See also #1853	2016-01-27 17:55:28 +01:00
Oskar Hahn	bd4c8920e9	Remove DS dependencies	2016-01-27 17:28:41 +01:00
Oskar Hahn	6970235f23	Revert "Add upload feature to mediafiles module"	2016-01-27 15:28:59 +01:00
André Böhlke	3c691b9937	work on pdf presenter support	2016-01-27 19:33:30 +07:00
Emanuel Schuetze	23503eb4ba	Several template fixes and clean up ... - Use ng-cloak for hide template parts while loading. - Set html lang attribute dynamically (Fixes #1546) - Clean up: Rename 'dashboard' to 'home'. - Show duration of speech in minutes. (Fixes #1882) - Save agenda specific stuff for customslides. (Fixes #1887) - Remove title from QuickEdit from. - Checkbox for item.closed is now visible for manager only. - Agenda list view: Show list of speakers link also for normal users. - Improve slide templates: Show agenda item number and subtitle. - Fixed agenda title for motions and assignments. (Don't load motions and assignmetn in agenda app.) - Added missing seach template.	2016-01-27 12:10:40 +01:00
Norman Jäckel	741cae028c	Merge pull request #1896 from normanjaeckel/AgendaNumbering ... Fixed agenda numbering. Fixed #1892.	2016-01-27 10:39:12 +01:00
Emanuel Schuetze	2a9e0b4b81	Implement full text search (client side) Fixes #1699	2016-01-27 00:16:30 +01:00
Norman Jäckel	fdd62cb342	Fixed agenda numbering. Fixed #1892.	2016-01-26 16:13:33 +01:00
Oskar Hahn	23ad11d232	Merge pull request #1897 from normanjaeckel/PermDisplayName ... Changed display name of permissions in GroupViewSet. Fixed #1895.	2016-01-26 10:02:48 +01:00
Norman Jäckel	61a8c31ff5	Changed display name of permissions in GroupViewSet. Fixed #1895.	2016-01-25 22:35:23 +01:00
Norman Jäckel	87ba8fe4a5	Merge pull request #1894 from ostcar/fix_search ... Fix Search on server side	2016-01-25 22:10:52 +01:00
Oskar Hahn	339b3891da	Fix Search on server side	2016-01-25 21:12:34 +01:00
Norman Jäckel	87e3c536da	Deleted Django default permission of some apps. Fixed #1643.	2016-01-25 14:48:54 +01:00
Emanuel Schuetze	f4e4166e24	Refactoring mediafile templates. (Fixes #1839, #1818, #1833) ... - uploader not visible/loaded after reload list view - use same list view style as in other apps - use dialog for create/edit form - show error message in form - edit form: remove file upload form element, add uploader form element - create form: add uploader form element (only if user has manager permissions) - Refactor mediafile upload method - show not-implemented message for project pdf - use pdf filter in list view	2016-01-25 10:11:16 +01:00
Norman Jäckel	fecaad844b	Fixed mediaifle app.	2016-01-24 22:58:45 +01:00
Norman Jäckel	673a761f6d	Merge pull request #1877 from emanuelschuetze/translationFix ... Add Translation strings and updated po files	2016-01-24 22:17:56 +01:00
Oskar Hahn	0d1a8aa174	Merge pull request #1878 from emanuelschuetze/fix1783 ... Add checkbox 'show as agenda item'. (Fixes #1783)	2016-01-24 22:16:43 +01:00
Emanuel Schuetze	4616f38fd5	Updated EN translation files.	2016-01-24 00:37:58 +01:00
Emanuel Schuetze	a8544f016d	Mark all motion state names as translatable in JS. (Fixes #1864) ... Updated README for how to update translations.	2016-01-24 00:37:54 +01:00
Emanuel Schuetze	9ddc558085	Add checkbox 'show as agenda item'. (Fixes #1783) ... Used for customslide, motion and assignment forms. Changed default value of agenda.type to HIDDEN_ITEM (=2) in model.py.	2016-01-23 20:22:56 +01:00
Emanuel Schuetze	4d6aade16a	Send option request for config page just once (Fixes #1813) ... Add permission check in config template.	2016-01-23 01:02:05 +01:00
Emanuel Schuetze	7bc1851a09	Use osFilter for motions, assignments and mediafiles. (Fixes #1784)	2016-01-21 23:20:14 +01:00
Emanuel Schuetze	b4482afa38	Show username in UserUpdateForm (Fixes #1781)	2016-01-21 22:34:18 +01:00
Emanuel Schuetze	94366f35ab	Use os-perms instead of os-perms-lite. Removed os-perms-lite. (Fixes #1826)	2016-01-21 22:26:11 +01:00
Emanuel Schuetze	646bf52ea7	Show countdown in red if negative (projector and control panel). ... Show 00:00 instead of --:--	2016-01-21 21:43:02 +01:00
Emanuel Schuetze	b291473c61	Set guest_enabled in rootScope to use it in login form after reload. (Fixes #1849) ... - Justified login form elements (same width).	2016-01-21 21:14:55 +01:00
Emanuel Schuetze	42f9cfdf45	List views: show number of filtered AND total rows. ... Improve css animation for ng-enter/ng-leave.	2016-01-21 20:43:04 +01:00
Emanuel Schuetze	23e7b3aaf5	Fixed translation string.	2016-01-21 19:58:50 +01:00
Emanuel Schuetze	4125efbfe6	Added agendaSupplement for agenda item title. ... Added padding-left for child item cells.	2016-01-18 21:40:50 +01:00
Emanuel Schuetze	76dc29cddf	Use uib-alert instead of deprecated alert tag.	2016-01-18 21:09:28 +01:00
Emanuel Schuetze	c4468f93ac	Format timestamp in mediafile list view.	2016-01-18 21:02:37 +01:00
Emanuel Schuetze	620d0121c8	Do not show group "Registered" in users list/detail view.	2016-01-18 20:51:44 +01:00
Emanuel Schuetze	6986db5e69	Set default of use is_present/is_active to true.	2016-01-18 16:29:15 +01:00
Emanuel Schuetze	8ac3254d04	Show title in participant names.	2016-01-18 16:28:48 +01:00
Emanuel Schuetze	d083309a30	Show candidates on assignments slide.	2016-01-18 16:27:50 +01:00
Emanuel Schuetze	59a7a02cfe	Added version history (Fixes #1676)	2016-01-18 00:15:28 +01:00
Emanuel Schuetze	7967da0b4e	Allow 'trivial changes' in motion update (Fixes #1863)	2016-01-17 22:32:52 +01:00
Emanuel Schuetze	8bf82a0306	Added meta box in assignment detail view (Fixes #1866)	2016-01-17 22:32:52 +01:00
Emanuel Schuetze	851252dfe8	Format all JavaScript functions in same syntax. ... Required for use minified js code in production mode.	2016-01-17 22:32:48 +01:00
Emanuel Schuetze	0e24d9b632	Modify motion/assignment/customslide in form dialog without updating list/detail view.	2016-01-17 21:19:32 +01:00
Oskar Hahn	3ed5b2bb1b	Merge pull request #1862 from emanuelschuetze/injectUser ... Modify user in form dialog without updating list/detail view.	2016-01-15 16:02:53 +01:00
Emanuel Schuetze	e6cf28cbeb	Modify user in form dialog without updating list/detail view. ... Create deep copy of user object before modify user in form dialog. So list/detail view is not updated while editing. Before saving inject the changed user (copy) object back into DS store. Refresh user from DB is save request fails.	2016-01-15 13:50:05 +01:00
Emanuel Schuetze	d8aee16fec	Added missing motionpoll-form template. Fix remark in motion-detail.	2016-01-15 09:46:55 +01:00
Oskar Hahn	ffe80e8da3	Merge pull request #1852 from normanjaeckel/AssignmentFixes ... Fixed several things in assignment app. See #1838.	2016-01-15 09:37:18 +01:00
Oskar Hahn	bac4e2c21f	Merge pull request #1865 from normanjaeckel/MediafileFix ... Added possibility for non staff users to upload new files. See #1856.	2016-01-15 09:33:06 +01:00
Oskar Hahn	4ffbd8be29	Merge pull request #1868 from normanjaeckel/TrivialChanges ... Enabled the option to disabled version for motion update requests.	2016-01-15 09:31:30 +01:00
Oskar Hahn	00610d9a63	Merge pull request #1870 from normanjaeckel/DelegateMotionEdit ... Add quick fix to motion update view.	2016-01-15 09:26:05 +01:00
Emanuel Schuetze	694ed6f1cc	Motion template fixes ... - Add has_votes to motion serializer and add poll.has_votes check in motion detail view. - Fix motion meta box 3 column layout. - Added missing intents - Show motionPoll edit form in dialog. Moved into new template. - Clean up assignmentpoll form (like motionPoll)	2016-01-15 00:03:29 +01:00
Norman Jäckel	1eeed1fde9	Add quick fix to motion update view.	2016-01-15 00:03:17 +01:00
Norman Jäckel	01ee197eb6	Enabled the option to disabled version for motion update requests.	2016-01-14 23:23:15 +01:00
Norman Jäckel	ae6875aa93	Added possibility for non staff users to upload new files. See #1856.	2016-01-14 22:55:43 +01:00
Oskar Hahn	440a38b387	Merge pull request #1843 from emanuelschuetze/motionsTemplate ... Motion template fixes	2016-01-14 08:49:48 +01:00
Emanuel Schuetze	bc60b7e7ca	Several template improvements ... - Move Languages services from site.js to base.js Now the detected browser language is used as projector language. - Use verboseName instead of agendaSupplement. - Show submitters on projector (load Users on Controller). - Improve list of speakers (slide and item detail).	2016-01-14 00:14:48 +01:00
Norman Jäckel	441c297986	Fixed several things in assignment app. See #1838. ... Fixed "Add Me" and "Remove Me" button. Show poll results for normal users. Reverse ballot tab order.	2016-01-13 16:11:01 +01:00
Norman Jäckel	3fc82a596c	Fixed server error in config update view. Fixed #1828.	2016-01-13 15:04:47 +01:00
Emanuel Schuetze	cffed7aa3e	Updated German translations.	2016-01-13 14:47:45 +01:00
Emanuel Schuetze	2f8c894104	Motion template fixes ... - Fix missing workflows in Motion create form. - redesign motion meta box - use table format for motion voting results	2016-01-13 14:32:15 +01:00
Emanuel Schuetze	a2721f9589	Updated translation pot files	2016-01-13 11:44:53 +01:00
Oskar Hahn	007a92a96b	Merge pull request #1841 from emanuelschuetze/ProjectorRedesign ... Redesign projector template (Fixes #1787)	2016-01-13 11:28:06 +01:00
Oskar Hahn	aa6a099840	Merge pull request #1809 from emanuelschuetze/CustomSlideAttachment ... Custom slide attachment	2016-01-13 11:26:46 +01:00
Emanuel Schuetze	d0b9b2a492	Added reduced projector logo. ... Added openslides blue color value to logo README.	2016-01-13 10:47:27 +01:00
Emanuel Schuetze	09b88fb4a6	Redesign projector template.	2016-01-13 10:28:49 +01:00
Emanuel Schuetze	93e2296bdc	A lot of template fixes ... - Reset password from current (unsaved) value of default_password. - MotionForm, AssignmentForm and UserForm factory for open ngDialog. Fixes edit url redirect problem. - Added back-to-detail-view-button to list of speakers view. - Add translation context. - Fixed (missing) translation strings. - Fixed tags and category list views. - motion detail: Use select box for changing state. - motion slide updated	2016-01-13 10:22:24 +01:00
Oskar Hahn	4a3cefadb1	Merge pull request #1834 from normanjaeckel/Assignment ... Assignment	2016-01-12 14:58:07 +01:00
Emanuel Schuetze	f2375008d8	Added attachments for customslide views. (Fixes #1681)	2016-01-10 11:55:37 +01:00
Norman Jäckel	8a6ca904dc	Added attachments to custom slides.	2016-01-10 11:51:00 +01:00
Norman Jäckel	e2145f9777	Fixed candidate button.	2016-01-10 11:27:17 +01:00
Norman Jäckel	8bdbdd0b07	Merge pull request #1832 from ostcar/fix_agenda_title ... Always use item.getTitle() instead of item.title	2016-01-10 11:26:44 +01:00
Oskar Hahn	dd120bbf91	Merge pull request #1831 from emanuelschuetze/templateFixes2 ... Several fixes for 2.0b2	2016-01-10 11:26:37 +01:00
Emanuel Schuetze	f9f3af245e	Template fixes. ... - Use PATCH request for user profile update.	2016-01-10 11:18:13 +01:00
Oskar Hahn	b6f4c3cc15	Always use item.getTitle() instead of item.title	2016-01-10 11:10:14 +01:00
Oskar Hahn	fd6190b7a7	Change the speaker management buttons in the speaker page	2016-01-10 10:26:20 +01:00
Norman Jäckel	896ac28c30	Added number of candidates to assignment list view.	2016-01-10 10:23:55 +01:00
Oskar Hahn	dc80efeee9	Fix syntaxerror in python	2016-01-10 09:47:08 +01:00
Oskar Hahn	78640a27f1	Remove item id from error message "{user} is already on the list of speakers."	2016-01-10 09:32:06 +01:00
Norman Jäckel	7dd9edec8b	Merge pull request #1819 from normanjaeckel/Attachment ... Fixed mediafile model. Fixed #1808.	2016-01-10 01:08:24 +01:00
Norman Jäckel	ca659351eb	Merge pull request #1825 from emanuelschuetze/fixTemplates ... Fixed permissions in list views.	2016-01-10 01:07:51 +01:00
Norman Jäckel	2cfa7517a8	Fixed mediafile model. Fixed #1808.	2016-01-10 01:05:57 +01:00
Oskar Hahn	87d647ac4d	Merge pull request #1824 from ostcar/fix_tornado ... Fix tornado	2016-01-10 01:03:16 +01:00
Oskar Hahn	ccf88ec4d5	Switch host and port	2016-01-10 01:02:18 +01:00
Emanuel Schuetze	071b0a76be	Fixed permissions in list views.	2016-01-10 01:02:13 +01:00
Oskar Hahn	4ee2b85b76	Merge pull request #1821 from normanjaeckel/LoginView ... Fixed alerts on login form.	2016-01-10 00:59:03 +01:00
Oskar Hahn	f4e91caeaf	Merge pull request #1822 from normanjaeckel/ChatBox ... Disabled autocomplete for chat box.	2016-01-10 00:58:45 +01:00
Oskar Hahn	ffa60e8d06	show user about me as html	2016-01-10 00:57:09 +01:00
Norman Jäckel	83ac20a704	Fixed strange empty field for sorting list of speakers.	2016-01-10 00:56:04 +01:00
Norman Jäckel	7005ab7f64	Disabled autocomplete for chat box.	2016-01-10 00:46:23 +01:00
Oskar Hahn	4bc0b1d19c	fix autoupdate and hide some groups in user edit form	2016-01-10 00:44:02 +01:00
Norman Jäckel	5a1317eb19	Fixed alerts on login form.	2016-01-10 00:38:59 +01:00
Oskar Hahn	b968a92630	fix autoupdate when openslides runs on a other port then 8000	2016-01-10 00:17:00 +01:00
Oskar Hahn	c30116f5c1	Merge pull request #1815 from emanuelschuetze/candidateElected ... Mark candidate as elected. Updated assignment detail.	2016-01-09 22:37:39 +01:00
Emanuel Schuetze	2c46d3ae0a	Mark candidate as elected. Updated assignment detail.	2016-01-09 22:35:04 +01:00
Oskar Hahn	3ae6482863	Fix autoupdate of config	2016-01-09 22:13:55 +01:00
Oskar Hahn	2f8138f672	Merge pull request #1811 from normanjaeckel/SquishMigrations ... Squished all migrations.	2016-01-09 21:04:54 +01:00
Norman Jäckel	8d1c351c9a	Squished all migrations.	2016-01-09 19:10:57 +01:00
Norman Jäckel	544efdb06e	Merge pull request #1806 from ostcar/fix_autoupdate_after_reload ... Fix autoupdate after auth	2016-01-09 18:55:24 +01:00
Oskar Hahn	5069649e14	Fix autoupdate after auth ... Remove data after logout	2016-01-09 18:25:18 +01:00
Norman Jäckel	2e104d07b7	Removed possibility to block candidates. Fixes #1708.	2016-01-09 18:05:41 +01:00
Norman Jäckel	193d318bc9	Merge pull request #1803 from ostcar/os_filter ... Add osFilter that filters for an explicit text	2016-01-09 17:07:31 +01:00
Norman Jäckel	ae315d388b	Merge pull request #1804 from ostcar/remove_old_search ... Remove old haystack files	2016-01-09 17:01:42 +01:00
Emanuel Schuetze	4a9f265b68	Used is_hidden instead of item.typ. Improve hidden filter. ... Fixed JS error in users and assignments.	2016-01-09 16:55:21 +01:00
Oskar Hahn	b7d63afc91	Remove old haystack files	2016-01-09 16:50:39 +01:00
Oskar Hahn	e3b6fd8d6d	Add osFilter that filters for an explicit text	2016-01-09 16:45:47 +01:00
Norman Jäckel	68ec516e6f	Merge pull request #1799 from emanuelschuetze/loginText ... Show info text in login form (Fixes #1754)	2016-01-09 16:07:55 +01:00
Emanuel Schuetze	11470d3b57	Move welcome config values to general section. ... Use textarea for welcome text.	2016-01-09 16:05:06 +01:00
Emanuel Schuetze	b035ee7d7c	Improved legal notice page (Fixes #267)	2016-01-09 14:44:49 +01:00
Oskar Hahn	c2041dca6f	Merge pull request #1796 from normanjaeckel/MoveTranslations ... Remove model field verbose names. Move help texts.	2016-01-09 14:25:42 +01:00
Emanuel Schuetze	363c928517	Show info text in login form (Fixes #1754)	2016-01-09 14:22:32 +01:00
Norman Jäckel	e406b92745	Remove model field verbose names. Move help texts.	2016-01-09 14:17:51 +01:00
Emanuel Schuetze	54b1c8e350	Show agenda titles with correct numbering	2016-01-09 14:01:30 +01:00
Oskar Hahn	622dadd4ef	Merge pull request #1795 from normanjaeckel/StaticImpressumPage ... Added config field for legal notes.	2016-01-09 13:22:54 +01:00
Norman Jäckel	d7e39be708	Added config field for legal notes.	2016-01-09 13:01:18 +01:00
Oskar Hahn	4b69c57c78	Merge pull request #1789 from ostcar/update_requirements ... Update requirements	2016-01-09 12:22:41 +01:00
Oskar Hahn	552998b067	Update requirements, fixt a lot of warnings ... Set python 3.4 as minimal supported python version	2016-01-09 12:19:46 +01:00
Oskar Hahn	cad252cd2b	Merge pull request #1794 from normanjaeckel/LockoutProtextion ... Added lockout protection, see #1452.	2016-01-09 12:19:28 +01:00
Norman Jäckel	cb22071886	Added lockout protection, see #1452.	2016-01-09 12:07:31 +01:00
Oskar Hahn	96328f033b	Merge pull request #1793 from emanuelschuetze/fixAssignmentPhasesRequest ... Send assignments OPTION request for phases once only.	2016-01-09 12:05:57 +01:00
Oskar Hahn	db22d1f7dc	Merge pull request #1777 from emanuelschuetze/fix1662 ... Sort list of speakers (Fixes#1662)	2016-01-09 12:04:38 +01:00
Oskar Hahn	091c08dabd	Merge pull request #1788 from emanuelschuetze/fixSlides ... Fix slide templates	2016-01-09 12:01:11 +01:00
Emanuel Schuetze	4faf3dd2c0	Send assignments OPTION request for phases once only.	2016-01-09 11:45:25 +01:00
Oskar Hahn	308f55bb3f	Merge pull request #1782 from ostcar/search ... Added a search on the server side.	2016-01-09 11:44:08 +01:00
Oskar Hahn	75dcbab5d1	Add search on the server side.	2016-01-09 11:35:57 +01:00
Emanuel Schuetze	74110453c8	Rename ItemDetailSlide to ListOfSpeakersSlide (Fixes #1576)	2016-01-09 10:55:12 +01:00
Emanuel Schuetze	5cab3bf3dc	Added indentation of subitems on agenda slide (Fixes #1716)	2016-01-09 10:34:34 +01:00
Norman Jäckel	6c33c60600	Merge pull request #1786 from normanjaeckel/LoginInfoView ... Added login info text in config and view.	2016-01-09 10:24:56 +01:00
Norman Jäckel	ecf561e305	Added login info text in config and view.	2016-01-09 10:01:17 +01:00
Emanuel Schuetze	3304cf48c5	Sort list of speakers (Fixes #1662)	2016-01-09 09:44:01 +01:00
Norman Jäckel	7843cc2ec0	Merge pull request #1785 from emanuelschuetze/fix-template-bugs ... Fix template bugs	2016-01-09 01:12:51 +01:00
Norman Jäckel	241d3dbc20	Sorted list of speakers.	2016-01-08 23:32:29 +01:00
Emanuel Schuetze	de77cfc38c	Fixed zooming/scrolling on slides.	2016-01-08 21:31:58 +01:00
Emanuel Schuetze	9b78b5992b	Fix typo	2015-12-30 23:19:53 +01:00
Emanuel Schuetze	98cd4301a6	Generate example csv import files (Fixes #1761) ... - agenda csv file - motions csv file - users csv file	2015-12-30 23:02:20 +01:00
Oskar Hahn	c63bd31db0	Merge pull request #1778 from emanuelschuetze/fix1718 ... Fix publish assignment poll function. (Fixes#1718)	2015-12-22 00:02:44 +01:00
Oskar Hahn	701d3ce228	Merge pull request #1776 from emanuelschuetze/fix1717 ... Upgrade angular-ui-tree	2015-12-22 00:01:50 +01:00
Emanuel Schuetze	b863c7ae13	Upgrade to angular-ui-tree 2.5.0 ... With >=2.10.0 there is an error "context is null" if start dragging. With >=2.6.0 there is a missing angular 1.4 dependency.	2015-12-19 12:46:53 +01:00
Emanuel Schuetze	6b8aa56e87	Fix publish assignment poll function. ... Set 'votes' to required=False in AssignmentAllPollSerializer.	2015-12-19 12:38:07 +01:00
Norman Jäckel	d3e8c68a51	Merge pull request #1775 from emanuelschuetze/templateStuff ... Fixed some template bugs (#1727)	2015-12-19 11:53:53 +01:00
Oskar Hahn	99b4e8c494	Merge pull request #1771 from emanuelschuetze/fix1729 ... Added whitespace before triple dots in template (Fixes #1729)	2015-12-12 11:05:58 +01:00
Oskar Hahn	63d4351c9a	Merge pull request #1773 from emanuelschuetze/csv-import ... Improved agenda and users csv import (Fixes #1748)	2015-12-12 11:05:03 +01:00
Emanuel Schuetze	f5efca1d1e	Added whitespace before triple dots in template (Fixes #1729)	2015-12-12 10:16:44 +01:00
Emanuel Schuetze	31c320f9ef	Improved csv import for agenda and users. ... - Fix users list.	2015-12-12 10:12:22 +01:00
Oskar Hahn	66e0fe272b	Merge pull request #1764 from normanjaeckel/DefaultPermissions ... Deleted Django's default permissions.	2015-12-12 09:32:40 +01:00
Oskar Hahn	9402d25f4f	Merge pull request #1767 from normanjaeckel/ItemDetailSlide ... Removed item detail slide on server and client side.	2015-12-12 09:31:36 +01:00
Oskar Hahn	fae3747da6	Merge pull request #1769 from normanjaeckel/LoginLogout ... Fixed login and logout view.	2015-12-12 09:30:00 +01:00
Oskar Hahn	fd90b15a0e	Merge pull request #1770 from emanuelschuetze/fix1728 ... Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728)	2015-12-12 09:28:20 +01:00
Emanuel Schuetze	c275b08178	Fixed some template bugs (#1727) ... - Fixed z-index of messages and countdowns. - Sidebar: Live view open by default. Improve section style. - Set default value for open_posts in assignments create form. - Redefine default values in motions create form.	2015-12-12 00:30:05 +01:00
Norman Jäckel	e0e74d6c3c	Fixed login, logout and password change view.	2015-12-11 23:58:59 +01:00
Emanuel Schuetze	041b01afe5	Login dialog behavior if guest mode enabled/disabled (Fixes #1750)	2015-12-11 21:18:45 +01:00
Emanuel Schuetze	ca94a4e720	Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728)	2015-12-11 19:50:50 +01:00
Norman Jäckel	0701838bc8	Merge pull request #1765 from emanuelschuetze/WhoAmI ... Login form	2015-12-11 15:44:02 +01:00
Norman Jäckel	da37f3a441	Removed item detail slide on server and client side. ... There is now only a list of speakers slide.	2015-12-11 15:37:13 +01:00
Norman Jäckel	c73671805e	Merge pull request #1753 from emanuelschuetze/fix1704 ... Project related object (Fixes #1704)	2015-12-11 15:25:56 +01:00
Emanuel Schuetze	5d29af5f52	Improved login form. ... - Add redirect after aborting login. (Fixes #1762) - Use new state paramater 'guest_enabled' for login form.	2015-12-11 13:45:53 +01:00
Norman Jäckel	24cb58dc12	Added guest enabled info to WhoAmI view.	2015-12-11 13:44:58 +01:00
Emanuel Schuetze	9001456d19	Fix user.id in password reset request (Fixes #1752)	2015-12-10 15:03:18 +01:00
Norman Jäckel	114a38e4ee	Deleted Django's default permissions.	2015-12-10 00:31:27 +01:00
Emanuel Schuetze	f050e04f0a	Redirect to login dialog if user is not logged in (Fixes #1750)	2015-12-09 20:45:52 +01:00
Emanuel Schuetze	7bffeba93e	Project related object (Fixes #1704) ... - Override generic project and isProjected function in agenda. - Fix project and isProjected function for list of speakers and move to jsDataModel of Agenda.	2015-12-09 20:02:08 +01:00
Norman Jäckel	1f63f84fde	Update version to 2.0b2-dev	2015-12-07 21:55:56 +01:00
Norman Jäckel	c5e3a14a82	Release 2.0b1	2015-12-07 21:55:17 +01:00
Norman Jäckel	2f4b7c192c	Updated French translation.	2015-12-07 20:11:46 +01:00
Norman Jäckel	00dd0b419a	Updated German translation.	2015-12-07 20:06:05 +01:00
Norman Jäckel	075c00ac4f	Updated English language file.	2015-12-07 15:43:45 +01:00
Emanuel Schuetze	3c5f49a127	Updated English translation strings.	2015-12-07 15:15:12 +01:00
Norman Jäckel	1b1e8f8ba2	Used our own repository for Open Sans font.	2015-12-06 23:55:30 +01:00
Emanuel Schuetze	5c6977c46d	Template fixes	2015-12-06 17:26:10 +01:00
Emanuel Schuetze	232ce522fe	Updated translation strings and pot file.	2015-12-06 07:25:07 +01:00
Oskar Hahn	37cd431aa9	Merge pull request #1737 from emanuelschuetze/motion-csv-import ... Add motion csv import (Fixes #1675)	2015-12-05 23:53:08 +01:00
Emanuel Schuetze	d987a1138d	Added motion csv import (Fixes #1675) ... using pre-import checks and preview table.	2015-12-05 21:44:19 +01:00
Emanuel Schuetze	f5452082f0	Use transparent favicon. ... - Added favicon to projector template.	2015-12-02 14:20:59 +01:00
Norman Jäckel	696bfb0883	Fixed comment.	2015-12-01 15:45:35 +01:00
Emanuel Schuetze	b81704a88f	Fixed translations in agendaSupplement.	2015-12-01 13:45:54 +01:00
Emanuel Schuetze	e23121ed0f	Updated language menu. ... - improved header menu style - define new Languages factory - make it easier to define new languages	2015-12-01 12:06:15 +01:00
Emanuel Schuetze	bf940b177c	Fixed gettext strings in JavaScript. ... - Added browser lanugage detection. - Use gettextCatalog.getString(..) instead of gettext(..) in JS code. - updated pot file	2015-11-30 23:52:42 +01:00
Norman Jäckel	139a5173b8	Added German translation.	2015-11-30 21:30:37 +01:00
Norman Jäckel	f84b8f29ac	Template and translation changes. Updated English language files.	2015-11-30 21:06:31 +01:00
Emanuel Schuetze	5cf2134e95	Fix translation tags.	2015-11-30 20:52:02 +01:00
Emanuel Schuetze	fa267b68c2	New template design ... - Great thanks to Jörn Bensch (from triagonale.de) for new base template! - A lot of adaptations in all templates for new design.	2015-11-30 20:36:33 +01:00
Oskar Hahn	aab8b28393	Merge pull request #1724 from emanuelschuetze/project-item-fix ... Added own isProjected function for Agenda factory (Fixes #1704)	2015-11-30 14:49:17 +01:00
Oskar Hahn	ca201758e8	Merge pull request #1715 from emanuelschuetze/template-improvements ... Template improvements	2015-11-29 22:32:08 +01:00
Emanuel Schuetze	2b5c9c09b2	Template improvements ... - use modal dialogs for new/edit views of customslide/motions/assigments - use hover actions in all list views - Show assignment candidate names - support yesnoabstain/vote assignment poll - Generic solution for open edit dialog.	2015-11-29 22:26:59 +01:00
Norman Jäckel	91174afa99	Added error message if a new candidate is already nominated.	2015-11-28 21:34:24 +01:00
Norman Jäckel	6f924e6686	Merge pull request #1714 from ostcar/assignment_poll_candidate ... AngularJS: Added js-data models for assignment poll candidates	2015-11-28 13:26:56 +01:00
Norman Jäckel	262964cbea	Merge pull request #1713 from ostcar/fix_delete_speaker ... AngularJS: Fix deletion of speakers.	2015-11-28 13:24:58 +01:00
Oskar Hahn	99ef185502	Angular: Added js-data models for assignment poll candidates	2015-11-28 00:27:14 +01:00
Oskar Hahn	5ddedf94e1	angular: Fix deletion of speakers	2015-11-27 23:59:04 +01:00
Oskar Hahn	9a7dea26e0	Angular: Eject assignment related users before a assignment is updated	2015-11-27 22:26:30 +01:00
Emanuel Schuetze	35a8042759	Assignments template improvements ... - list view with quickview - ngDialog for create/update view - candidates - polls	2015-11-27 00:19:37 +01:00
Oskar Hahn	e67897941e	Added assignment poll and assignment related user to js	2015-11-25 19:28:35 +01:00
Emanuel Schuetze	92719f2b31	Added own isProjected function for Agenda factory ... Allow to check if an related content object item is projected.	2015-11-25 14:50:23 +01:00
Norman Jäckel	7bff79b377	Added manager to number all agenda items.	2015-11-25 13:05:39 +01:00
Emanuel Schuetze	28df416ec7	Added auto numbering button on agenda list view.	2015-11-25 13:05:39 +01:00
Norman Jäckel	f0080865e6	Added REST API viewpoint to number the agenda.	2015-11-25 13:05:39 +01:00
Emanuel Schuetze	968083e9e5	Improved related agenda items ... - Added QuickEdit mode for related agenda items - show/hide hidden agenda items - Added ng-dialog for modal create/update dialogs of customslides - use generic links for list of speakers, edit, delete, project - Moved projector elements to sidebar of index template (In progress! It will be improved with new base template design). - Fixed error if chat messages is empty. - Moved ngSanitize to base.js to use ng-bind-html in projector slides.	2015-11-25 12:18:14 +01:00
Emanuel Schuetze	9af302ce36	Fix 'operator' error in projector view. ... Move operator factory from users/site.js to users/base.js. The Motion factory uses 'operator' in motions/base.js which is also loaded on projector. So operator is required in users/base.js.	2015-11-23 22:06:54 +01:00
Emanuel Schuetze	f26188e0ff	Split motions.js into base, site and projector	2015-11-23 22:06:50 +01:00
Emanuel Schuetze	3c0fcfebac	Reworked on chatbox in base template.	2015-11-22 22:46:18 +01:00
Norman Jäckel	b1dfd2a4e9	Added first chatbox draft on client side.	2015-11-22 22:45:59 +01:00
Norman Jäckel	c5f5fbf203	Remove translations for projector exception messages.	2015-11-21 00:01:48 +01:00
Norman Jäckel	1016af3c52	Updated English language files.	2015-11-20 23:23:01 +01:00
Norman Jäckel	cdd1813c02	Merge pull request #1691 from emanuelschuetze/motions-permissions ... Updated motion permission checks	2015-11-20 23:18:54 +01:00
Oskar Hahn	02a67097e4	Merge pull request #1690 from emanuelschuetze/rest-password ... Reset default password of an user in UserUpdateCtrl. (Fixes #412)	2015-11-20 10:26:04 +01:00
Emanuel Schuetze	c93e20b1b3	Updated motion permission checks. ... - Add permission checks in motion form (Fixes #1677) - Implement get_allowed_actions in motions JavaScript (Fixes #1668)	2015-11-20 00:15:18 +01:00
Oskar Hahn	b1e7259ce5	AngularClient: Fix operator.pasPerms() after a reload	2015-11-19 21:49:51 +01:00
Emanuel Schuetze	e9cf2fb591	Reset default password of an user in UserUpdateCtrl. (Fixes #412)	2015-11-19 21:49:28 +01:00
Norman Jäckel	19df7c82a2	Enabled possibility to send null for motion poll votes vote value fields.	2015-11-19 19:56:01 +01:00
Oskar Hahn	0cce7f967b	Merge pull request #1661 from normanjaeckel/CKEditor ... Added CKEditor to custom slide create and edit form.	2015-11-18 12:21:39 +01:00
Oskar Hahn	051c98ad88	Merge pull request #1684 from normanjaeckel/MotionFix ... Fixed create view for non staff users, fixed #1670.	2015-11-18 12:20:08 +01:00
Norman Jäckel	69a6cb7c47	Return strings for special motion vote values. See #1669.	2015-11-18 01:46:58 +01:00
Norman Jäckel	2063dcff51	Fixed create view for non staff users, fixed #1670.	2015-11-18 01:20:49 +01:00
Emanuel Schuetze	e3f57a250c	Use custom ckeditor options	2015-11-17 23:25:09 +01:00
Norman Jäckel	d299579f16	Added CKEditor to custom slide create and edit form.	2015-11-17 23:25:09 +01:00
Emanuel Schuetze	ed72a90306	Reworked all motions templates. ... motion detail: - added progres bar for motionpoll - added support/unsupport function - show log motion list: - added state filter - added css animations for enter/leave motion form: - use angular-formly (instead of old ng-fab-forms with no angular 1.4.x support) general: - Workflow states use new field 'css_class' (instead of unused 'icon'). Added migration file. - added 'allowed_actions' to rest api for each motion (by Norman) - updated all JavaScript dependencies (bower.json)	2015-11-11 10:50:49 +01:00
Oskar Hahn	c379544e97	Fixed motion states, handled workflow field.	2015-11-11 10:50:49 +01:00
Emanuel Schuetze	5b37a21c87	Motion detail updated for polls. ... bower.json: updated ui-select New QuickEdit feature in motion list.	2015-11-11 10:50:49 +01:00
Oskar Hahn	2495ba609b	create MotionPoll in JS	2015-11-11 10:50:49 +01:00
Emanuel Schuetze	798126551b	Motions template improvements. ... - Added quickedit form for motion list.	2015-11-11 10:50:49 +01:00
Norman Jäckel	8154b0324b	Added possibility to reset password. Work on user app in general.	2015-11-08 22:10:24 +01:00
Oskar Hahn	08c31a6b09	Merge pull request #1666 from normanjaeckel/Mediafile ... Fixed serializer and template. Fixed #1650.	2015-11-07 07:14:39 +01:00
Norman Jäckel	03fcf950ff	Updated logo help text.	2015-11-06 17:25:25 +01:00
Norman Jäckel	cc21b3d015	Fixed mediafile serializer and template. Fixed #1650.	2015-11-06 17:17:27 +01:00
Oskar Hahn	12a08b9732	New Agenda Item ... Changed agenda item, so it can not be manualy created, but is always created when a custom slide, motion or assignment is created.	2015-10-29 15:44:43 +01:00
Norman Jäckel	32b23df763	Split and cleaned up JS files. Added test.	2015-10-22 00:28:01 +02:00
Oskar Hahn	0e3688fc33	Merge pull request #1653 from normanjaeckel/FixMotionPoll ... Fixed changes in motion poll serializer.	2015-10-21 23:15:28 +02:00
Norman Jäckel	f8cf279d82	Added JSHint to Gulp. Split up JS-Code in users app.	2015-10-21 22:44:07 +02:00
Norman Jäckel	0fc915ec35	Fixed changes in motion poll serializer.	2015-10-21 22:24:11 +02:00
Oskar Hahn	17973bae3d	Merge pull request #1652 from ostcar/make_os-perms-lite_and_ng-show_compatible ... Fix os-perms-lite to make it compatible to ng-show and ng-hide	2015-10-21 21:25:29 +02:00
Oskar Hahn	bf3e125786	Merge pull request #1651 from normanjaeckel/MotionPoll ... Changed Motion Poll REST fields.	2015-10-21 21:25:06 +02:00
Oskar Hahn	1f0ab173d3	Fix os-perms-lite to make it compatible to ng-show and ng-hide	2015-10-21 21:21:48 +02:00
Norman Jäckel	817e15b01a	Changed Motion Poll REST fields.	2015-10-21 21:20:38 +02:00
Emanuel Schuetze	fac45fbf2a	Added multiselection delete mode for users list view. ... Fix users import: Allows multiple groups.	2015-10-15 21:09:49 +02:00
Oskar Hahn	69268f0cc7	Merge pull request #1634 from emanuelschuetze/countdown-controls ... Projector elements controls	2015-10-08 22:27:35 +02:00
Emanuel Schuetze	dda16af532	Added controls for projector elements ... countdowns, messages, scale/scroll/edit current slide Use global serverOffset. Fixed #1645 (wrong time of projector clock). Show countdown description on projector slide.	2015-10-08 19:21:25 +02:00
Emanuel Schuetze	4559ffb882	Fix agenda slide and agendaIsProjected function.	2015-09-24 21:43:37 +02:00
Norman Jäckel	30e390dcfb	Added API view for server time.	2015-09-24 21:28:30 +02:00
Norman Jäckel	1e08e9411a	Cleaned up users app.	2015-09-21 16:23:47 +02:00
Norman Jäckel	e646cce91e	Added scale and scroll, up, down and reset. Fixed #1633.	2015-09-18 10:31:22 +02:00
Norman Jäckel	4ad99f2bc9	Cleaned up mediafiles app. Fixed #1629.	2015-09-17 22:58:24 +02:00
Norman Jäckel	4600fd9b02	Merge pull request #1625 from boehlke/master ... Add upload feature to mediafiles module.	2015-09-17 12:41:10 +02:00
André Böhlke	10b8a1d838	Add upload feature to mediafiles module	2015-09-17 12:35:40 +02:00
Oskar Hahn	264895b773	Configure js-data for projector elements to "replace" on inject. ... fixes #1632	2015-09-17 12:04:45 +02:00
Norman Jäckel	187cb0c42f	Fixed blue line for active projector elements.	2015-09-16 23:59:20 +02:00
Norman Jäckel	2a23150b78	Fixed agenda tree, fixed #1635.	2015-09-14 22:18:55 +02:00
Norman Jäckel	c8dfb9437b	Removed imports from openslides.users in other apps: Cleaned up agenda, assignments and motions.	2015-09-14 21:13:56 +02:00
Emanuel Schuetze	7f9c8b6a38	Agenda item list: new multiselect delete mode ... Remove action column.	2015-09-14 20:35:24 +02:00
Norman Jäckel	8c48d67df0	Fixed projector.	2015-09-14 20:30:37 +02:00
Norman Jäckel	6d76454925	Added model, serializer and viewset for chat messages.	2015-09-07 17:13:42 +02:00
Oskar Hahn	f0803f1c03	Merge pull request #1624 from ostcar/agendaTree ... Calculate agenda tree on the client side.	2015-09-06 15:04:38 +02:00
Oskar Hahn	85be9f23cc	Merge pull request #1623 from normanjaeckel/ProjektorElementsOutput ... Updated Projector config field and control views.	2015-09-06 15:04:26 +02:00
Oskar Hahn	e22b9984e3	Calculate agenda tree on the client side. ... Update changed agenda tree via autoupdate.	2015-09-06 15:01:41 +02:00
Norman Jäckel	5c4c0367a1	Updated Projector config field and control views.	2015-09-06 14:59:33 +02:00
Norman Jäckel	5fc215c359	Fix docstrings.	2015-09-06 11:48:37 +02:00
Oskar Hahn	1fc7a361eb	Merge pull request #1621 from normanjaeckel/User ... Added possibility to update your own user object.	2015-09-06 11:37:52 +02:00
Norman Jäckel	c8bf754646	Added possibility to update your own user object. Hide default password for non admins.	2015-09-06 11:26:48 +02:00
Oskar Hahn	2c64a161ac	fix projector	2015-09-06 10:24:15 +02:00
Norman Jäckel	973d3fa653	Merge pull request #1618 from normanjaeckel/Projector ... Added UUID to projector elements. Added update view.	2015-09-05 21:23:00 +02:00
Norman Jäckel	47a151c71e	Added UUID to projector elements. Added update view.	2015-09-05 21:19:53 +02:00
Oskar Hahn	bd51c6a52c	Added osPermLite as alternative to osPerm	2015-09-05 19:17:41 +02:00
Oskar Hahn	d8e9ef5575	Merge pull request #1616 from ostcar/main_menu ... Autogenerate the main menu.	2015-09-05 18:19:59 +02:00
Oskar Hahn	c54b00c5f4	Merge pull request #1613 from emanuelschuetze/user-profile ... User settings profile view	2015-09-05 18:19:17 +02:00
Oskar Hahn	2da2177c49	Autogenerate the main menu.	2015-09-05 17:23:47 +02:00
Emanuel Schuetze	60002d9111	Added user profile view.	2015-09-05 17:22:37 +02:00
Oskar Hahn	f802fde7de	Merge pull request #1614 from normanjaeckel/BundleCountDown ... Bundle countdown with list of speakers. Fixed #1541.	2015-09-05 17:12:22 +02:00
André Böhlke	8691608c5d	Fix javascript syntax	2015-09-05 16:15:25 +02:00
Norman Jäckel	719b5ffedd	Bundle countdown with list of speakers. Fixed #1541.	2015-09-05 15:07:03 +02:00
Oskar Hahn	948e776d33	Merge pull request #1612 from ostcar/motion_tag_save ... Reload config after login	2015-09-05 11:32:52 +02:00
Oskar Hahn	fbc57cc23a	Reload config after login ... Fix errors by saving tags to motions	2015-09-05 11:26:41 +02:00
Emanuel Schuetze	77d027c1cc	Agenda templates ... - Added manage controls for list of speakers of agenda items. - New slide for list of speakers. - Fixed typo (speach -> speech)	2015-09-05 11:23:32 +02:00
Emanuel Schuetze	0e124dbbae	Use tags in agenda. Fix motions.js.	2015-09-05 10:07:53 +02:00
Oskar Hahn	026f4d45cb	Merge pull request #1607 from normanjaeckel/PollNumber ... Removed poll_number field in MotionPoll model.	2015-09-05 09:58:57 +02:00
Norman Jäckel	80efae4980	Start browser at 'localhost:8000' in start script. Fixed #1534.	2015-09-05 09:32:56 +02:00
Norman Jäckel	5e5ab61612	Removed poll_number field in MotionPoll model.	2015-09-05 09:29:06 +02:00
Oskar Hahn	6674ea85b7	Updated js-data to 2.0 ... Added js-data relation for the motion and agenda app Added improved load function	2015-09-04 21:05:49 +02:00
Norman Jäckel	a1f1cfed1f	Added views to create, update and delete MotionPoll objects.	2015-09-04 19:55:47 +02:00
Norman Jäckel	965206e1fc	Set permissions for OPTIONS requests. Fixed js-data dependency. Fixed blank in some motion model fields. Fixed error handling in agenda and core views.	2015-09-04 15:44:28 +02:00
Norman Jäckel	aaadfbf78e	Merge pull request #1600 from normanjaeckel/Plugins ... Updated plugin utils. Enabled plugins to override urlpatterns.	2015-07-25 22:29:45 +02:00
Norman Jäckel	1cf8a1f222	Updated plugin utils. Enabled plugins to override urlpatterns.	2015-07-25 21:37:03 +02:00
Oskar Hahn	89a6d5b451	Appended an _id suffix to all related field names in the rest api ... Fixes #1597	2015-07-25 19:17:33 +02:00
Norman Jäckel	7e404946e4	Refactored view permissions. ... Refactored permission check for REST API viewsets. Removed old PermissionMixin. Cleaned up several views.py files.	2015-07-05 22:17:58 +02:00
Oskar Hahn	f31925387f	Updated python requirements. ... This included django 1.8	2015-07-02 14:51:08 +02:00
Oskar Hahn	291f60ee9f	Added a way to load angular apps dynamical	2015-07-01 20:10:40 +02:00
Oskar Hahn	1dbe07c041	Fix osPerms to use groups registered and anonymous ... Fixes #1586	2015-07-01 00:32:37 +02:00
Emanuel Schuetze	c6800bc8f5	Update version to 2.0b1-dev	2015-06-29 21:58:58 +02:00
Emanuel Schuetze	d50d771014	Release 2.0a1	2015-06-29 21:58:58 +02:00
Emanuel Schuetze	bc74a2983c	Fixed typo. Removed unused config.js.	2015-06-29 20:23:10 +02:00
Norman Jäckel	87cce491a0	Merge pull request #1583 from emanuelschuetze/agenda-slides ... Use item-detail and item-list slides for agenda app.	2015-06-29 18:05:45 +02:00
Emanuel Schuetze	6f985ef483	Use item-detail and item-list slides for agenda app.	2015-06-29 16:45:46 +02:00
Oskar Hahn	3dead745c6	Let the config app accept values that can be converted to the right type. ... Fixed config app	2015-06-29 15:41:36 +02:00
Oskar Hahn	ec1d676ed9	Added initial migrations for all apps	2015-06-29 15:38:15 +02:00
Oskar Hahn	16fa6bfffc	Removed the projector App	2015-06-29 15:20:28 +02:00
Oskar Hahn	e042c668d5	Moved config app into the core app	2015-06-29 15:15:33 +02:00
Norman Jäckel	bcfe72fa8c	Merge pull request #1578 from ostcar/remove_mptt_again ... Realy removed mptt	2015-06-28 20:18:09 +02:00
Norman Jäckel	025c9c0b2a	Merge pull request #1577 from ostcar/fix_mediafile_download_link ... Fixed link to download a file from the mediafileapp.	2015-06-28 20:17:30 +02:00
Oskar Hahn	4dac4d1ca8	Realy removed mptt	2015-06-28 19:55:48 +02:00
Oskar Hahn	60e890a04e	Fixed link to download a file from the mediafileapp ... Fixes #1575	2015-06-28 19:44:25 +02:00
Norman Jäckel	06ead753dc	Added and updated several projector elements (slides). ... Added list slides for motions and assignments. Added detail slide for presentable files. Updated list and detail slides for agenda items including slides for list of speakers.	2015-06-28 19:22:57 +02:00
Oskar Hahn	8aab8388b3	Moved agenda tree code to the Item-Manager and used it at the AgendaPDFView. ... fixed #1561	2015-06-28 18:26:05 +02:00
Oskar Hahn	c22791d6c9	Merge pull request #1573 from emanuelschuetze/slides ... Agenda item slide template. Some template improvements.	2015-06-27 09:48:02 +02:00
Emanuel Schuetze	f75516c7bb	Agenda slide templates. Some template improvements. ... - User import - show linebreaks for long text - some style work - item detail and agenda list slide	2015-06-25 14:19:43 +02:00
Emanuel Schuetze	6ea14cd2c6	Angular template for config app. ... Added directive for config fields	2015-06-25 10:52:28 +02:00
Oskar Hahn	f5654837e1	Merge pull request #1569 from normanjaeckel/Slides ... Added agenda slides.	2015-06-25 08:12:47 +02:00
Emanuel Schuetze	c2920407bb	Template improvements ... - Activate slides for users, customslides, motions, assignments. - Add delete confirm message. - Fixed required form fields. - Added version template. - Improved user import. Updated csv files.	2015-06-25 00:15:56 +02:00
Norman Jäckel	6da0d41e50	Added agenda slides.	2015-06-24 23:45:21 +02:00
Norman Jäckel	6b5ce5ae2f	Added motion and assignment detail slide.	2015-06-24 22:12:06 +02:00
Oskar Hahn	367404b20d	Added projector methods to user model	2015-06-24 13:07:49 +02:00
Norman Jäckel	95b7b16992	Merge pull request #1555 from emanuelschuetze/speakers ... List of speakers with angularjs	2015-06-22 21:37:39 +02:00
Emanuel Schuetze	8075b0adbb	List of speakers with angularjs. ... - Add/remove user to/from list - Open/close list	2015-06-22 14:34:23 +02:00
Emanuel Schuetze	f006b99caf	Added style to projector slide. ... Added Customslide views.	2015-06-22 14:27:19 +02:00
Oskar Hahn	35aa36f88e	Revert "Added view to create related assignment and motion items. Updated ser…"	2015-06-22 14:23:42 +02:00
Oskar Hahn	2d6cdfa168	Merge pull request #1557 from emanuelschuetze/angular-motions ... Updated motion list, form and detail views.	2015-06-22 14:18:09 +02:00
Oskar Hahn	3f321051c5	Merge pull request #1562 from emanuelschuetze/chromium-fixes ... Fix JavaScript errors in chromium (Fixed #1530)	2015-06-22 14:12:12 +02:00
Oskar Hahn	bb2da91204	Merge pull request #1563 from normanjaeckel/Fix ... Fixed bug in users/projector.py.	2015-06-22 14:11:43 +02:00
Norman Jäckel	e0188a149d	Added view to create related assignment and motion items. Updated serializers.	2015-06-21 23:32:21 +02:00
Norman Jäckel	c4e23daccf	Fixed bug in users/projector.py.	2015-06-21 22:36:21 +02:00
Emanuel Schuetze	002a4d583e	Fix JavaScript errors in chromium.	2015-06-21 19:39:36 +02:00
Emanuel Schuetze	9a117999ef	Updated motion list, form and detail views.	2015-06-20 10:44:00 +02:00
Oskar Hahn	2b9c0b4620	Fixed default_value in option request	2015-06-19 09:08:36 +02:00
Oskar Hahn	a0f4506c35	Merge pull request #1549 from normanjaeckel/ConfigRefactoring ... Refactored config API. Removed form_fields. Added extra fields for HT…	2015-06-18 23:40:23 +02:00
Oskar Hahn	a4c00d5ee3	Angular Client ... * Split angular app into a site- and a projector app * Created client slide api and slides for customslide and user * JS-function to activate a slide	2015-06-18 23:23:34 +02:00
Oskar Hahn	a5d9f0bb42	Merge pull request #1554 from normanjaeckel/UserResetPassword ... Added view to reset user's password.	2015-06-18 23:16:45 +02:00
Norman Jäckel	466fab8752	Added view to reset user's password.	2015-06-18 22:45:23 +02:00
Norman Jäckel	211e39be2c	Added version view via REST API.	2015-06-18 21:48:20 +02:00
Norman Jäckel	c5fbe2e9ee	Refactored config API. ... Removed form_field attributes. Added extra fields for HTML rendering like label and help text. Added fields for sorting and grouping. Removed old collection system. Added config groups to config view via OPTIONS requests. Regrouped all variables. Added validation. Changed internal handling.	2015-06-18 21:13:30 +02:00
Oskar Hahn	dc675e173b	Removed old static files	2015-06-18 18:24:54 +02:00
Norman Jäckel	632ca2bd9a	Renamed config variables. Fixed error in settings.	2015-06-17 12:07:09 +02:00
Emanuel Schuetze	b7abf770c7	Added two agenda import ways. ... Note: CSV example file was updated because English csv header strings are required now.	2015-06-16 20:29:09 +02:00
Norman Jäckel	51455e8563	Merge pull request #1539 from ostcar/delete_old_stuff ... Delete old stuff.	2015-06-16 17:32:38 +02:00
Oskar Hahn	fbf7d0e43d	Remove old thinks not needed for the 2.0 release: ... * django templates * widgets * views * mppt * main_menu * projector 1.x api Sorted all imports Add a ending slash to each url with a redirect view	2015-06-16 17:07:39 +02:00
Norman Jäckel	95683949ec	Merge pull request #1536 from emanuelschuetze/portable-fixes ... Fixed FileFinder importer for plugin detection in portable.	2015-06-16 17:00:30 +02:00
Oskar Hahn	1ccd2ab91c	Merge pull request #1529 from normanjaeckel/RESTConfig ... Added config update view.	2015-06-16 16:18:33 +02:00
Norman Jäckel	3e2aa6c081	Update	2015-06-16 14:04:38 +02:00
Emanuel Schuetze	ea908419be	Fixed FileFinder importer for plugin detection in portable. ... Updated setuptools version for openslides-gui.	2015-06-16 10:38:54 +02:00
Norman Jäckel	6f02d769cc	Added config update view.	2015-06-15 18:24:23 +02:00
Norman Jäckel	5813b8341c	Added permission check for objects required for active projector elements.	2015-06-15 18:22:15 +02:00
Oskar Hahn	a604f36634	Merge pull request #1537 from normanjaeckel/RESTPoll ... Added create, updated and destroy view for assignment polls.	2015-06-15 16:34:11 +02:00
Oskar Hahn	cb1b262c92	Fix anonymous user for rest requests	2015-06-15 15:54:39 +02:00
Norman Jäckel	ccaa1eaf27	Added create, updated and destroy view for assignment polls.	2015-06-14 23:26:06 +02:00
Norman Jäckel	a033f74ba1	Merge pull request #1527 from ostcar/start_browser_on_localhost ... Start the browser on 127.0.0.1.	2015-06-12 13:01:00 +02:00
Oskar Hahn	e836bccb72	Start the browser on 127.0.0.1 ... Fixed #1525	2015-06-11 11:37:01 +02:00
Norman Jäckel	5de7365c9a	Merge pull request #1526 from normanjaeckel/AgendaSpeakerREST ... Added view to add and remove users from the list of speakers.	2015-05-29 13:08:10 +02:00
Norman Jäckel	dc7d27a985	Added REST API for projector. Introduced new projector API. ... Added custom slide projector element class. Added welcome slide as custom slide. Added user slide projector element class. Added clock, countdown ans message projector elements. Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API). Added migrations to core app. Fixed and wrote tests. Updated CHANGELOG.	2015-05-29 12:44:25 +02:00
Norman Jäckel	0853701cdd	Added view to begin and end speach.	2015-05-27 15:42:32 +02:00
Norman Jäckel	95be18b78e	Added view to add and remove users from the list of speakers.	2015-05-26 18:42:39 +02:00
Norman Jäckel	b30afbd635	Added several motion REST API views. ... Added motion creation view, motion update view, version permit and delete view, view to support motions, view to set and reset state. Refactored motion submitters and supporters.	2015-05-13 12:22:50 +02:00
Emanuel Schuetze	8d638a908d	Added new angularjs templates ... for agenda, motions, assignments, users and mediafiles apps. Users app: - Show permissions in group form (Fixed #1500) - Added experimental csv import for users. Agenda: - new agenda sort view. - Added experimental angular-xeditable for item-list view. General: - Added core.tag templates. - Added mediafiles templates. - Remove old template and js files. Remove old views. - Skip old tests. Added external angular modules: - angular-loading-bar (Fixed #1448) - ui-tree (for sorting agenda tree) - ng-fab-forms (for better form validation) - ui-bootstrap (for modal window, dropdown, popover) - ngBootbox (for confirm delete dialogs in agenda and users app)	2015-05-06 09:19:16 +02:00