ag-admin
/
OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,385 Commits 6 Branches 42 Tags 64 MiB
Commit Graph

1385 Commits

Author SHA1 Message Date
Emanuel Schuetze 3ea92da01c Updated django from 1.4.2 to 1.4.3 in requirements.txt 2013-01-09 21:05:58 +01:00
Emanuel Schuetze 9e885d5b93 Prepared 1.3.1 release. 2013-01-09 21:02:52 +01:00
Oskar Hahn 98f4ec8f2a Merge pull request #82 from ostcar/stable/1.3.x 
fixed changing language on the projector
 2013-01-08 14:07:16 -08:00
Oskar Hahn 5dd42b85a5 fix pep8 errors 2013-01-08 21:42:25 +01:00
Oskar Hahn b322f63a81 fixed changing language on the projector 2013-01-08 20:40:27 +01:00
Oskar Hahn dcea1bdd6d Updated install.txt 
You have to install python-dev to compile PIL and reportlab.
Thx to JayRob for the hint.
 2012-12-31 17:30:31 +01:00
Norman Jäckel 0684f5a458 Fix typo in INSTALL.txt. Set next release from 1.3.1a0 to 1.3.1a1, because 0 is not an ordinal number. 2012-12-12 00:11:48 +01:00
Emanuel Schütze c07a76c22f Merge pull request #75 from emanuelschuetze/master 
Set version number to 1.3.1a
 2012-12-10 13:38:18 -08:00
Emanuel Schuetze 9910bc698f Merge remote branch 'upstream/master' 2012-12-10 22:36:52 +01:00
Emanuel Schuetze 67b9adc0be Udated package description. 2012-12-10 22:36:37 +01:00
Emanuel Schuetze c83348923a Set version number to 1.3.1a0-dev (unreleased) 2012-12-10 22:36:18 +01:00
Emanuel Schütze 4fde552728 Merge pull request #74 from emanuelschuetze/master 
1.3 release date
 2012-12-10 12:41:50 -08:00
Emanuel Schuetze 7a9441d639 Merge remote branch 'upstream/master' 2012-12-10 21:40:57 +01:00
Emanuel Schuetze 56f360e7ed Added 1.3 release date to CHANGELOG. 2012-12-10 21:39:52 +01:00
Emanuel Schütze 4e381e7ecf Merge pull request #72 from emanuelschuetze/master 
1.3 final changes
 2012-12-10 11:36:16 -08:00
Emanuel Schuetze bf98224ebd Fixed missing translation. 2012-12-10 20:34:37 +01:00
Emanuel Schuetze 9a0bca7fea Set 1.3 final release. 2012-12-10 20:30:32 +01:00
Emanuel Schuetze 8f369ed71c Updated INSTALL and README for 1.3 release. 
Use 'openslides' command instead of 'python start.py' for Linux/MacOS install instruction.
 2012-12-10 20:29:00 +01:00
Emanuel Schuetze 56a5778260 Updated translation (fixed minor typo). 2012-12-10 20:06:17 +01:00
Emanuel Schuetze c48c4e0e90 Added missing remove icon (for unsupport motion button). 2012-12-10 19:44:35 +01:00
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