ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,622 Commits 6 Branches 42 Tags 64 MiB
d81c3bb1f8
Commit Graph

277 Commits

Author SHA1 Message Date
Oskar Hahn
fbf81e7780 sort persons 2012-11-22 16:19:09 +01:00
Emanuel Schuetze
cbd04327bb Reverted: Administrator can be deleted by other manager. (partly reverted 533c65562d after discus it with oskar because import also possible as non-admin) 2012-11-21 23:26:54 +01:00
Emanuel Schuetze
830f85109d Minor formatting work. 2012-11-21 23:03:14 +01:00
Emanuel Schuetze
ec1a15a835 #175: Adjusted group slide; analog to user slide. 2012-11-21 21:45:19 +01:00
Oskar Hahn
2acfd02144 Merge pull request #45 from normanjaeckel/GroupSlide 
Insert a slide for groups
 2012-11-21 12:18:17 -08:00
Emanuel Schuetze
f3c865ee3c #176: Adjusted user slide. Show only relevant information in a nice and clear layout. 2012-11-21 21:05:56 +01:00
Norman Jäckel
8e886a22ef Insert a slide for groups 2012-11-21 14:22:30 +01:00
Norman Jäckel
00e77ba0fc Use join for the group list also in the participant view 2012-11-21 14:09:47 +01:00
Norman Jäckel
5939b98772 Use join for group list in UserSlide.html 2012-11-21 14:07:14 +01:00
Emanuel Schuetze
0fbb7dced3 Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!) 2012-11-19 23:30:09 +01:00
Emanuel Schuetze
f1fb68a569 #375: Missing translation of participant type in participant PDF list. (Now get_type_display() is used.) 2012-11-17 20:02:16 +01:00
Emanuel Schuetze
533c65562d Don't allow to deactivate or delete the superuser or yourself. 
Otherwise it's very danger to lock out your current (superuser) session.
 2012-11-08 18:57:53 +01:00
Emanuel Schuetze
e601d8a5a3 Fixed display_name of widgets. 2012-11-08 09:43:04 +01:00
Oskar Hahn
cbea48ab7e Merge pull request #40 from emanuelschuetze/master 
Fixed type in pdf list
 2012-11-08 00:26:12 -08:00
Oskar Hahn
de7d4ed6cd Merge pull request #34 from normanjaeckel/UserSlide 
Add UserSlide with new template.
 2012-11-08 00:25:04 -08:00
Emanuel Schuetze
8d599d6428 Fixed type in participants PDF list. 2012-11-08 09:22:23 +01:00
Emanuel Schuetze
9d183e9746 Rename user group to group. Updated translations. Clean up new french po file. 2012-11-07 22:16:11 +01:00
Emanuel Schuetze
7b64d464f5 Added user view url also for last_name. 2012-11-07 21:27:59 +01:00
Norman Jäckel
35e41873a0 Add UserSlide with new template. 2012-11-06 00:02:44 +01:00
Emanuel Schuetze
a363efe2ef Fixed #390: Added new user field 'about me' 2012-11-03 09:34:42 +01:00
Emanuel Schuetze
005cb2f15e Updated translations. 2012-11-03 08:59:34 +01:00
Oskar Hahn
424d10cb63 Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1' 
Conflicts:
	openslides/__init__.py
	openslides/projector/views.py
 2012-10-31 15:27:47 +01:00
Norman Jäckel
3b4e19ad3b Enhence template of UserView and GroupView 2012-10-31 14:47:42 +01:00
Emanuel Schuetze
3dd5ce9e73 Fixed default password generation while CSV import. 2012-10-30 23:10:23 +01:00
Emanuel Schuetze
9a522f3835 Use participant_sort_users_by_first_name config var for overview table, participant list (pdf) and first time passwords (pdf). 2012-10-30 23:00:24 +01:00
Emanuel Schuetze
4ee518dd96 Updated translations (for sorting participants). 2012-10-30 22:59:37 +01:00
Emanuel Schuetze
145a52eb24 Updated translations. 2012-10-30 22:16:43 +01:00
Emanuel Schuetze
85771c4af6 Fixed participant CSV import. 2012-10-30 22:05:03 +01:00
Norman Jäckel
c13f4ba52d Add UserView and GroupView part 2 2012-10-30 00:07:25 +01:00
Oskar Hahn
f4e1f83f15 rename test_name_surfix in test_name_suffix in participant/tests.py 2012-10-29 16:27:15 +01:00
Oskar Hahn
79c5e93422 Redesigned the QuestioMixin 2012-10-28 19:59:41 +01:00
Norman Jäckel
015dc159ed Add UserView and GroupView part 1 2012-10-27 18:17:22 +02:00
Norman Jäckel
3f0c31d12b Add user widget and group widget, see # 379 2012-10-26 18:16:09 +02:00
Norman Jäckel
1063e7011a Change query for assignments in personal_info_widget 2012-10-26 17:14:46 +02:00
Norman Jäckel
510aca54eb Add widget with personal info, ticket #25 2012-10-25 23:58:32 +02:00
Oskar Hahn
57d591fee8 Renamed category to detail 2012-10-24 12:30:45 +02:00
Oskar Hahn
3e1938941f Append a default class for the person-api. 
Also fixed the assignment-ballot-paper for group-persons
 2012-10-24 12:15:29 +02:00
