c58d478151
rename render_to_forbitten to render_to_forbidden. #370
2012-10-24 11:39:27 +02:00
17afa3c5d1
fixed #326 whitespace in allready used names
2012-10-24 11:35:07 +02:00
681d909fa3
rename application to motion
2012-10-24 11:07:36 +02:00
c036be05bf
Fix new class based view for support/unsupport motions. Fix strange error in QuestionMixin.
2012-10-23 11:54:18 +02:00
fe69973dcc
Change version number to 1.3a1. Insert git hash as suffix of the version number. (Ticket #388 )
2012-10-23 02:03:47 +02:00
fa9874038e
New welcome widget.
2012-09-20 20:45:37 +02:00
3aefd252ff
Merge remote-tracking branch 'emanuel/master'
2012-09-20 10:05:00 +02:00
5b97250df2
Small fix with the overlay message
2012-09-20 09:55:27 +02:00
a60f03aebc
Fixed: Application is deleted if user clicks 'No' in confirm form.
2012-09-19 17:00:40 +02:00
9f9ea81fc6
Fixed attribute error if anonymous opens application/assignment view.
2012-09-19 14:16:17 +02:00
4cd1ad5954
Fixed missing supporters number
2012-09-19 11:58:24 +02:00
3bde0a8af9
Use Class-based View to support or unsupport an application. Use QuestionMixin for a confirm message
2012-09-19 03:10:15 +02:00
613956b62a
Fixed missing blue 'candidate elected' line in assignment projector template.
2012-09-18 22:55:31 +02:00
1548479069
Fixed application and assigment ballot paper: don't use old profile object.
2012-09-18 22:47:12 +02:00
12d8527255
Updated translations.
2012-09-18 22:40:30 +02:00
9cb9270df3
Assignment: Fixed generating ballot pdf paper (typo: surfix).
2012-09-18 22:37:53 +02:00
5aa2bc650f
Merge pull request #18 from normanjaeckel/Default_Sorting
...
Default sorting using Meta Class option and new config var
2012-09-15 00:23:50 -07:00
eb267acf08
removed scrollbar in projector-template
2012-09-15 09:13:36 +02:00
2984fd791c
small fix to the person api
2012-09-15 09:11:56 +02:00
0db8af15b7
Clean up the code for pull request
2012-09-14 23:53:59 +02:00
269b093b28
Enhence use of config var and Meta Class for default sorting of users
2012-09-14 03:02:00 +02:00
e5c132e34c
Use new config var for sorting users
2012-09-14 02:46:43 +02:00
f41fe87656
Insert new config var for sorting Users by first_name
2012-09-14 02:40:40 +02:00
f8d3390c78
Docstrings and sorting of Users and Groups in the UsersAndGroupsToPersons class object (was: UsersConnector)
2012-09-14 02:24:02 +02:00
811b780fb9
Fix typo TYPE_CHOICE to TYPE_CHOICES
2012-09-14 01:52:20 +02:00
cb3b26c45d
Default sorting of applications using Meta Class
2012-09-14 01:14:25 +02:00
77ae543ff2
Using Meta Class for ordering assignments by name
2012-09-14 00:21:59 +02:00
eac23ecd99
remove confusing image
2012-09-13 22:02:42 +02:00
56e3fe7a37
fix translation
2012-09-13 21:56:50 +02:00
f0f14861e8
fixed message for unblocking users
2012-09-13 21:51:50 +02:00
d8136045bb
update application pdf
2012-09-13 21:33:57 +02:00
0cf0e58af9
Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides
...
Conflicts:
openslides/assignment/models.py
2012-09-13 15:28:35 +02:00
ef7deb90c9
translate agenda hidden filter in js
2012-09-13 15:21:43 +02:00
20ac817d49
Fixed error message when delrun after the list is closed
2012-09-13 15:07:24 +02:00
e64f4f5efc
show blocked candidates of an assignment
2012-09-13 14:59:14 +02:00
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
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
b15d70d13d
typo
2012-09-13 11:52:04 +02:00
bcfceccb09
dont use simular passwords in gen_password (no Il10oO)
2012-09-13 11:50:06 +02:00
63835e7443
fixed application deletion
2012-09-13 11:43:11 +02:00
760f8e042e
some fixes
2012-09-12 10:17:51 +02:00
7376b7a692
Updated translations.
2012-09-11 20:50:53 +02:00
93ee260856
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-09-11 19:30:50 +02:00
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
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
1b65044223
Remove a few spaces for pep8 conformance
2012-08-28 19:07:40 +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
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
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
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
153482f32d
first_name, last_name and name_surfix as OpenSlidesUser attributes
2012-08-10 11:14:11 +02:00
3ba04e10b4
Fix typo in default permissions for anonymous-group
2012-08-10 00:37:23 +02:00
b19f6a7d74
Merge branch 'master' into install
...
Conflicts:
openslides/__init__.py
2012-08-08 13:45:32 +02:00
5353053d29
Merge branch 'stable/1.2.x'
...
Conflicts:
openslides/application/views.py
2012-08-08 11:21:36 +02:00
75443808af
fix some errors in participant
2012-08-08 10:52:13 +02:00
d1ab2f2e85
some pep8 corections for the participant app
2012-08-08 10:34:23 +02:00
f22362df9d
made participant-test run again
2012-08-08 10:07:36 +02:00
1719aa588d
rename some user api and participant names
2012-08-07 22:43:57 +02:00
b55ceddb82
append tests for the participant app
2012-08-07 10:15:39 +02:00
ab33b9f05a
fix error in application-supporters an assignment-candidates, for non admin users
2012-08-06 14:58:52 +02:00
f8f6e712a7
added LOCALE_PATHS to openslides_settings to avoid deprication in Django 1.5
2012-08-05 22:35:09 +02:00
c52f8f3ca7
changed application to motion and permitted to authorized in message-strings
2012-08-05 22:31:20 +02:00
008c743650
fixt #334 . Let the anonymous user see the assignments by default
2012-08-05 11:58:11 +02:00
998fb3e1ee
fix #336 . The admin could not edit the supporters from applications
2012-08-05 11:48:03 +02:00
4873cd7163
fixted #330 . Error if the related slide for an Agenda Item does not exists
2012-08-05 11:28:56 +02:00
bcd98301a9
remove mercurial_version from openslides.__init__
2012-08-05 10:59:25 +02:00
feb1aa4138
make start.py script run again
2012-08-05 09:52:00 +02:00
e3f8bfcfd0
update setup.py to make an openslides module
2012-08-04 20:59:27 +02:00
1a1bcb2358
updated some parts of OpenSlides to the new user-api
2012-08-04 15:15:11 +02:00
465497ab30
some pep8 changes for the user-api
2012-08-04 14:47:09 +02:00
72e41fe286
user-api: reorderd the user-api
2012-08-04 13:18:06 +02:00
fe1ebf806a
user-api: Use the right Exception in get_user()
2012-08-04 12:51:07 +02:00
8da09bb985
user-api: fix an error with deactivated supporters in application
2012-08-04 12:46:32 +02:00
14bf6d0a35
user-api: updated the application-supporter system to new user-api
2012-08-04 12:19:31 +02:00
2bc2dad7a5
user-api: small fix for the second poll in assignment
2012-08-03 19:15:14 +02:00
8fcf65e829
user-api: make the assignments work with the new user-api
2012-08-03 18:56:00 +02:00
c16d38d9a3
user-api: Load the User-List from UserFormField on any request
2012-08-03 16:25:04 +02:00
1ae91d1130
changed user-api, so it can be filter the result for the prefix and the id
2012-08-03 14:23:13 +02:00
4f61c763d7
started to rewrite the assignment-code for the new user-api
2012-08-03 13:49:05 +02:00
93020f9ead
mark group to be teated as user
2012-08-03 12:44:34 +02:00
4ffb701397
created new user-api
2012-08-03 00:11:53 +02:00
e34f90aad1
update german translation
2012-07-28 11:09:00 +02:00
47a40150e6
added " befor permitted.
...
This changes a translation string
2012-07-28 11:01:57 +02:00
b2ce59080e
#332 use an specific name for the session cookie
2012-07-27 23:18:31 +02:00
ecfeb170f3
we can not redirect from a poll, that does not exists to an assignment.
2012-07-27 22:49:38 +02:00
9a87db61cc
#329 fix attribute error for anonymous users in the application view
2012-07-27 11:56:20 +02:00
feb82bd531
Updated translation.
2012-07-25 23:21:30 +02:00
8b39a4dfeb
Hide div container of tabledrag to eleminate space between table and number of items.
2012-07-25 21:37:20 +02:00
5d367dd635
Prepared 1.2 release.
2012-07-25 14:10:55 +02:00
172b90ea1b
#328 : Translated application status error message.
2012-07-24 07:32:20 +02:00
0c0f3d09da
#328 : Show error message if application status is already set.
2012-07-23 23:17:03 +02:00
1f3cfaf25a
Added ugettext_lazy for 403 error page.
2012-07-23 23:06:36 +02:00
f3d656c98d
#325 : participant/passwords/print/ raises server-error
2012-07-23 23:03:42 +02:00
f12d155651
Added linebreak.
2012-07-23 23:00:00 +02:00
cdddc00d54
Improved else block.
2012-07-23 22:59:31 +02:00
f36ad67bb9
Removed additional <hr> tag from custom slides widget.
2012-07-23 19:21:47 +02:00
d58e8f4c84
Fixed filename of assignment poll pdf.
2012-07-23 12:58:46 +02:00
bf5181e241
Fixed missing translation in PDF title and filename.
2012-07-23 12:57:47 +02:00
219b1e936e
Fixed two PDF build errors.
2012-07-23 12:35:15 +02:00
9d2a011958
update translation
2012-07-23 09:33:19 +02:00
797396d94d
#322 remove the dot at the end of a assignment-model verbose-name
2012-07-23 09:30:34 +02:00
0ce6627756
Fixed csv import error.
2012-07-23 08:55:05 +02:00
e74e80299f
Fix application links in the widgets.
2012-07-23 00:41:44 +02:00
fedfe802e3
#315 remove 'application' from agenda/widget.html, too
2012-07-20 13:26:45 +02:00
93f9e2dc97
fix error in the translation of the participant-list
2012-07-20 11:40:36 +02:00
8854f7f9ba
#319 sort participants by there last_name by default
2012-07-20 11:34:37 +02:00
e1a2f18f74
#316 fix translation of the confirm message in the general config page
2012-07-20 11:31:28 +02:00
e2d658b0d8
#321 change assignment string for the comment on the ballot paper
2012-07-20 11:24:34 +02:00
ff4529d8eb
#315 remove application from agenda by appending a new methode get_application_title_supplement
2012-07-20 11:22:09 +02:00
078125a1a2
update translation
2012-07-20 11:05:04 +02:00
0c834532db
#317 change string for the automatic methode of choosind the right assignment-poll-methode
2012-07-20 10:59:34 +02:00
469e93e21d
rm beamer.html from agenda. created by merging the 1.2-dev branch in the default branch
2012-07-20 10:55:57 +02:00
ba783489f2
changle end of line to windows for some files
2012-07-20 10:55:07 +02:00
189d0bf5e1
Merged.
2012-07-19 14:55:58 +02:00
fd0f3d68fa
Fix typo in participant/views.py
2012-07-19 12:27:45 +02:00
Oskar Hahn