Oskar Hahn
|
b7a0e83c68
|
changed the main script
|
2012-08-14 14:19:59 +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
|
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
|
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
|
1832a0c125
|
make the openslides user a child model of the django user model
|
2012-08-10 13:11:10 +02:00 |
Oskar Hahn
|
29049119f7
|
rewrote participant overview as class based view
|
2012-08-10 11:51:45 +02:00 |
Oskar Hahn
|
f008a4eb0a
|
use OpenSlides.get_full_name instead of OpenSlides.user.get_full_name
|
2012-08-10 11:18:01 +02:00 |
Oskar Hahn
|
153482f32d
|
first_name, last_name and name_surfix as OpenSlidesUser attributes
|
2012-08-10 11:14:11 +02:00 |
Oskar Hahn
|
d1ab2f2e85
|
some pep8 corections for the participant app
|
2012-08-08 10:34:23 +02:00 |
Oskar Hahn
|
f22362df9d
|
made participant-test run again
|
2012-08-08 10:07:36 +02:00 |
Oskar Hahn
|
1719aa588d
|
rename some user api and participant names
|
2012-08-07 22:43:57 +02:00 |
Oskar Hahn
|
ab33b9f05a
|
fix error in application-supporters an assignment-candidates, for non admin users
|
2012-08-06 14:58:52 +02:00 |
Oskar Hahn
|
14bf6d0a35
|
user-api: updated the application-supporter system to new user-api
|
2012-08-04 12:19:31 +02:00 |
Oskar Hahn
|
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 |
Oskar Hahn
|
4ffb701397
|
created new user-api
|
2012-08-03 00:11:53 +02:00 |
Oskar Hahn
|
9b8517faeb
|
default value for the config value admin_password
|
2012-07-18 10:46:26 +02:00 |
Oskar Hahn
|
8d961f4940
|
fix translation by using ugettext_lazy
|
2012-07-10 01:33:03 +02:00 |
Oskar Hahn
|
dc9dabff6d
|
cleaned up the participant app. Sort of...
|
2012-07-07 15:26:00 +02:00 |
Oskar Hahn
|
e8e664b92e
|
#237, #238 only show the first line of a comment in the agenda
|
2012-06-30 10:39:58 +02:00 |
Oskar Hahn
|
7df1264abf
|
rearange the userprofile. Only show first line from the user.profile.comment in the overview
|
2012-06-23 15:02:13 +02:00 |
Emanuel Schuetze
|
7ef298881d
|
Updated license header.
|
2012-04-25 22:29:19 +02:00 |
Emanuel Schuetze
|
1b8c1eda91
|
Updated translations.
|
2012-04-22 16:51:22 +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 |
Oskar Hahn
|
535795391d
|
remove default permission after syncdb
|
2012-04-14 14:31:09 +02:00 |
René Köcher
|
7e12e1d5e2
|
Support for localized permissions on top of the untranslated django model.
|
2012-04-14 09:28:28 +02:00 |
Oskar Hahn
|
f889c49c1b
|
some clean up in participant app
|
2012-04-13 11:35:53 +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 |
Oskar Hahn
|
c4c42611b4
|
generate tab liste by app list
|
2012-03-18 17:11:58 +01:00 |
Oskar Hahn
|
0957de83a9
|
start to rewrite the poll-api
|
2012-02-14 16:31:21 +01:00 |
Emanuel Schuetze
|
8d21b8d831
|
Participant edit/new form: Changed default value of gender and type to blank/not specified.
|
2011-11-24 19:51:16 +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
|
c53e5267c5
|
Updated translations.
|
2011-09-07 22:46:47 +02:00 |
Emanuel Schuetze
|
096b4c4cb0
|
Changed default value for participant type from delegate to guest.
|
2011-09-07 22:20:07 +02:00 |
Oskar Hahn
|
7d46574498
|
realy realy save password...
|
2011-09-07 14:27:36 +02:00 |
Oskar Hahn
|
8ad6ebfeee
|
realy save password with the user_reset_password function
|
2011-09-07 14:21:42 +02:00 |
Oskar Hahn
|
f6b335245d
|
set more then one firstpassword
|
2011-09-06 10:15:23 +02:00 |
Emanuel Schuetze
|
4fb4691f14
|
Added counter and message for password generation.
|
2011-09-05 22:26:19 +02:00 |
Oskar Hahn
|
90991f62e7
|
Automated merge with ssh://oshahn.de/openslides
|
2011-09-05 09:08:20 +02:00 |
Oskar Hahn
|
c6259d83bb
|
set first password by users with None or '' firstpassword
|
2011-09-05 09:08:00 +02:00 |
Emanuel Schuetze
|
d1d0e7e9b4
|
Updated permissions.
|
2011-09-04 12:21:58 +02:00 |
Oskar Hahn
|
67f650aee8
|
error by password reset function
|
2011-09-03 19:42:43 +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 |