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

2292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oskar Hahn
77bbfc963d Merge pull request #1081 from normanjaeckel/100-Percent-String 
Add percent base value to all polls, fix #1079.
 2013-11-19 08:11:55 -08:00
Norman Jäckel
31af5c0ce6 Add check for set state view, fix #1080. 2013-11-19 01:06:38 +01:00
Norman Jäckel
1a33c1c9f1 Add percent base value to all polls, fix #1079. 2013-11-19 00:19:46 +01:00
Oskar Hahn
962636f84c Merge pull request #1063 from emanuelschuetze/fix-1023 
Improved motion csv import messages (fixes #1023)
 2013-11-18 09:11:00 -08:00
Emanuel Schuetze
208c870705 Rename assignment to election in translation strings which are used in the GUI. 
Updated EN po file.
 2013-11-18 17:21:21 +01:00
Emanuel Schuetze
28271019fd Improved #1023 - Motion csv import: Collect all warnings and errors in one message. 2013-11-18 17:21:21 +01:00
Oskar Hahn
ddffffd3a1 Merge pull request #1071 from emanuelschuetze/fix-1070 
Fixed #1070 (Clear search index for deletedb and syncdb command)
 2013-11-18 08:07:32 -08:00
Oskar Hahn
88407613b5 Merge pull request #1060 from ostcar/use_default_message_backend 
Use the default django message back end
 2013-11-18 02:11:33 -08:00
Oskar Hahn
ecb3db851a Use the default django message back end 2013-11-18 09:28:49 +01:00
Oskar Hahn
3fc531255f Merge pull request #1069 from ostcar/reset_passwort_question 
Make sure QuestionView.get_question_message is in a unicode context.
 2013-11-18 00:26:24 -08:00
Oskar Hahn
4db41e3161 Merge pull request #1064 from emanuelschuetze/fix-947 
Fixed #947: Move pdf functions of participant app to new pdf.py
 2013-11-18 00:25:52 -08:00
Oskar Hahn
c450068bb2 Merge pull request #1062 from DerPate/fix#1044 
Fix#1044
 2013-11-18 00:25:19 -08:00
Oskar Hahn
4fa2c25978 Make sure QuestionView.get_question_message is in a unicode context. 
This is important if the attribute question_message is set with
ugettext_lazy which needs an unicode context

Fixes #1066
 2013-11-17 11:11:39 +01:00
Emanuel Schuetze
85fc09036f Fixed #1070 (Clear search index for deletedb and syncdb command) 2013-11-16 20:38:41 +01:00
Emanuel Schuetze
40ef2a31f6 Fixed #947: Move pdf functions of participant app to new pdf.py 2013-11-15 20:15:21 +01:00
Dominik Breu
0c32ef9c40 fix #1044 Remove GNU GPL header 2013-11-15 16:01:14 +01:00
Oskar Hahn
89c7bd1277 Merge pull request #1054 from andkit/fix-1034 
Fix unicode errors when getting static files (fixes #1034)
 2013-11-14 13:53:36 -08:00
Andy Kittner
87d46d079d Rework DjangoStaticFileHandler (fixes #1034) 
Fixes multiple issues
 - Unicode errors when path contained non-ascii characters

 - 403 errors when the current working directory was not a parent
   directory of the static files

 - "API abuse" super() implementation of the get() method was passed a
   filesystem path instead of the url-path it was expecting

 - The above could also lead to 403 errors on case-insensitive file
   systems due to the way the base-class resolved and validated paths
   with respect to self.root
 2013-11-14 22:45:29 +01:00
Oskar Hahn
e54faaf1e7 Merge remote-tracking branch 'openslides/stable/1.5.x' 2013-11-14 22:39:02 +01:00
Norman Jäckel
6bd4ffd8fa Add tests according to issue #931. 2013-11-14 22:38:12 +01:00
Norman Jäckel
09e315beb7 Sort requirements, fix #1031. 2013-11-14 22:38:12 +01:00
Norman Jäckel
9dc73fa6de Verbose name of Assignment inserted, fixed #1036 
It is neccessary to refresh the database table for the content types, e. g. by deleting the database and runing syncdb.
 2013-11-14 22:38:12 +01:00
Andy Kittner
0d4c48a9c0 Set reuse address option (fixes #1043) 
When the server is killed there may still be client-sockets connected in
the TIME_WAIT state, causing the bind() call to fail. With the
REUSEADDR option we can reuse the address immediately unless another
process is actually *listening* on the same address.
that we want to reuse the address
 2013-11-14 22:38:12 +01:00
Oskar Hahn
45e2fd05e9 Merge pull request #1056 from normanjaeckel/SortRequirements 
Sort requirements, fix #1031.
 2013-11-14 10:56:47 -08:00
Oskar Hahn
e03957c78c Merge pull request #1058 from normanjaeckel/Tests_931 
Add tests according to issue #931.
 2013-11-14 10:56:08 -08:00
Norman Jäckel
881fd562a1 Add tests according to issue #931. 2013-11-14 19:29:08 +01:00
Norman Jäckel
879e073478 Sort requirements, fix #1031. 2013-11-14 18:36:00 +01:00
Oskar Hahn
ffb63f43a3 Merge pull request #1057 from normanjaeckel/TransAssignmentString 
Verbose name of Assignment inserted, fixed #1036
 2013-11-14 06:41:02 -08:00
Oskar Hahn
0041b5de57 Merge pull request #1053 from andkit/fix-1043 
Set reuse address option (fixes #1043)
 2013-11-14 05:27:36 -08:00
Oskar Hahn
506d9a256d Merge pull request #1049 from DebVortex/feature/fix-issue-1041 
Bugfix in agenda.js (fixes #1041)
 2013-11-14 05:25:17 -08:00
Norman Jäckel
5f948f9e79 Verbose name of Assignment inserted, fixed #1036 
It is neccessary to refresh the database table for the content types, e. g. by deleting the database and runing syncdb.
 2013-11-13 19:30:04 +01:00
Andy Kittner
2a73d9f7ee Set reuse address option (fixes #1043) 
When the server is killed there may still be client-sockets connected in
the TIME_WAIT state, causing the bind() call to fail. With the
REUSEADDR option we can reuse the address immediately unless another
process is actually *listening* on the same address.
that we want to reuse the address
 2013-11-12 22:00:47 +01:00
Max Brauer
091a2bc35c Bugfix in agenda.js (fixes #1041) 2013-11-12 21:33:57 +01:00
Oskar Hahn
728a33f5c3 Merge pull request #1021 from DebVortex/feature/fix-issue-994 
fixes #994: store collapsed and fixed of widets in cookie, too.
 2013-11-12 05:36:08 -08:00
Max Brauer
c7afce30a1 fixes #994: store collapsed and fixed of widets in cookie, too. 2013-11-12 14:29:48 +01:00
Oskar Hahn
c4c9483b5e Merge pull request #1046 from emanuelschuetze/translation-fix 
Fixed typo (titel->title).
 2013-11-12 05:07:45 -08:00
Oskar Hahn
d9cf05ef55 Merge pull request #1042 from emanuelschuetze/1.5b2-fixes 
1.5b2 fixes
 2013-11-12 05:07:17 -08:00
Oskar Hahn
77c0e20c96 Merge pull request #1045 from ostcar/issue_1035 
Fixed agenda slide
 2013-11-12 03:16:58 -08:00
Emanuel Schuetze
b8e30188ad Fixed #1040: Show only last motion poll results on projector. 2013-11-12 11:13:36 +01:00
Emanuel Schuetze
06b91b89bb Fixed typo (titel->title). 2013-11-12 10:57:07 +01:00
Oskar Hahn
9d8d9f806f Fixed agenda slide 
Fixes #1035
 2013-11-12 08:59:20 +01:00
Emanuel Schuetze
2034852fa8 Fixed #1038: Increase small input fields in poll forms. 2013-11-11 17:36:52 +01:00
Emanuel Schuetze
92b111c0bd Fixed #1039: Motion poll edit view: projector icon needs 'if slide is activate' check. 2013-11-11 17:36:12 +01:00
Norman Jäckel
09ac5d0eb5 Merge pull request #1033 from emanuelschuetze/1.5b2-release 
1.5b2 release
 2013-11-10 14:13:14 -08:00
Emanuel Schuetze
a5e8737b85 Update version to 1.5c1-dev 2013-11-10 23:05:55 +01:00
Emanuel Schuetze
9c2f9c62c2 Release 1.5b2 2013-11-10 23:05:55 +01:00
Norman Jäckel
a6dd5bb5ea Merge pull request #1030 from emanuelschuetze/changelog 
Updated changelog for 1.5b2.
 2013-11-10 14:01:42 -08:00
Emanuel Schuetze
43eebb9278 Updated changelog for 1.5b2. 2013-11-10 22:59:46 +01:00
Norman Jäckel
4446343401 Merge pull request #1024 from normanjaeckel/FixUnicodeEncodeError 
Use encoded string for insert in sys.path during main script. Fix #1022.
 2013-11-10 13:49:56 -08:00
Norman Jäckel
84a2fa41f0 Merge pull request #1029 from normanjaeckel/RepairDjangoUpdate 
Move run_tornado import into runserver function because its imports need...
 2013-11-10 13:21:32 -08:00