Emanuel Schuetze
a010df5d1f
Reverted person.sort_name AttributeError fix ( e0ce1052c0)
2012-11-27 22:54:07 +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
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
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
