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
2acfd02144
Merge pull request #45 from normanjaeckel/GroupSlide
...
Insert a slide for groups
2012-11-21 12:18:17 -08:00
f3c865ee3c
#176 : Adjusted user slide. Show only relevant information in a nice and clear layout.
2012-11-21 21:05:56 +01:00
c5a2f896e2
Fixed typo in identifier 'assignment_candidates'.
2012-11-21 20:12:08 +01:00
da0757e40f
#417 : Don't hide vote results table if status is reset
2012-11-21 19:39:55 +01:00
17d813e08b
Show error message for NameError.
2012-11-21 19:36:12 +01:00
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
06af94fb91
Fix assignment poll choosing the right method (yes-no-abstain True or False)
2012-11-21 15:03:29 +01:00
8e886a22ef
Insert a slide for groups
2012-11-21 14:22:30 +01:00
00e77ba0fc
Use join for the group list also in the participant view
2012-11-21 14:09:47 +01:00
5939b98772
Use join for group list in UserSlide.html
2012-11-21 14:07:14 +01:00
d69e5a246b
Fix urls.py - Redirect from / to the dahsboard
2012-11-21 13:41:16 +01:00
7fa86f7de0
Used blocktrans instead of trans
2012-11-20 12:37:16 +01:00
ec10f357cf
Used RedirectView from openslides.utils.views. Used reverse_lazy
...
instead of hard coded redirect url.
2012-11-20 12:19:12 +01:00
5e97ece5f4
#278 : Used cycle rowcolor in vote results table also for inavlid votes row
2012-11-19 23:52:48 +01:00
0fbb7dced3
Rename participant field 'details' to 'structure level' (Gliederungsebene). (DB rebuild required!)
2012-11-19 23:30:09 +01:00
844b2892f1
Updated translation for professional support footer.
2012-11-19 23:05:38 +01:00
c5595effef
Updated translation.
2012-11-19 22:59:13 +01:00
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
0cf4191934
Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty.
2012-11-17 23:44:41 +01:00
b10cf331ab
Updated translation
2012-11-17 22:24:29 +01:00
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
e338529865
#296 : Localised the datetime in PDF header
2012-11-17 21:44:17 +01:00
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
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
28cf531e4d
Pass along database path to create_settings if started as portable version
2012-11-09 13:45:52 +01:00
b8bbec3a04
Merge pull request #42 from emanuelschuetze/master
...
Several minor fixes for 1.3-beta2
2012-11-09 01:16:37 -08:00
6719cca7e1
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2012-11-09 09:52:00 +01:00
54fb61d211
fixed main.py and manage.py for the openslides.exe
2012-11-09 09:51:10 +01:00
81570b61e6
Rename submenu titel 'projector' to 'dashboard'.
2012-11-08 20:11:06 +01:00
216ac95cfb
Redirect to dashboard after submit widget selection form.
2012-11-08 20:08:09 +01:00
5623bb6888
Move professional support message into base template footer.
2012-11-08 19:13:31 +01:00
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
e601d8a5a3
Fixed display_name of widgets.
2012-11-08 09:43:04 +01:00
7c75f42d85
Updated translations.
2012-11-08 09:42:35 +01:00
cbea48ab7e
Merge pull request #40 from emanuelschuetze/master
...
Fixed type in pdf list
2012-11-08 00:26:12 -08:00
de7d4ed6cd
Merge pull request #34 from normanjaeckel/UserSlide
...
Add UserSlide with new template.
2012-11-08 00:25:04 -08:00
8d599d6428
Fixed type in participants PDF list.
2012-11-08 09:22:23 +01:00
f551b2fa6d
Merge pull request #39 from emanuelschuetze/master
...
Last translation update for 1.3-beta2
2012-11-07 13:43:02 -08:00
71790a345b
Fixed some English strings. Updated translations.
2012-11-07 22:37:33 +01:00
030058fb7c
Merge pull request #37 from andkit/master
...
Fix UnicodeError on widgets page
2012-11-07 13:35:24 -08:00
a3627b77b4
Added new allowed language (French).
2012-11-07 22:24:39 +01:00
b66a57d341
Prepared 1.3-beta2 release.
2012-11-07 22:21:55 +01:00
9d183e9746
Rename user group to group. Updated translations. Clean up new french po file.
2012-11-07 22:16:11 +01:00
7b64d464f5
Added user view url also for last_name.
2012-11-07 21:27:59 +01:00
32a76e2aad
Fix UnicodeError on widgets page
2012-11-07 21:12:52 +01:00
af4f923527
Fixed KeyError in main.py.
2012-11-07 20:48:07 +01:00
0330f74d1b
Merge pull request #35 from andkit/master
...
Fix missing translations (#415 )
2012-11-07 01:24:54 -08:00
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
a691db5d30
updated fr translation
...
Thx to Moira
2012-11-07 10:22:32 +01:00
René Köcher