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
691a27655c
Include the README.txt as long-description into the distribution
2012-11-25 00:28:41 +01:00
Oskar Hahn
5d5989b67e
removed the tests package from the distribution
2012-11-25 00:19:38 +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
763da9233b
Fixed error in get_version
2012-11-24 21:21:34 +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
Oskar Hahn
65eeffe1c1
Changed pil to PIL in requirements
2012-11-24 16:51:21 +01:00
Oskar Hahn
42573affd8
Merge pull request #56 from ostcar/master
...
Travis
2012-11-24 07:33:31 -08:00
Oskar Hahn
5cf27b358d
added simplejson into the requirements for python 2.5
2012-11-24 16:28:47 +01:00
Oskar Hahn
a7c13e3285
added script to create a local settings
2012-11-24 16:22:48 +01:00
Oskar Hahn
ddd251a742
fix for travis
2012-11-24 15:43:17 +01:00
Oskar Hahn
4eed43f782
Configured the repo for travis
2012-11-24 15:26:20 +01:00
Andy Kittner
220abe45c3
Copy _ctypes.pyd
...
We need ctypes to determine the local app data directory (used for
settings.py when portable dir is not writable)
2012-11-24 15:01:54 +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
a4f28654c7
Merge pull request #55 from ostcar/master
...
cleanup
2012-11-24 05:03:56 -08:00
Oskar Hahn
bd32994296
cleanup
...
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
Oskar Hahn
4f82151004
Merge branch 'registered_group'
2012-11-24 01:43:33 +01:00
Oskar Hahn
f5a438cf9f
cleanup in utils
2012-11-24 01:42:10 +01:00
Oskar Hahn
b75c9f32db
Merge pull request #54 from ostcar/registered_group
...
Created a default group for registered users
2012-11-23 09:33:20 -08: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
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
