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

1116 Commits

Author SHA1 Message Date
Norman Jäckel
e7744f8210 Merge branch 'master' into Version_String 2012-12-01 13:10:29 +01:00
Oskar Hahn
e76ec5e975 Added a new command to the startscript to show the version 2012-11-29 15:01:49 +01:00
Norman Jäckel
d53017eea8 Get git commit id also in detached head mode. 2012-11-28 18:02:33 +01:00
Norman Jäckel
589c209c79 Merge branch 'master' into Version_String 
Conflicts:
	openslides/__init__.py
	openslides/config/views.py
 2012-11-28 17:54:29 +01:00
Oskar Hahn
ab4c5791ad Merge pull request #61 from ostcar/master 
Forbid the deletion of the registered group
 2012-11-28 05:16:10 -08:00
Oskar Hahn
8306e7bf6e Don't allow to remove the registered group 2012-11-28 13:59:14 +01:00
Oskar Hahn
48b530487b Merge pull request #59 from emanuelschuetze/master 
Prepared 1.3-rc1
 2012-11-27 13:59:38 -08:00
Emanuel Schuetze
a010df5d1f Reverted person.sort_name AttributeError fix (e0ce1052c0) 2012-11-27 22:54:07 +01:00
Oskar Hahn
e7c47395bb Gave the empty user all the attributes it needs 2012-11-27 22:46:54 +01:00
Emanuel Schuetze
ae35a8c719 Updated translations 2012-11-27 21:30:45 +01:00
Emanuel Schuetze
94928c20c5 Updated translation msg strings. 2012-11-27 21:22:57 +01:00
Emanuel Schuetze
301a379fa6 Prepared 1.3-rc1 release. 2012-11-27 20:13:18 +01:00
Emanuel Schuetze
40984a6508 Merge remote branch 'upstream/master' 2012-11-27 20:10:13 +01:00
Oskar Hahn
4dfd4ac67f fix _proper_unicode 2012-11-26 15:48:23 +01:00
Oskar Hahn
bdfb714013 fixed pep8 in pdf.py 2012-11-26 10:35:29 +01:00
Oskar Hahn
c276bce780 Let travis test pep8 2012-11-26 10:11:36 +01:00
Oskar Hahn
abd21dd345 Added more tests for the agenda 2012-11-26 10:05:51 +01:00
Oskar Hahn
fddf929ab5 Load groups_de when creating the database 2012-11-25 01:07:39 +01:00
Oskar Hahn
ab4b117a93 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2012-11-25 00:55:37 +01:00
Oskar Hahn
a31a67c32e removed initial_data 2012-11-25 00:55:25 +01:00
Oskar Hahn
804b514597 Merge pull request #57 from andkit/bug-409 
Fix #409
 2012-11-24 12:29:44 -08:00
Oskar Hahn
3f469ab9d6 Commited the fix for get_version 2012-11-24 21:26:09 +01:00
Oskar Hahn
b3806d8cdd some tests for the agenda 2012-11-24 21:10:55 +01:00
Andy Kittner
5979b23b04 Merge remote-tracking branch 'origin/master' into bug-409 
Conflicts:
	openslides/main.py
 2012-11-24 20:49:04 +01:00