Oskar Hahn
17afa3c5d1 fixed #326 whitespace in allready used names 2012-10-24 11:35:07 +02:00
Oskar Hahn
681d909fa3 rename application to motion 2012-10-24 11:07:36 +02:00
Oskar Hahn
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
Oskar Hahn
2984fd791c small fix to the person api 2012-09-15 09:11:56 +02:00
Norman Jäckel
0db8af15b7 Clean up the code for pull request 2012-09-14 23:53:59 +02:00
Norman Jäckel
269b093b28 Enhence use of config var and Meta Class for default sorting of users 2012-09-14 03:02:00 +02:00
Norman Jäckel
e5c132e34c Use new config var for sorting users 2012-09-14 02:46:43 +02:00
Norman Jäckel
f41fe87656 Insert new config var for sorting Users by first_name 2012-09-14 02:40:40 +02:00
Norman Jäckel
f8d3390c78 Docstrings and sorting of Users and Groups in the UsersAndGroupsToPersons class object (was: UsersConnector) 2012-09-14 02:24:02 +02:00
Norman Jäckel
811b780fb9 Fix typo TYPE_CHOICE to TYPE_CHOICES 2012-09-14 01:52:20 +02:00
Oskar Hahn
bcfceccb09 dont use simular passwords in gen_password (no Il10oO) 2012-09-13 11:50:06 +02:00
Oskar Hahn
760f8e042e some fixes 2012-09-12 10:17:51 +02:00
Oskar Hahn
38d53bbb92 fixed first-time-pdf 2012-09-11 19:30:12 +02:00
Emanuel Schuetze
b705df8c5f Changed redirect to dashboard after changing password. 2012-09-10 21:02:58 +02:00
Emanuel Schuetze
ce233fc870 Updated config template. 2012-09-10 17:40:41 +02:00
Emanuel Schuetze
74ffad6ced Minor changes for template style. 2012-09-10 17:17:22 +02:00
Emanuel Schuetze
94ffb3ab45 Redesign login template. 2012-09-07 21:25:18 +02:00
Emanuel Schuetze
7c90206b3f Adjusted new template for participant app. Added new generic form. 2012-09-06 22:41:24 +02:00
Emanuel Schuetze
13cfdb36af Updated login form to new template style. 2012-09-05 00:43:19 +02:00
Emanuel Schuetze
7fde53a09e Updated template with twitter bootstrap. Step 1: agenda and application. 2012-09-05 00:20:28 +02:00
Oskar Hahn
9c031768f8 fix merge errors 2012-08-15 11:01:38 +02:00
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
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
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
c029fe2f95 ix participant tests 2012-08-10 13:26:03 +02:00
Oskar Hahn
ddb5756868 rewrote the participant edit view as class based view 2012-08-10 13:22:09 +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
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
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
b55ceddb82 append tests for the participant app 2012-08-07 10:15:39 +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
c52f8f3ca7 changed application to motion and permitted to authorized in message-strings 2012-08-05 22:31:20 +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
93020f9ead mark group to be teated as user 2012-08-03 12:44:34 +02:00
Oskar Hahn
4ffb701397 created new user-api 2012-08-03 00:11:53 +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
Oskar Hahn
f928abd006 merge 2012-07-19 11:16:38 +02:00
Oskar Hahn
70b161c539 added name for participant app in __init__ 
removed some files, added though branch merge
 2012-07-19 11:11:07 +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
9b8517faeb default value for the config value admin_password 2012-07-18 10:46:26 +02:00
Oskar Hahn
b327d41ee6 #306 show admin password if it hasn't changed 2012-07-18 10:46:07 +02:00