OpenSlides/openslides
Oskar Hahn bd64a6cb5c Merge branch 'stable/1.2.x'
Conflicts:
	openslides/application/models.py
	openslides/application/views.py
	openslides/participant/forms.py
	openslides/participant/views.py
2012-08-13 19:16:42 +02:00
..
agenda Merge branch 'stable/1.2.x' 2012-08-13 19:16:42 +02:00
application Merge branch 'stable/1.2.x' 2012-08-13 19:16:42 +02:00
assignment rename openslidesuser to user and openslidesgroup to group 2012-08-12 12:52:38 +02:00
config Merge pull request #6 from ostcar/translation 2012-08-13 09:30:17 -07:00
locale Merge branch 'stable/1.2.x' 2012-08-13 19:16:42 +02:00
participant Merge branch 'stable/1.2.x' 2012-08-13 19:16:42 +02:00
poll #300 dont show votecast and voteinvalid symbols, if the vote has no votes 2012-07-16 14:29:30 +02:00
projector Removed additional <hr> tag from custom slides widget. 2012-07-23 19:21:47 +02:00
static Hide div container of tabledrag to eleminate space between table and number of items. 2012-07-25 21:37:20 +02:00
templates fix some typos, mostly {%trans to {% trans 2012-07-16 14:00:29 +02:00
utils some corrective actions 2012-08-13 14:37:49 +02:00
__init__.py remove mercurial_version from openslides.__init__ 2012-08-05 10:59:25 +02:00
default.settings.py set DEBUG=False in default.settings.py 2012-07-16 18:13:53 +02:00
main.py #306 show admin password if it hasn't changed 2012-07-18 10:46:07 +02:00
openslides_settings.py Merge branch 'stable/1.2.x' 2012-08-13 19:16:42 +02:00
urls.py rename openslidesuser to user and openslidesgroup to group 2012-08-12 12:52:38 +02:00