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
..
account	Inserted api for the personal info widget.	2013-12-09 12:16:16 +01:00
agenda	Merge part of stable/1.5.x into master.	2014-04-05 15:19:42 +02:00
assignment	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00
config	Inserted command line option to translate config strings during database setup. Fixed #460.	2014-01-31 02:03:43 +01:00
core	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00
locale	Final update of all languages for 1.5: CS, DE, FR, PT.	2013-11-24 20:37:13 +01:00
mediafile	Merge part of stable/1.5.x into master.	2014-04-05 15:19:42 +02:00
motion	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00
participant	Merge part of stable/1.5.x into master.	2014-04-05 15:19:42 +02:00
poll	Added a poll description field for each assignment poll	2014-01-12 10:22:38 +01:00
projector	Merge remote-tracking branch 'openslides/stable/1.5.x'	2014-03-12 19:29:22 +01:00
static/fonts	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00
utils	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00
__init__.py	Update version to 1.6a1-dev.	2013-11-25 23:42:52 +01:00
__main__.py	Inserted command line option to translate config strings during database setup. Fixed #460.	2014-01-31 02:03:43 +01:00
global_settings.py	Used entry points to detect plugins automaticly.	2014-01-12 12:48:24 +01:00
urls.py	Changes in projector and core app and in utils.	2014-01-10 16:17:54 +01:00