Oskar Hahn
|
332f1d8a27
|
Merge pull request #71 from ostcar/master
fr translation
|
2012-12-09 05:19:21 -08:00 |
|
Oskar Hahn
|
67f6b36ebc
|
Updated fr translation from transifex
|
2012-12-09 14:17:52 +01:00 |
|
Oskar Hahn
|
1173cd610b
|
Merge pull request #70 from ostcar/master
translation
|
2012-12-09 04:01:00 -08:00 |
|
Oskar Hahn
|
84324cf317
|
Updated translations
|
2012-12-09 12:59:56 +01:00 |
|
Oskar Hahn
|
0369edae1e
|
Added translationcontext for posts in assignment
|
2012-12-09 10:48:45 +01:00 |
|
Oskar Hahn
|
442e5fba60
|
Added fr translation
|
2012-12-09 10:40:41 +01:00 |
|
Oskar Hahn
|
48dd6e2526
|
Merge pull request #69 from ostcar/master
Revert the fr translation because of encoding errors
|
2012-12-05 11:10:29 -08:00 |
|
Oskar Hahn
|
fc4c4c3f95
|
Revert "Updated fr translation"
This reverts commit 7ff0825dc3.
|
2012-12-05 20:07:11 +01:00 |
|
Oskar Hahn
|
05c029d8e5
|
Merge branch 'master' of github.com:OpenSlides/OpenSlides
|
2012-12-04 00:20:41 +01:00 |
|
Oskar Hahn
|
7ff0825dc3
|
Updated fr translation
|
2012-12-04 00:20:11 +01:00 |
|
Oskar Hahn
|
932f023da6
|
Merge pull request #68 from normanjaeckel/Fixes
Some small fixes
|
2012-12-01 10:41:54 -08:00 |
|
Norman Jäckel
|
046db10d3a
|
Hide group registered in the group widget.
Make custom slides text scrollable.
Fix template of personal_info_widget.
|
2012-12-01 19:32:58 +01:00 |
|
Oskar Hahn
|
f6e2ea63a5
|
Merge pull request #67 from ostcar/master
requirements.txt
|
2012-12-01 10:20:49 -08:00 |
|
Oskar Hahn
|
6ccde4256e
|
added testing packages to the requirements.txt file
|
2012-12-01 18:07:44 +01:00 |
|
Oskar Hahn
|
cf360de5fa
|
Merge pull request #66 from normanjaeckel/Version_String
New version string, fixes for the manage.py and update INSTALL
|
2012-12-01 06:18:01 -08:00 |
|
Norman Jäckel
|
a5022a3f00
|
Fix pep8 in openslides/__init__.py
|
2012-12-01 14:05:19 +01:00 |
|
Norman Jäckel
|
c9956f6380
|
Clean up INSTALL
|
2012-12-01 13:51:00 +01:00 |
|
Norman Jäckel
|
4410e454c8
|
Update test for version string.
|
2012-12-01 13:39:29 +01:00 |
|
Norman Jäckel
|
343710ad1a
|
Merge remote-tracking branch 'ostcar/windows_manage' into Version_String
|
2012-12-01 13:16:17 +01:00 |
|
Norman Jäckel
|
e7744f8210
|
Merge branch 'master' into Version_String
|
2012-12-01 13:10:29 +01:00 |
|
Oskar Hahn
|
b9ab6502c1
|
Updated the INSTALL.txt for windows with pypi
|
2012-11-29 16:39:51 +01:00 |
|
Oskar Hahn
|
1f40127830
|
Merge branch 'master' of github.com:OpenSlides/OpenSlides into windows_manage
|
2012-11-29 16:35:54 +01:00 |
|
Oskar Hahn
|
6bc479b30f
|
Merge pull request #63 from emanuelschuetze/master
python 2.5 support for setup.py
|
2012-11-29 06:06:01 -08:00 |
|
Oskar Hahn
|
28f838966c
|
Merge pull request #64 from ostcar/version_command
Added a new command to the startscript to show the version
|
2012-11-29 06:05:31 -08:00 |
|
Oskar Hahn
|
e76ec5e975
|
Added a new command to the startscript to show the version
|
2012-11-29 15:01:49 +01:00 |
|
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 |
|