Norman Jäckel
811b780fb9
Fix typo TYPE_CHOICE to TYPE_CHOICES
2012-09-14 01:52:20 +02:00
Norman Jäckel
cb3b26c45d
Default sorting of applications using Meta Class
2012-09-14 01:14:25 +02:00
Norman Jäckel
77ae543ff2
Using Meta Class for ordering assignments by name
2012-09-14 00:21:59 +02:00
Oskar Hahn
56e3fe7a37
fix translation
2012-09-13 21:56:50 +02:00
Oskar Hahn
f0f14861e8
fixed message for unblocking users
2012-09-13 21:51:50 +02:00
Oskar Hahn
d8136045bb
update application pdf
2012-09-13 21:33:57 +02:00
Oskar Hahn
0cf0e58af9
Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides
...
Conflicts:
openslides/assignment/models.py
2012-09-13 15:28:35 +02:00
Oskar Hahn
ef7deb90c9
translate agenda hidden filter in js
2012-09-13 15:21:43 +02:00
Oskar Hahn
20ac817d49
Fixed error message when delrun after the list is closed
2012-09-13 15:07:24 +02:00
Oskar Hahn
e64f4f5efc
show blocked candidates of an assignment
2012-09-13 14:59:14 +02:00
Oskar Hahn
0725003377
clarify the submitter name in the application pdf
...
It was not clear, that the submitter should sign the formular
2012-09-13 12:16:46 +02:00
Oskar Hahn
48a992119a
Fixted permissions for editing an application
...
The suppmitter could edit an application after it was finished by
manipulating the url
2012-09-13 12:09:17 +02:00
Oskar Hahn
b15d70d13d
typo
2012-09-13 11:52:04 +02:00
Oskar Hahn
bcfceccb09
dont use simular passwords in gen_password (no Il10oO)
2012-09-13 11:50:06 +02:00
Oskar Hahn
63835e7443
fixed application deletion
2012-09-13 11:43:11 +02:00
Oskar Hahn
760f8e042e
some fixes
2012-09-12 10:17:51 +02:00
Emanuel Schuetze
7376b7a692
Updated translations.
2012-09-11 20:50:53 +02:00
Oskar Hahn
93ee260856
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-09-11 19:30:50 +02:00
Oskar Hahn
38d53bbb92
fixed first-time-pdf
2012-09-11 19:30:12 +02:00
Oskar Hahn
8732b67bd8
Merge pull request #14 from ostcar/no_recandidate
...
block a user to be a candidate from a assignment, if he delete his candidation by him self
2012-09-11 00:52:50 -07:00
Oskar Hahn
d6a0ec5893
Merge pull request #11 from normanjaeckel/custom_slides
...
Insert weight field in custom slides and order custom slides in the
2012-09-11 00:47:07 -07:00
Oskar Hahn
75eb596547
block a user to be a candidate from a assignment, if he delete his
...
candidation by him self
2012-09-06 15:57:42 +02:00
Norman Jäckel
d1c12ea0e5
Sorting applications in the widget by number
2012-09-05 22:42:44 +02:00
Norman Jäckel
2ecd552d2b
Default Sorting of applications by number
2012-09-05 22:38:40 +02:00
Norman Jäckel
d84a8d2bdd
Sorting assignments by name in the widget
2012-09-05 22:19:53 +02:00
Norman Jäckel
55073494fc
Insert weight field in custom slides and order custom slides in the widget
2012-09-05 21:54:34 +02:00
Andy Kittner
1b65044223
Remove a few spaces for pep8 conformance
2012-08-28 19:07:40 +02:00
Andy Kittner
cc20ec3456
Add special handling to determine default settings for portable version
...
The portable version will prefer to create it's settings in it's own
directory and only fallback to a user-specific path
($LOCAL_APPDATA/openslides) if this directory is not writable
2012-08-27 21:48:46 +02:00
Norman Jäckel
6d1c356ffd
Name openslides_personal_settings.py and openslides_global_settings.oy
2012-08-24 14:23:12 +02:00
Norman Jäckel
32cfa6c914
Fix encoding error in settings.py #349
2012-08-23 23:34:30 +02:00
Emanuel Schuetze
777d2266bc
Fixed drag'n'drop of widgets into empty dashboard column. Renamed
...
projector-control{js|css} files into dashboard{js|css}.
2012-08-22 09:39:20 +02:00
Oskar Hahn
423f04d0be
send overlay message data to own view
2012-08-15 18:00:22 +02:00
Oskar Hahn
705fb972b1
removed projector link from agenda
2012-08-15 13:44:15 +02:00
Oskar Hahn
416f3f6ff3
added select widgets view
2012-08-15 13:42:25 +02:00
Oskar Hahn
6b7ea558fc
rewrote widgets for the dashboard
2012-08-15 11:56:43 +02:00
Oskar Hahn
dfb24ba61a
Merge branch 'master' into dashboard
2012-08-15 11:05:29 +02:00
Oskar Hahn
9c031768f8
fix merge errors
2012-08-15 11:01:38 +02:00
Oskar Hahn
c6bc50e2fd
rename projector to dashboard
2012-08-15 10:58:29 +02:00
Oskar Hahn
b7a0e83c68
changed the main script
2012-08-14 14:19:59 +02:00
Oskar Hahn
a2be848932
Merge branch 'master' into install
2012-08-13 19:35:14 +02:00
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
Oskar Hahn
d0e7419666
Merge remote-tracking branch 'openslides/stable/1.2.x'
2012-08-13 18:36:23 +02:00
Oskar Hahn
5178363127
Merge pull request #6 from ostcar/translation
...
Translation
2012-08-13 09:30:17 -07:00
Oskar Hahn
31ca01563e
some corrective actions
2012-08-13 14:37:49 +02:00
Oskar Hahn
df40de67b0
rename openslidesuser to user and openslidesgroup to group
2012-08-12 12:52:38 +02:00
Oskar Hahn
0a8ee9cbad
changed request.user to be the openslidesuser
2012-08-12 10:12:26 +02:00
Oskar Hahn
6795ccd25b
change the users in the groupform
2012-08-11 11:36:55 +02:00
Oskar Hahn
cdf160dfc3
fix some problems with the creation of new users
2012-08-11 11:09:20 +02:00
Oskar Hahn
f01fe5a894
removed unused imports from participant and did some pep8 changes
2012-08-11 10:51:52 +02:00
Oskar Hahn
bc3e7fdaab
rewrote the group views as class based views
2012-08-11 10:09:54 +02:00
