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

1905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Norman Jäckel
baebfbb585 Fix get_version, insert and use get_git_commit_id. 2012-11-23 11:31:30 +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
bba301a4b3 #420: Use clean layout for group slide: Remove printing group users; print group name and number of members only. (Later we need a solution to print users fullname not username.) 2012-11-22 22:07:33 +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
a029a66a7c Merge pull request #53 from ostcar/master 
Ticket 399
 2012-11-22 08:31:15 -08:00
Oskar Hahn
e168445497 fixed error, which allowed admins to delete the anonymous grou 2012-11-22 17:29:49 +01:00
Oskar Hahn
12554c71e6 Merge pull request #52 from ostcar/sort_person_api 
Sort person api
 2012-11-22 08:01:30 -08: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
Oskar Hahn
48b0966a8f Merge pull request #50 from Shirk/master 
Fix #419
 2012-11-22 04:19:29 -08:00
René Köcher
ed33b47666 Merge branch 'master' of ssh://ssh.github.com/OpenSlides/OpenSlides 
Conflicts:
	openslides/locale/de/LC_MESSAGES/django.po

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-22 12:52:11 +01:00
Oskar Hahn
fb25473abc Merge pull request #49 from emanuelschuetze/master 
Some minor changes for 1.3
 2012-11-22 02:22:06 -08:00
Oskar Hahn
c815db308d Merge pull request #51 from andkit/portable 
Use checkout instead of installed version to build portable version
 2012-11-22 02:19:01 -08:00
René Köcher
9f51a24311 #419 - aftermath 
- remove accidental print statements left over from debugging
- create missing groups on import

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-22 10:26:44 +01:00
Andy Kittner
073c98d6b1 Remove note about installing openslides before building the portable 2012-11-22 00:29:20 +01:00
René Köcher
36f83808fd Implement #419: Add group column for motion csv import 
The motion import now features an additional column to indicate that the import should be created by an existing group.
If the column is missing it is considered as 'off' and first / last name are used as always.
If the column exists and contains 'y','yes','j','ja','true', '1' or 1 first name will be ignored and last name will be interpreted as a group name.
If the group exists and can act as a person the motion will be imported and assigned to this group.

Signed-off-by: René Köcher <shirk@bitspin.org>
 2012-11-21 23:38:25 +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
e5262ea983 Merge remote branch 'upstream/master' 2012-11-21 23:06:01 +01:00
Emanuel Schuetze
8aec947303 Removed unused widget file (duplicate of welcome_widget.html). 2012-11-21 23:05:38 +01:00
Emanuel Schuetze
830f85109d Minor formatting work. 2012-11-21 23:03:14 +01:00
Oskar Hahn
6b6bd95a07 Merge pull request #48 from emanuelschuetze/master 
Some polishing work (II)
 2012-11-21 13:59:15 -08:00
Emanuel Schuetze
9da7055fc2 Updated INSTALL section: use git instead of hg repository. 2012-11-21 22:12:00 +01:00
Emanuel Schuetze
d5ee6d69b6 Enlarged users select box in new/edit group form. 2012-11-21 22:06:22 +01:00
Emanuel Schuetze
bcfc4531d4 Gender German default group names 2012-11-21 22:05:33 +01:00
Emanuel Schuetze
4877eed46c Updated translation. 2012-11-21 21:45:27 +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
Oskar Hahn
50a6113703 Merge pull request #47 from emanuelschuetze/master 
Some polishing work
 2012-11-21 12:17:56 -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
Emanuel Schuetze
c5a2f896e2 Fixed typo in identifier 'assignment_candidates'. 2012-11-21 20:12:08 +01:00
Emanuel Schuetze
da0757e40f #417: Don't hide vote results table if status is reset 2012-11-21 19:39:55 +01:00
Emanuel Schuetze
17d813e08b Show error message for NameError. 2012-11-21 19:36:12 +01:00
Oskar Hahn
bddf011f6e Merge pull request #46 from normanjaeckel/Fixes 
Some fixes for 1.3
 2012-11-21 08:44:06 -08:00
Norman Jäckel
af6c403936 Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector. 2012-11-21 15:14:38 +01:00
Norman Jäckel
06af94fb91 Fix assignment poll choosing the right method (yes-no-abstain True or False) 2012-11-21 15:03:29 +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
Norman Jäckel
d69e5a246b Fix urls.py - Redirect from / to the dahsboard 2012-11-21 13:41:16 +01:00
Oskar Hahn
9122052ba6 Merge pull request #44 from emanuelschuetze/master 
Some fixes for 1.3
 2012-11-20 08:38:19 -08:00
Emanuel Schuetze
7fa86f7de0 Used blocktrans instead of trans 2012-11-20 12:37:16 +01:00
Emanuel Schuetze
ec10f357cf Used RedirectView from openslides.utils.views. Used reverse_lazy 
instead of hard coded redirect url.
 2012-11-20 12:19:12 +01:00
Emanuel Schuetze
5e97ece5f4 #278: Used cycle rowcolor in vote results table also for inavlid votes row 2012-11-19 23:52:48 +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
844b2892f1 Updated translation for professional support footer. 2012-11-19 23:05:38 +01:00
Emanuel Schuetze
c5595effef Updated translation. 2012-11-19 22:59:13 +01:00
Emanuel Schuetze
93d2dc8d7d Restructuring and optimization of assignment templates. 
(Now: elected candidates are marked in candidate list; blocked candidates not visible for status 'finished')
 2012-11-19 22:54:09 +01:00