OpenSlides/openslides
Oskar Hahn a28ca8a4a3 Merge remote-tracking branch 'openslides/stable/1.4.x'
Conflicts:
	openslides/assignment/models.py
2013-09-07 16:48:55 +02:00
..
account Merge remote-tracking branch 'openslides/stable/1.4.x' 2013-09-07 15:42:16 +02:00
agenda Add default sorting of widgets. Fix #493 2013-09-07 15:13:27 +02:00
assignment Merge remote-tracking branch 'openslides/stable/1.4.x' 2013-09-07 16:48:55 +02:00
config Fixed a bug when setting a config var before getting one 2013-08-19 17:59:35 +02:00
core Merge remote-tracking branch 'openslides/stable/1.4.x' 2013-08-19 17:54:50 +02:00
locale Fixed typo in English translation string in djangojs.po. 2013-09-06 21:59:53 +02:00
mediafile Fixed some (pdf) template issues and updated (DE) translation. 2013-06-15 17:50:30 +02:00
motion Merge remote-tracking branch 'openslides/stable/1.4.x' 2013-09-07 15:42:16 +02:00
participant Add default sorting of widgets. Fix #493 2013-09-07 15:13:27 +02:00
poll Changed utils.- and poll.views 2013-02-01 12:51:01 +01:00
projector Merge pull request #871 from normanjaeckel/DefaultWidgetSorting 2013-09-07 06:36:21 -07:00
static Fixed #857: Use jquery plugin 'bsmSelect' for <select multiple> form elements. 2013-09-06 21:59:52 +02:00
templates Fixed #431: Template improvements (removed unused loaded tags and check of all html template files) 2013-05-30 23:25:49 +02:00
utils Deletes config cache after each test if it exists. 2013-08-19 18:05:03 +02:00
__init__.py Merge remote-tracking branch 'openslides/stable/1.4.x' 2013-07-29 20:52:05 +02:00
global_settings.py Removed utils from INSTALLED_APPS. 2013-08-11 09:40:14 +02:00
main.py Start Browser on custom IP, fixed #827 2013-07-25 17:03:04 +02:00
urls.py Fixed #463, typo in urls.py 2013-06-21 09:01:56 +02:00