Commit Graph

1961 Commits

Author SHA1 Message Date
Emanuel Schuetze
a1b3e1c422 Added python 2.5 support for with_statement.
(Fixed install error during 'pip install openslides' on python 2.5
systems.)
2012-11-29 15:00:06 +01:00
Oskar Hahn
638c729dce fixed manage.py for windows 2012-11-28 19:20:43 +01:00
Oskar Hahn
333197e399 Merge pull request #62 from normanjaeckel/INSTALL
Update INSTALL.txt
2012-11-28 09:53:09 -08:00
Norman Jäckel
728fd4d368 Update INSTALL.txt 2012-11-28 18:46:47 +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
7b837fd38f Added extra line 2012-11-27 22:55:41 +01:00
Emanuel Schuetze
a010df5d1f Reverted person.sort_name AttributeError fix (e0ce1052c0) 2012-11-27 22:54:07 +01:00
Oskar Hahn
9b9d801c38 Merge pull request #60 from ostcar/master
Fix emptyuser
2012-11-27 13:51:21 -08:00
Oskar Hahn
e7c47395bb Gave the empty user all the attributes it needs 2012-11-27 22:46:54 +01:00
Emanuel Schuetze
29b37dad74 Fixed file name and path to renamed groups_de.json file. 2012-11-27 22:31:41 +01:00
Emanuel Schuetze
3c54d1fd65 Updated INSTALL to install OpenSlides via Python Package Index (PyPI) 2012-11-27 22:05:06 +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
01cf09f017 Added Alexis Roussel to AUTHORS (Thanks for French translation correction) 2012-11-27 21:22:36 +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
Emanuel Schuetze
01e013cca6 Updated Changlog for 1.3 release. 2012-11-27 20:09:30 +01:00
Emanuel Schuetze
1684701153 Added Moira Bruelisauer (Thanks for contribute French translation) 2012-11-27 20:09:16 +01:00
Oskar Hahn
4dfd4ac67f fix _proper_unicode 2012-11-26 15:48:23 +01:00
Oskar Hahn
62a290c300 Merge pull request #58 from ostcar/master
test pep8
2012-11-26 02:33:34 -08:00
Oskar Hahn
bdfb714013 fixed pep8 in pdf.py 2012-11-26 10:35:29 +01:00
Oskar Hahn
a0e4519b62 fixed travis pep8 line 2012-11-26 10:19:45 +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
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