f2d6825b3b
Merge pull request #1255 from normanjaeckel/TranslationEnglisch
...
Update English translation files.
2014-04-28 21:21:04 +02:00
3379f9542a
Update English translation files.
2014-04-28 21:11:15 +02:00
b232ed0c96
Merge pull request #1221 from emanuelschuetze/fix-1197
...
Fixed #1197 : Use big heading for custom slides without text.
2014-04-27 21:08:18 +02:00
dd7ae59f9a
Merge pull request #1220 from emanuelschuetze/chatbox
...
Chatbox (Fixed #504 )
2014-04-27 21:08:06 +02:00
3b3597aa1f
Improved chatbox style. Updated jquery cookie and jquery ui.
...
- Fixed js error on dashboard page if no cookie is found.
- Use cookies only until end of session. For dashboard cookies use url /dashboard only.
- Updated permission numbering of builtin groups and added can_use_chat permission.
- Used minified version of jquery.cookie.
- Added TODO comment for django session way from pull request.
2014-04-27 20:58:22 +02:00
42796f6118
Added global chatbox for managers.
2014-04-27 20:58:22 +02:00
d44f385ba8
Fixed #1197 : Use big heading for custom slides without text.
...
Keep last projector scale/scroll values after activate new slide.
2014-04-27 20:55:06 +02:00
f870a75119
Merge pull request #1230 from ostcar/countdown
...
Countdown shortcuts
2014-04-27 19:57:26 +02:00
3d092f6dcc
countdown shortcuts
2014-04-27 19:48:57 +02:00
b3d615ddce
Merge pull request #1243 from normanjaeckel/ListOfSpeakersView
...
New projector view with the current list of speakers.
2014-04-22 20:21:01 +02:00
ac1ab81d7a
New projector view with the current list of speakers.
2014-04-15 01:00:56 +02:00
f8cdad711c
Simplify overlay api methods.
2014-04-15 00:33:34 +02:00
1583907571
Merge pull request #1226 from normanjaeckel/AgendaImport
...
Added CSV import, fixed #1186 .
2014-04-13 20:43:02 +02:00
2a10feecad
Added CSV import, fixed #1186 . Also cleaned up motion and user CSV import.
2014-04-13 20:35:19 +02:00
6a7784153d
Merge pull request #1245 from normanjaeckel/MergeStablePart3
...
Merge stable branch (part 3)
2014-04-08 21:14:06 +02:00
78077e4ab1
Fix syntax and style errors and errors after deficient merge conflic
...
resolving after branch merging.
2014-04-08 21:02:09 +02:00
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
fc56bd709a
Merge pull request #1244 from emanuelschuetze/MergeStablePart2
...
Merge stable branch (part 2)
2014-04-08 20:23:44 +02:00
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
125877beaa
Merge pull request #1241 from normanjaeckel/MergeStablePart1
...
Merge stable branch (part 1)
2014-04-07 22:03:14 +02:00
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#1191
2014-04-05 15:19:42 +02:00
5faedc58ce
Merge pull request #1236 from normanjaeckel/Release_1.5.1
...
Release 1.5.1
2014-03-31 23:59:24 +02:00
ba1dc9673f
Update version to 1.5.2-dev
2014-03-31 23:55:32 +02:00
18a434ed87
Release 1.5.1
2014-03-31 23:55:32 +02:00
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
8a1837de30
Added new package "backports.ssl_match_hostname" for portable build script.
2014-03-31 23:52:33 +02:00
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
3ae7b0f761
Update translation files, fix translation for dataTables, update footer.
2014-03-31 23:07:42 +02:00
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
e96f984a03
Add tests for motion PDF and update changelog file
2014-03-31 22:17:10 +02:00
5bac8ec1e4
Correctly handle nested lists in the motion PDF
...
See #1217
2014-03-31 22:07:14 +02:00
74bf3b58f9
Merge pull request #1233 from normanjaeckel/ChangelogAndOthers
...
Changelog and other metadata files
2014-03-31 21:39:49 +02:00
9abb7a3caf
Updated CHANGELOG, README.rst, requirements.txt, requirements_production.txt and setup.py.
2014-03-31 21:27:56 +02:00
dc54ef5573
Fixed setup.py, changed readme.
2014-03-31 00:22:03 +02:00
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
3b65e89f7c
fix user status view (activate, deactivate user without js)
2014-03-30 17:22:42 +02:00
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
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
d0a0a09d7b
Merge pull request #1225 from normanjaeckel/Flake8Errors
...
Fixed flake8 errors.
2014-03-28 18:34:19 +01:00
ee3ec3d4b6
Fixed flake8 errors.
2014-03-27 20:38:13 +01:00
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
39de1924cb
Added extra permission check to speaker widget, fixed #1191 only for 1.5.x branch
2014-03-13 00:50:49 +01:00
fc205a8437
Merge pull request #1210 from normanjaeckel/RegroupConfig
...
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:47:52 +01:00
e7f67457db
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:41:57 +01:00
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
ba00f38e32
changed dependency to python 2.6.9
2014-03-12 19:40:22 +01:00
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
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
6ae503e009
fix for python2.6 and pip 1.5
2014-03-11 23:50:30 +01:00
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
Norman Jäckel