Norman Jäckel
78077e4ab1
Fix syntax and style errors and errors after deficient merge conflic
...
resolving after branch merging.
2014-04-08 21:02:09 +02:00
Norman Jäckel
e6dad6d087
Merge part of stable/1.5.x into master.
...
Conflicts:
CHANGELOG
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/__init__.py
openslides/core/templates/base.html
requirements_production.txt
tests/config/test_config.py
2014-04-08 20:33:07 +02:00
Norman Jäckel
fc56bd709a
Merge pull request #1244 from emanuelschuetze/MergeStablePart2
...
Merge stable branch (part 2)
2014-04-08 20:23:44 +02:00
Emanuel Schütze
3d7ecab8e4
Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2
...
Conflicts:
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/assignment/views.py
openslides/core/static/img/circle.png
openslides/motion/pdf.py
openslides/utils/pdf.py
2014-04-07 22:35:52 +02:00
Emanuel Schütze
125877beaa
Merge pull request #1241 from normanjaeckel/MergeStablePart1
...
Merge stable branch (part 1)
2014-04-07 22:03:14 +02:00
Norman Jäckel
c13c0997bf
Merge part of stable/1.5.x into master.
...
Conflicts:
openslides/agenda/views.py
openslides/mediafile/forms.py
openslides/projector/api.py
The fix from commit 39de1924cb
was removed
because of the new widget system in master branch. See GitHub Issue #1191
2014-04-05 15:19:42 +02:00
Norman Jäckel
5faedc58ce
Merge pull request #1236 from normanjaeckel/Release_1.5.1
...
Release 1.5.1
2014-03-31 23:59:24 +02:00
Norman Jäckel
ba1dc9673f
Update version to 1.5.2-dev
2014-03-31 23:55:32 +02:00
Norman Jäckel
18a434ed87
Release 1.5.1
2014-03-31 23:55:32 +02:00
Norman Jäckel
8c14a0a931
Merge pull request #1239 from emanuelschuetze/backports-ssl-match
...
Added new package "backports.ssl_match_hostname" for portable build script
2014-03-31 23:54:48 +02:00
Emanuel Schütze
8a1837de30
Added new package "backports.ssl_match_hostname" for portable build script.
2014-03-31 23:52:33 +02:00
Norman Jäckel
a15311dfeb
Merge pull request #1238 from normanjaeckel/Translation
...
Update translation files, fix translation for dataTables, update footer.
2014-03-31 23:21:54 +02:00
Norman Jäckel
3ae7b0f761
Update translation files, fix translation for dataTables, update footer.
2014-03-31 23:07:42 +02:00
Norman Jäckel
d3dd7ac208
Merge pull request #1237 from rolandgeider/stable/1.5.x
...
Handle nested lists in the motion PDF without error.
2014-03-31 22:41:31 +02:00
Roland Geider
e96f984a03
Add tests for motion PDF and update changelog file
2014-03-31 22:17:10 +02:00
Roland Geider
5bac8ec1e4
Correctly handle nested lists in the motion PDF
...
See #1217
2014-03-31 22:07:14 +02:00
Norman Jäckel
74bf3b58f9
Merge pull request #1233 from normanjaeckel/ChangelogAndOthers
...
Changelog and other metadata files
2014-03-31 21:39:49 +02:00
Norman Jäckel
9abb7a3caf
Updated CHANGELOG, README.rst, requirements.txt, requirements_production.txt and setup.py.
2014-03-31 21:27:56 +02:00
Oskar Hahn
dc54ef5573
Fixed setup.py, changed readme.
2014-03-31 00:22:03 +02:00
Norman Jäckel
9e2bc4e16f
Merge pull request #1231 from ostcar/fix_user_status
...
Fixed user status view (activate and deactivate user without js).
2014-03-30 17:41:33 +02:00
Oskar Hahn
3b65e89f7c
fix user status view (activate, deactivate user without js)
2014-03-30 17:22:42 +02:00
Norman Jäckel
7addd69050
Merge pull request #1215 from emanuelschuetze/fix-551
...
Removed pillow. Used unicode circle font. (Fixed #551 and #1140 )
2014-03-29 13:25:11 +01:00
Emanuel Schütze
b5fb83c026
Fixed #551 : Used unicode font for circle in ballot pdf. Removed pillow.
...
That fixed also #1140 (Server error when trying to view ballot paper pdf)
2014-03-29 13:20:31 +01:00
Norman Jäckel
d0a0a09d7b
Merge pull request #1225 from normanjaeckel/Flake8Errors
...
Fixed flake8 errors.
2014-03-28 18:34:19 +01:00
Norman Jäckel
ee3ec3d4b6
Fixed flake8 errors.
2014-03-27 20:38:13 +01:00
Norman Jäckel
7a581a92bc
Merge pull request #1216 from normanjaeckel/SpeakerWidgetPermission
...
Added extra permission check to speaker widget, fixed #1191 only for 1.5...
2014-03-24 10:50:00 +01:00
Norman Jäckel
39de1924cb
Added extra permission check to speaker widget, fixed #1191 only for 1.5.x branch
2014-03-13 00:50:49 +01:00
Norman Jäckel
fc205a8437
Merge pull request #1210 from normanjaeckel/RegroupConfig
...
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:47:52 +01:00
Norman Jäckel
e7f67457db
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:41:57 +01:00
Norman Jäckel
8866ee4d63
Merge pull request #1219 from ostcar/python2.6.9
...
Changed dependency to python 2.6.9
2014-03-13 00:40:34 +01:00
Oskar Hahn
ba00f38e32
changed dependency to python 2.6.9
2014-03-12 19:40:22 +01:00
Oskar Hahn
a6fa8457cc
Merge remote-tracking branch 'openslides/stable/1.5.x'
...
Conflicts:
extras/win32-portable/create_portable.txt
extras/win32-portable/prepare_portable.py
openslides/motion/templates/motion/motion_list.html
openslides/projector/templates/projector.html
requirements_production.txt
2014-03-12 19:29:22 +01:00
Norman Jäckel
00a59df4d0
Merge pull request #1218 from ostcar/argparse_fix
...
Fix for Python 2.6 and Pip 1.5 (use of argparse 1.2.1)
2014-03-12 00:03:33 +01:00
Oskar Hahn
6ae503e009
fix for python2.6 and pip 1.5
2014-03-11 23:50:30 +01:00
Oskar Hahn
57ea4af4e2
Merge pull request #1211 from normanjaeckel/PreviewAgenda
...
Reinserted icon and link for preview of agenda slide. Fixed #1199 .
2014-03-11 07:42:24 +01:00
Oskar Hahn
69c73a7ae0
Merge pull request #1212 from normanjaeckel/ConfigTrans
...
Inserted command line option to translate config strings during database...
2014-02-01 00:24:02 -08:00
Norman Jäckel
ce8274fb53
Inserted command line option to translate config strings during database setup. Fixed #460 .
2014-01-31 02:03:43 +01:00
Norman Jäckel
3b42c16e04
Reinserted icon and link for preview of agenda slide. Fixed #1199 .
2014-01-31 01:02:12 +01:00
Norman Jäckel
d49d087f4e
Merge pull request #1208 from ostcar/customslide
...
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-29 04:09:52 -08:00
Oskar Hahn
a823812029
Merge pull request #1196 from emanuelschuetze/fix-1195
...
Fixed #1195 : Correct path to circle.png on ballot paper (assignment and ...
2014-01-29 01:01:18 -08:00
Emanuel Schuetze
aa2ed9bbad
Fixed #1177 and #1209 : Added new requirments for portable: setuptools (pkg_resources) and jsonfield.
2014-01-29 09:17:17 +01:00
Oskar Hahn
484963af4e
Merge pull request #1207 from emanuelschuetze/fix-1138
...
Fixed #1138 : Wrong file for projectors logo
2014-01-27 23:34:53 -08:00
Oskar Hahn
2392c1ab36
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-28 08:32:26 +01:00
Emanuel Schuetze
cfa35241e1
Fixed #1138 : Wrong file for projectors logo
2014-01-27 21:15:53 +01:00
Emanuel Schuetze
d15488478d
Fixed #1195 : Correct path to circle.png on ballot paper (assignment and motion).
2014-01-27 20:54:32 +01:00
Norman Jäckel
9d28f4890e
Merge pull request #1192 from emanuelschuetze/naturalsort
...
Fixed #1190 : Wrong sorting of motion identifier
2014-01-22 05:25:14 -08:00
Emanuel Schuetze
13eb0ccb30
Fixed #1190 : Wrong sorting of motion identifier
...
- Added natural sorting JS plugin for motion DataTables (column identifier).
- Added the new requirements python package 'natsort' for natural sorting of motions in PDF.
2014-01-21 23:14:39 +01:00
Norman Jäckel
5ddadbab6a
Merge pull request #1194 from ostcar/jsonfield
...
removed duplicated entry from the README.rst
2014-01-21 11:38:53 -08:00
Oskar Hahn
7f3162f17b
removed duplicated entry from the README.rst
...
See #1189
2014-01-17 16:05:49 +01:00
Norman Jäckel
4c3791a9a8
Merge pull request #1193 from emanuelschuetze/rename-static-files
...
Rename and clean up static directories.
2014-01-16 13:35:38 -08:00