Andy Kittner
21a51523a4 Make pep8.py happy 2012-11-24 20:35:06 +01:00
Emanuel Schuetze
ec60207cfd Fixed typo (candidation -> candidature) 2012-11-24 17:39:28 +01:00
Emanuel Schuetze
e0ce1052c0 Catch AttributeError for 'person.sort_name' in assignment/models.py 2012-11-24 17:34:56 +01:00
Andy Kittner
c405e9b648 Rework default settings handling (fixes #409) 2012-11-24 15:00:36 +01:00
Oskar Hahn
6b2645d11c reordered the tests 
moved the tests from the openslides-module to an own module
configured coverage
 2012-11-24 15:00:17 +01:00
Oskar Hahn
bd32994296 cleanup 
Removed unused imports and fixed pep8 errors
 2012-11-24 14:01:21 +01:00
Oskar Hahn
f5a438cf9f cleanup in utils 2012-11-24 01:42:10 +01:00
Norman Jäckel
4c97291598 Remove non-used revision template var. 2012-11-23 11:33:34 +01:00
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
e168445497 fixed error, which allowed admins to delete the anonymous grou 2012-11-22 17:29:49 +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
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
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
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
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
Emanuel Schuetze
d5ee6d69b6 Enlarged users select box in new/edit group form. 2012-11-21 22:06:22 +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
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
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
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
Emanuel Schuetze
0cf4191934 Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty. 2012-11-17 23:44:41 +01:00
Emanuel Schuetze
b10cf331ab Updated translation 2012-11-17 22:24:29 +01:00
Emanuel Schuetze
27fa32b718 Removed frontpage and redirect '/' to dashboard url (because there is already a new welcome widget with the content of the frontpage on dashboard) 2012-11-17 22:14:49 +01:00
Emanuel Schuetze
e338529865 #296: Localised the datetime in PDF header 2012-11-17 21:44:17 +01:00
Emanuel Schuetze
71eb529adf Fixed #403: Moved projector control icons into projector live widget (Added RequestContext to check perms in template.) 2012-11-17 20:59:30 +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
Andy Kittner
28cf531e4d Pass along database path to create_settings if started as portable version 2012-11-09 13:45:52 +01:00
Oskar Hahn
b8bbec3a04 Merge pull request #42 from emanuelschuetze/master 
Several minor fixes for 1.3-beta2
 2012-11-09 01:16:37 -08:00
Oskar Hahn
6719cca7e1 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2012-11-09 09:52:00 +01:00
Oskar Hahn
54fb61d211 fixed main.py and manage.py for the openslides.exe 2012-11-09 09:51:10 +01:00
Emanuel Schuetze
81570b61e6 Rename submenu titel 'projector' to 'dashboard'. 2012-11-08 20:11:06 +01:00
Emanuel Schuetze
216ac95cfb Redirect to dashboard after submit widget selection form. 2012-11-08 20:08:09 +01:00
Emanuel Schuetze
5623bb6888 Move professional support message into base template footer. 2012-11-08 19:13:31 +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
Emanuel Schuetze
7c75f42d85 Updated translations. 2012-11-08 09:42:35 +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
Oskar Hahn
f551b2fa6d Merge pull request #39 from emanuelschuetze/master 
Last translation update for 1.3-beta2
 2012-11-07 13:43:02 -08:00
Emanuel Schuetze
71790a345b Fixed some English strings. Updated translations. 2012-11-07 22:37:33 +01:00
Oskar Hahn
030058fb7c Merge pull request #37 from andkit/master 
Fix UnicodeError on widgets page
 2012-11-07 13:35:24 -08:00
Emanuel Schuetze
a3627b77b4 Added new allowed language (French). 2012-11-07 22:24:39 +01:00
Emanuel Schuetze
b66a57d341 Prepared 1.3-beta2 release. 2012-11-07 22:21:55 +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
Andy Kittner
32a76e2aad Fix UnicodeError on widgets page 2012-11-07 21:12:52 +01:00
Emanuel Schuetze
af4f923527 Fixed KeyError in main.py. 2012-11-07 20:48:07 +01:00
Oskar Hahn
0330f74d1b Merge pull request #35 from andkit/master 
Fix missing translations (#415)
 2012-11-07 01:24:54 -08:00
Oskar Hahn
4b2fddc9ce Merge pull request #36 from ostcar/fr 
Added fr translation. The work was done from Moira.
 2012-11-07 01:24:09 -08:00
Oskar Hahn
a691db5d30 updated fr translation 
Thx to Moira
 2012-11-07 10:22:32 +01:00