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
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
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
Oskar Hahn
9b3bec69d1
rewrote the passwort reset view as class base view
2012-08-10 21:24:26 +02:00
Oskar Hahn
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
Oskar Hahn
bb00eb3eb4
rewrote participant status view as class based view
2012-08-10 19:19:41 +02:00
Oskar Hahn
90fddba63b
rewrote delete participant view as class based view
2012-08-10 13:29:46 +02:00
Oskar Hahn
ddb5756868
rewrote the participant edit view as class based view
2012-08-10 13:22:09 +02:00
Oskar Hahn
29049119f7
rewrote participant overview as class based view
2012-08-10 11:51:45 +02:00
Oskar Hahn
75443808af
fix some errors in participant
2012-08-08 10:52:13 +02:00
Oskar Hahn
d1ab2f2e85
some pep8 corections for the participant app
2012-08-08 10:34:23 +02:00
Oskar Hahn
1719aa588d
rename some user api and participant names
2012-08-07 22:43:57 +02:00
Oskar Hahn
c52f8f3ca7
changed application to motion and permitted to authorized in message-strings
2012-08-05 22:31:20 +02:00
Oskar Hahn
93020f9ead
mark group to be teated as user
2012-08-03 12:44:34 +02:00
Emanuel Schuetze
f3d656c98d
#325 : participant/passwords/print/ raises server-error
2012-07-23 23:03:42 +02:00
Emanuel Schuetze
bf5181e241
Fixed missing translation in PDF title and filename.
2012-07-23 12:57:47 +02:00
Oskar Hahn
93f9e2dc97
fix error in the translation of the participant-list
2012-07-20 11:40:36 +02:00
Oskar Hahn
8854f7f9ba
#319 sort participants by there last_name by default
2012-07-20 11:34:37 +02:00
Norman Jäckel
fd0f3d68fa
Fix typo in participant/views.py
2012-07-19 12:27:45 +02:00
Oskar Hahn
834c30321b
#310 Redirect to the password-change-page if the admin has not changed his password yet
2012-07-19 11:43:48 +02:00
Emanuel Schuetze
c678b557fa
#311 : Updated first login message and translations.
2012-07-19 08:21:51 +02:00
Emanuel Schuetze
4fe77f89d3
Updated translations.
2012-07-18 21:15:12 +02:00
Oskar Hahn
b327d41ee6
#306 show admin password if it hasn't changed
2012-07-18 10:46:07 +02:00
Oskar Hahn
e80b04504f
#194 fix password when importing users via csv
2012-07-12 14:37:01 +02:00
Oskar Hahn
07a0d42577
#285 append tabs to password-change-view
2012-07-11 09:46:15 +02:00
Oskar Hahn
debaa505fb
fix problems with reportlab and ugettext_lazy
2012-07-10 12:11:07 +02:00
Oskar Hahn
8d961f4940
fix translation by using ugettext_lazy
2012-07-10 01:33:03 +02:00
Oskar Hahn
8feb195067
fix typo
2012-07-08 09:01:01 +02:00
Oskar Hahn
dc9dabff6d
cleaned up the participant app. Sort of...
2012-07-07 15:26:00 +02:00
Oskar Hahn
e1d13e31ae
#214 seperate page for password change
2012-07-01 16:56:01 +02:00
Emanuel Schuetze
a6c220ca02
Reverted wrong testing code (for participants) from last commit.
2012-06-06 13:51:54 +02:00
Emanuel Schuetze
d8cd0c2b6a
Renamed logo files (typo).
2012-06-04 10:17:56 +02:00
Emanuel Schuetze
9b6640c2ae
Removed unused link var.
2012-05-20 19:44:29 +02:00
Emanuel Schuetze
189c975137
Use same url to toggle participant status.
2012-05-19 19:22:20 +02:00
Andy Kittner
d3cf5c9311
Correctly handle first time passwords ( #194 )
...
- Save User object after setting the password
- Only generate first time password if none was explicitly specified
2012-05-19 10:33:59 +02:00
Emanuel Schuetze
8ec3099620
#197 : Rename the default User Group "Delegierte" to "Delegierter"
2012-05-17 22:03:48 +02:00
Emanuel Schuetze
e1799b4c83
#155 : remove header/footer in first-password-pdf
2012-04-29 18:58:51 +02:00
Emanuel Schuetze
1a4a748e6c
#112 : Use monotype for printing first time password
2012-04-27 22:47:41 +02:00
Emanuel Schuetze
7ef298881d
Updated license header.
2012-04-25 22:29:19 +02:00
Emanuel Schuetze
5f3c6c4821
#111 : Move pdf creation code from utils to participant app.
2012-04-20 23:23:50 +02:00
Oskar Hahn
e9e9fa54b2
fixed problem with deleting the default permissions
2012-04-18 16:57:33 +02:00
Emanuel Schuetze
95d5929449
Added participant and version config page. Moved system settings to general. Some style work.
2012-04-15 12:39:28 +02:00
Emanuel Schuetze
36ca264931
Remove superuser function.
2012-04-15 09:35:51 +02:00
Oskar Hahn
6f377453bc
rename system in config. Add default config in each apps
2012-04-14 12:52:56 +02:00
René Köcher
cdf3628e8b
Check input files for UTF-8 encoding and display an appropriate error if not.
2012-04-13 22:33:47 +02:00
René Köcher
3bea7f1234
Ignore malformed lines in import file (ported from application import).
2012-04-13 22:02:14 +02:00
Oskar Hahn
f889c49c1b
some clean up in participant app
2012-04-13 11:35:53 +02:00
René Köcher
733d78373e
#84 : Participants CSV import deletes applications
2012-04-12 19:11:07 +02:00
Emanuel Schuetze
42820c1254
#83 : Merged fix of r365 from default branch into 1.2-dev branch.
2012-04-02 08:37:34 +02:00
Emanuel Schuetze
84e5b3d061
#82 : Merged fix of r364 from default branch into 1.2-dev branch.
2012-04-02 08:36:22 +02:00
Emanuel Schuetze
9c13667ff0
#81 : Merged fix of r363 from default branch into 1.2-dev branch.
2012-04-02 08:35:10 +02:00
Emanuel Schuetze
4045c79a17
#80 : Merged fix of r362 from default branch into 1.2-dev branch.
2012-04-02 08:31:26 +02:00
Oskar Hahn
c4c42611b4
generate tab liste by app list
2012-03-18 17:11:58 +01:00
Oskar Hahn
bc05b78648
rewrote the config api
2012-02-15 12:04:11 +01:00
Emanuel Schuetze
e91df2b67b
Fixed CSV changes: Added support for python 2.5.x.
2011-11-29 11:02:31 +01:00
Emanuel Schuetze
8ef0b0ad81
Merged.
2011-11-24 19:53:03 +01:00
Emanuel Schuetze
72de1dce74
Fixed missing form invalid error message.
2011-11-24 19:42:32 +01:00
rene
d75e736be7
Add patchup-helper to assist csv.Sniffer()
2011-11-24 19:38:25 +01:00
rene
c448ce95bd
Switch to python-provided CSV module - implements #66
2011-11-22 18:49:36 +01:00
Emanuel Schuetze
52dc3f2a1a
Fixed #63 : First password is always generated after saving participant edit form.
2011-11-17 18:14:41 +01:00
rene
528b49da99
Use gen_password() for new user objects created via user or application import.
2011-11-14 21:54:42 +01:00
Emanuel Schuetze
d54afd7ad6
Removed generate passwords function/link. Now passwords will be generated after creating participants.
2011-11-14 21:25:20 +01:00
Emanuel Schuetze
e7d8b8a5ee
#58 : Generate password after user createion automatically.
2011-11-14 21:13:13 +01:00
rene
9f50863439
Implement rights for anonymous as requested by #45
2011-11-14 16:37:12 +01:00
Emanuel Schuetze
34f76c8c28
#27 : Added default sort for assignments and participants.
2011-10-05 21:35:20 +02:00
Emanuel Schuetze
7aed6ac354
encoding error
...
HGr Bitte gib eine Versions-Meldung ein. Zeilen beginnend mit 'HG:' werden entfernt.
2011-09-21 20:56:58 +02:00
Emanuel Schuetze
c6fd0beae6
Import parse_qs from cgi instead from urlparse for old python versions.
2011-09-12 08:32:05 +02:00
Emanuel Schuetze
1dc631d82d
Automated merge with ssh://openslides.org/openslides
2011-09-12 08:06:44 +02:00
Oskar Hahn
f673233a18
fixt encoding-error
...
the new filter-sort-function take use of urllib.urlencode. This function
does not encode unicode-strings. So we have to decode every value in the
sortfilter-dict
2011-09-10 09:40:39 +02:00
Oskar Hahn
97327a3b17
rewrote the filter and sort system for participant
2011-09-10 00:16:57 +02:00
Emanuel Schuetze
72a2b824fd
Added error messeage for import function if you are not superuser.
2011-09-09 10:55:33 +02:00
Oskar Hahn
8ad6ebfeee
realy save password with the user_reset_password function
2011-09-07 14:21:42 +02:00
Emanuel Schuetze
4fb4691f14
Added counter and message for password generation.
2011-09-05 22:26:19 +02:00
Emanuel Schuetze
35c0b50940
Fix redirect for user group overview.
2011-09-05 19:53:40 +02:00
Oskar Hahn
41fbd456d2
add group by user-import
2011-09-05 10:11:47 +02:00
Oskar Hahn
90991f62e7
Automated merge with ssh://oshahn.de/openslides
2011-09-05 09:08:20 +02:00
Oskar Hahn
510cbf8374
reorder user-import csv data
2011-09-05 09:08:12 +02:00
Emanuel Schuetze
d1d0e7e9b4
Updated permissions.
2011-09-04 12:21:58 +02:00
Oskar Hahn
a89bf9f49b
Automated merge with ssh://oshahn.de/openslides
2011-09-04 09:57:30 +02:00
Oskar Hahn
a1d92dc1bb
generate username with first and lastname
2011-09-04 09:57:23 +02:00
Emanuel Schuetze
a6652e3fb4
Updated participants list with permissions.
2011-09-04 09:12:15 +02:00
Emanuel Schuetze
a05b576f9e
Print password pdf with url and welcometext.
2011-09-04 00:54:45 +02:00
Oskar Hahn
31e663d274
Automated merge with ssh://oshahn.de/openslides
2011-09-03 19:43:31 +02:00
Oskar Hahn
67f650aee8
error by password reset function
2011-09-03 19:42:43 +02:00
Emanuel Schuetze
2ad0754f88
Added and fixed apply buttons. Updated translation.
2011-09-03 19:25:05 +02:00
Oskar Hahn
e849716ee4
default password and reset function
2011-09-03 17:17:29 +02:00
Oskar Hahn
3db6a12024
Add code
2011-07-31 10:46:29 +02:00