38d53bbb92
fixed first-time-pdf
2012-09-11 19:30:12 +02:00
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
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
e2f87f23ac
Merge pull request #12 from normanjaeckel/sorting_elements_in_widgets
...
Sorting elements in widgets and in the application overview
2012-09-11 00:46:36 -07:00
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
d1c12ea0e5
Sorting applications in the widget by number
2012-09-05 22:42:44 +02:00
2ecd552d2b
Default Sorting of applications by number
2012-09-05 22:38:40 +02:00
d84a8d2bdd
Sorting assignments by name in the widget
2012-09-05 22:19:53 +02:00
55073494fc
Insert weight field in custom slides and order custom slides in the widget
2012-09-05 21:54:34 +02:00
34a690c713
Merge pull request #10 from andkit/master
...
Update portable version to set a suitable default location for settings file
2012-08-28 10:43:52 -07:00
1b65044223
Remove a few spaces for pep8 conformance
2012-08-28 19:07:40 +02:00
ce87353cd4
Update instructions for building the portable
2012-08-27 21:54:12 +02:00
7f6f7a9340
Rebuild openslides.exe
2012-08-27 21:49:05 +02:00
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
14ba868df4
Treat openslides the same way as other packages
...
OpenSlides will now be copied from (and to) site-packages in the same
way as it's dependencies
2012-08-27 20:24:41 +02:00
7321de2400
Merge pull request #8 from normanjaeckel/master
...
Fix encoding error #349
2012-08-24 09:19:55 -07:00
6d1c356ffd
Name openslides_personal_settings.py and openslides_global_settings.oy
2012-08-24 14:23:12 +02:00
32cfa6c914
Fix encoding error in settings.py #349
2012-08-23 23:34:30 +02:00
72f82454ec
Merge pull request #7 from emanuelschuetze/master
...
Dashboard drag'n'drop fix.
2012-08-22 01:59:47 -07:00
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
423f04d0be
send overlay message data to own view
2012-08-15 18:00:22 +02:00
705fb972b1
removed projector link from agenda
2012-08-15 13:44:15 +02:00
416f3f6ff3
added select widgets view
2012-08-15 13:42:25 +02:00
6b7ea558fc
rewrote widgets for the dashboard
2012-08-15 11:56:43 +02:00
dfb24ba61a
Merge branch 'master' into dashboard
2012-08-15 11:05:29 +02:00
9c031768f8
fix merge errors
2012-08-15 11:01:38 +02:00
c6bc50e2fd
rename projector to dashboard
2012-08-15 10:58:29 +02:00
b7a0e83c68
changed the main script
2012-08-14 14:19:59 +02:00
a2be848932
Merge branch 'master' into install
2012-08-13 19:35:14 +02:00
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
d0e7419666
Merge remote-tracking branch 'openslides/stable/1.2.x'
2012-08-13 18:36:23 +02:00
5178363127
Merge pull request #6 from ostcar/translation
...
Translation
2012-08-13 09:30:17 -07:00
3995765dc5
Merge pull request #5 from ostcar/participant
...
Participant
2012-08-13 09:23:55 -07:00
31ca01563e
some corrective actions
2012-08-13 14:37:49 +02:00
df40de67b0
rename openslidesuser to user and openslidesgroup to group
2012-08-12 12:52:38 +02:00
0a8ee9cbad
changed request.user to be the openslidesuser
2012-08-12 10:12:26 +02:00
6795ccd25b
change the users in the groupform
2012-08-11 11:36:55 +02:00
cdf160dfc3
fix some problems with the creation of new users
2012-08-11 11:09:20 +02:00
f01fe5a894
removed unused imports from participant and did some pep8 changes
2012-08-11 10:51:52 +02:00
bc3e7fdaab
rewrote the group views as class based views
2012-08-11 10:09:54 +02:00
9b3bec69d1
rewrote the passwort reset view as class base view
2012-08-10 21:24:26 +02:00
87af568eeb
redesign the DeleteView
...
Append a QuestionMixin to send a question via the django message api
2012-08-10 21:00:13 +02:00
1f2f7cc73a
rewrote user csv import
...
The import does not delete the existing users anymore, but append the users as new users.
2012-08-10 19:49:46 +02:00
bb00eb3eb4
rewrote participant status view as class based view
2012-08-10 19:19:41 +02:00
90fddba63b
rewrote delete participant view as class based view
2012-08-10 13:29:46 +02:00
c029fe2f95
ix participant tests
2012-08-10 13:26:03 +02:00
ddb5756868
rewrote the participant edit view as class based view
2012-08-10 13:22:09 +02:00
1832a0c125
make the openslides user a child model of the django user model
2012-08-10 13:11:10 +02:00
29049119f7
rewrote participant overview as class based view
2012-08-10 11:51:45 +02:00
f008a4eb0a
use OpenSlides.get_full_name instead of OpenSlides.user.get_full_name
2012-08-10 11:18:01 +02:00
Oskar Hahn