2376 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Norman Jäckel	fc56bd709a	Merge pull request #1244 from emanuelschuetze/MergeStablePart2 ... Merge stable branch (part 2)	2014-04-08 20:23:44 +02:00
Emanuel Schütze	3d7ecab8e4	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2 ... Conflicts: extras/win32-portable/create_portable.txt extras/win32-portable/prepare_portable.py openslides/assignment/views.py openslides/core/static/img/circle.png openslides/motion/pdf.py openslides/utils/pdf.py	2014-04-07 22:35:52 +02:00
Emanuel Schütze	125877beaa	Merge pull request #1241 from normanjaeckel/MergeStablePart1 ... Merge stable branch (part 1)	2014-04-07 22:03:14 +02:00
Norman Jäckel	c13c0997bf	Merge part of stable/1.5.x into master. ... Conflicts: openslides/agenda/views.py openslides/mediafile/forms.py openslides/projector/api.py The fix from commit 39de1924cb was removed because of the new widget system in master branch. See GitHub Issue #1191	2014-04-05 15:19:42 +02:00
Norman Jäckel	7addd69050	Merge pull request #1215 from emanuelschuetze/fix-551 ... Removed pillow. Used unicode circle font. (Fixed #551 and #1140)	2014-03-29 13:25:11 +01:00
Emanuel Schütze	b5fb83c026	Fixed #551: Used unicode font for circle in ballot pdf. Removed pillow. ... That fixed also #1140 (Server error when trying to view ballot paper pdf)	2014-03-29 13:20:31 +01:00
Norman Jäckel	d0a0a09d7b	Merge pull request #1225 from normanjaeckel/Flake8Errors ... Fixed flake8 errors.	2014-03-28 18:34:19 +01:00
Norman Jäckel	ee3ec3d4b6	Fixed flake8 errors.	2014-03-27 20:38:13 +01:00
Norman Jäckel	7a581a92bc	Merge pull request #1216 from normanjaeckel/SpeakerWidgetPermission ... Added extra permission check to speaker widget, fixed #1191 only for 1.5...	2014-03-24 10:50:00 +01:00
Norman Jäckel	39de1924cb	Added extra permission check to speaker widget, fixed #1191 only for 1.5.x branch	2014-03-13 00:50:49 +01:00
Norman Jäckel	fc205a8437	Merge pull request #1210 from normanjaeckel/RegroupConfig ... Regrouped config collections and pages. Fixed #1201.	2014-03-13 00:47:52 +01:00
Norman Jäckel	e7f67457db	Regrouped config collections and pages. Fixed #1201.	2014-03-13 00:41:57 +01:00
Norman Jäckel	8866ee4d63	Merge pull request #1219 from ostcar/python2.6.9 ... Changed dependency to python 2.6.9	2014-03-13 00:40:34 +01:00
Oskar Hahn	ba00f38e32	changed dependency to python 2.6.9	2014-03-12 19:40:22 +01:00
Oskar Hahn	a6fa8457cc	Merge remote-tracking branch 'openslides/stable/1.5.x' ... Conflicts: extras/win32-portable/create_portable.txt extras/win32-portable/prepare_portable.py openslides/motion/templates/motion/motion_list.html openslides/projector/templates/projector.html requirements_production.txt	2014-03-12 19:29:22 +01:00
Norman Jäckel	00a59df4d0	Merge pull request #1218 from ostcar/argparse_fix ... Fix for Python 2.6 and Pip 1.5 (use of argparse 1.2.1)	2014-03-12 00:03:33 +01:00
Oskar Hahn	6ae503e009	fix for python2.6 and pip 1.5	2014-03-11 23:50:30 +01:00
Oskar Hahn	57ea4af4e2	Merge pull request #1211 from normanjaeckel/PreviewAgenda ... Reinserted icon and link for preview of agenda slide. Fixed #1199.	2014-03-11 07:42:24 +01:00
Oskar Hahn	69c73a7ae0	Merge pull request #1212 from normanjaeckel/ConfigTrans ... Inserted command line option to translate config strings during database...	2014-02-01 00:24:02 -08:00
Norman Jäckel	ce8274fb53	Inserted command line option to translate config strings during database setup. Fixed #460.	2014-01-31 02:03:43 +01:00
Norman Jäckel	3b42c16e04	Reinserted icon and link for preview of agenda slide. Fixed #1199.	2014-01-31 01:02:12 +01:00
Norman Jäckel	d49d087f4e	Merge pull request #1208 from ostcar/customslide ... Move projector.models.ProjectorSlide to core.models.CustomSlide	2014-01-29 04:09:52 -08:00
Oskar Hahn	a823812029	Merge pull request #1196 from emanuelschuetze/fix-1195 ... Fixed #1195: Correct path to circle.png on ballot paper (assignment and ...	2014-01-29 01:01:18 -08:00
Emanuel Schuetze	aa2ed9bbad	Fixed #1177 and #1209: Added new requirments for portable: setuptools (pkg_resources) and jsonfield.	2014-01-29 09:17:17 +01:00
Oskar Hahn	484963af4e	Merge pull request #1207 from emanuelschuetze/fix-1138 ... Fixed #1138: Wrong file for projectors logo	2014-01-27 23:34:53 -08:00
Oskar Hahn	2392c1ab36	Move projector.models.ProjectorSlide to core.models.CustomSlide	2014-01-28 08:32:26 +01:00
Emanuel Schuetze	cfa35241e1	Fixed #1138: Wrong file for projectors logo	2014-01-27 21:15:53 +01:00
Emanuel Schuetze	d15488478d	Fixed #1195: Correct path to circle.png on ballot paper (assignment and motion).	2014-01-27 20:54:32 +01:00
Norman Jäckel	9d28f4890e	Merge pull request #1192 from emanuelschuetze/naturalsort ... Fixed #1190: Wrong sorting of motion identifier	2014-01-22 05:25:14 -08:00
Emanuel Schuetze	13eb0ccb30	Fixed #1190: Wrong sorting of motion identifier ... - Added natural sorting JS plugin for motion DataTables (column identifier). - Added the new requirements python package 'natsort' for natural sorting of motions in PDF.	2014-01-21 23:14:39 +01:00
Norman Jäckel	5ddadbab6a	Merge pull request #1194 from ostcar/jsonfield ... removed duplicated entry from the README.rst	2014-01-21 11:38:53 -08:00
Oskar Hahn	7f3162f17b	removed duplicated entry from the README.rst ... See #1189	2014-01-17 16:05:49 +01:00
Norman Jäckel	4c3791a9a8	Merge pull request #1193 from emanuelschuetze/rename-static-files ... Rename and clean up static directories.	2014-01-16 13:35:38 -08:00
Oskar Hahn	f60f668471	Merge pull request #1182 from normanjaeckel/CoupleAssignmentListOfSpeakers ... Coupled assignment candidates with list of speakers. Fixed #1092.	2014-01-15 00:59:29 -08:00
Emanuel Schuetze	d8d2ad002a	Rename and clean up static direcories. ... - rename static subdirs to css and js - move global static dir to core/static, changed - move global templates dir to core/templates - check comments and code style of all our own CSS and JS files - minor changes related to the changes of template and static files	2014-01-14 23:27:12 +01:00
Norman Jäckel	4b63f3a288	Coupled assignment candidates with list of speakers. Fixed #1092.	2014-01-13 15:22:46 +01:00
Oskar Hahn	d72fe39da6	Merge branch 'stable/1.5.x'	2014-01-12 13:38:07 +01:00
Norman Jäckel	5a123ade23	Merge pull request #1181 from ostcar/related_list_of_speakers ... Fixed agenda_item.is_active_slide() with related item and list of speakers	2014-01-12 04:36:24 -08:00
Oskar Hahn	1ed41f64b6	Merge pull request #1156 from normanjaeckel/AutoPlugin ... Used entry points to detect plugins automaticly.	2014-01-12 04:08:33 -08:00
Oskar Hahn	bbd7542341	Fixed agenda_item.is_active_slide() with related item and list of speakers	2014-01-12 12:48:38 +01:00
Norman Jäckel	04b0cfb0bc	Used entry points to detect plugins automaticly.	2014-01-12 12:48:24 +01:00
Norman Jäckel	bc9bbb7280	Merge pull request #1169 from normanjaeckel/Loader ... Added possibility to use custom templates and static files in user data ...	2014-01-12 03:48:09 -08:00
Norman Jäckel	e0223c950b	Added possibility to use custom templates and static files in user data path directory.	2014-01-12 11:05:54 +01:00
Norman Jäckel	e10d9e5e86	Merge pull request #1170 from ostcar/poll_description ... Added a poll description field for each assignment poll	2014-01-12 02:03:57 -08:00
Oskar Hahn	6409f828d7	Added a poll description field for each assignment poll ... fixed signals in MainMenuTests	2014-01-12 10:22:38 +01:00
Oskar Hahn	03c59303d7	Merge pull request #1172 from ostcar/get_absolut_url_mixin ... Added AbsoluteUrlMixin and used it in any model.	2014-01-12 01:02:14 -08:00
Oskar Hahn	c82ee4ce1f	Added AbsoluteUrlMixin and used it in any model. ... cleaned up get_absolute_url() in some models	2014-01-12 00:35:16 +01:00
Norman Jäckel	3fe9169786	Merge pull request #1175 from normanjaeckel/MultipleParticipantsForm ... Added form field for multiple creation of new participants. Fixed #178.	2014-01-11 15:26:36 -08:00
Oskar Hahn	5ea13deccc	Merge pull request #1174 from ostcar/json_field ... Use the jsonfield as requirement	2014-01-11 14:42:39 -08:00
Norman Jäckel	b95a856904	Added form field for multiple creation of new participants. Fixed #178.	2014-01-11 23:09:59 +01:00