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

77 Commits

Author SHA1 Message Date
Emanuel Schuetze
40984a6508 Merge remote branch 'upstream/master' 2012-11-27 20:10:13 +01:00
Oskar Hahn
c276bce780 Let travis test pep8 2012-11-26 10:11:36 +01:00
Oskar Hahn
bd32994296 cleanup 
Removed unused imports and fixed pep8 errors
 2012-11-24 14:01:21 +01:00
Oskar Hahn
9943e84a96 default permissions for the registered group 
plus some cleanup for the registered and the anonymous group
 2012-11-23 09:35:41 +01:00
Emanuel Schuetze
c115ea59a0 Fixed typo in comment. 2012-11-22 21:48:49 +01:00
Oskar Hahn
fa1c384d28 made use of defaults in get_or_create 2012-11-22 18:47:50 +01:00
Oskar Hahn
1049141483 Created a default group for registered users 2012-11-22 18:39:54 +01:00
Oskar Hahn
1dc7d45670 sort persons in motions 2012-11-22 17:00:09 +01:00
Oskar Hahn
8014f327a2 Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api 2012-11-22 16:35:26 +01:00
Oskar Hahn
fbf81e7780 sort persons 2012-11-22 16:19:09 +01:00
Norman Jäckel
8e886a22ef Insert a slide for groups 2012-11-21 14:22:30 +01:00
Emanuel Schuetze
0fbb7dced3 Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!) 2012-11-19 23:30:09 +01: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
9d183e9746 Rename user group to group. Updated translations. Clean up new french po file. 2012-11-07 22:16:11 +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
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
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
145a52eb24 Updated translations. 2012-10-30 22:16:43 +01:00
Norman Jäckel
c13f4ba52d Add UserView and GroupView part 2 2012-10-30 00:07:25 +01: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
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
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