1fbd77e701
Updated English language files.
2014-05-02 23:53:51 +02:00
157d4bdc14
New poll slides for motion and assignment. ( Fixed #862 )
...
Move result table from assignment slide to assignment poll slide.
Use "result" in singular for motion and election results.
2014-05-02 23:40:23 +02:00
84f9963bea
Updated English language files.
2014-04-28 23:45:44 +02:00
c1c952c136
Merge pull request #1257 from emanuelschuetze/projector-logo
...
Use right projector logo (as in stable/1.5.x branch).
2014-04-28 22:21:11 +02:00
945771e8a6
Use right projector logo (as in stable/1.5.x branch).
2014-04-28 22:07:06 +02:00
fa6c7d9d86
Fixed #1102 (New config option to set percent base for polls)
...
Use locale format for poll percentage decimal number.
2014-04-28 21:57:31 +02:00
579c9d49f0
Fixed #1240 (No assignment poll form fields for votes invalid and votes cast)
2014-04-28 21:57:17 +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
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
3d092f6dcc
countdown shortcuts
2014-04-27 19:48:57 +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
2a10feecad
Added CSV import, fixed #1186 . Also cleaned up motion and user CSV import.
2014-04-13 20:35:19 +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
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
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
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
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
5bac8ec1e4
Correctly handle nested lists in the motion PDF
...
See #1217
2014-03-31 22:07:14 +02:00
3b65e89f7c
fix user status view (activate, deactivate user without js)
2014-03-30 17:22:42 +02: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
ee3ec3d4b6
Fixed flake8 errors.
2014-03-27 20:38:13 +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
e7f67457db
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:41:57 +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
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
ce8274fb53
Inserted command line option to translate config strings during database setup. Fixed #460 .
2014-01-31 02:03:43 +01:00
3b42c16e04
Reinserted icon and link for preview of agenda slide. Fixed #1199 .
2014-01-31 01:02:12 +01:00
d49d087f4e
Merge pull request #1208 from ostcar/customslide
...
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-29 04:09:52 -08:00
2392c1ab36
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-28 08:32:26 +01:00
cfa35241e1
Fixed #1138 : Wrong file for projectors logo
2014-01-27 21:15:53 +01:00
d15488478d
Fixed #1195 : Correct path to circle.png on ballot paper (assignment and motion).
2014-01-27 20:54:32 +01:00
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
4c3791a9a8
Merge pull request #1193 from emanuelschuetze/rename-static-files
...
Rename and clean up static directories.
2014-01-16 13:35:38 -08:00
d8d2ad002a
Rename and clean up static direcories.
...
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
2014-01-14 23:27:12 +01:00
4b63f3a288
Coupled assignment candidates with list of speakers. Fixed #1092 .
2014-01-13 15:22:46 +01:00
d72fe39da6
Merge branch 'stable/1.5.x'
2014-01-12 13:38:07 +01:00
bbd7542341
Fixed agenda_item.is_active_slide() with related item and list of speakers
2014-01-12 12:48:38 +01:00
04b0cfb0bc
Used entry points to detect plugins automaticly.
2014-01-12 12:48:24 +01:00
e0223c950b
Added possibility to use custom templates and static files in user data path directory.
2014-01-12 11:05:54 +01:00
6409f828d7
Added a poll description field for each assignment poll
...
fixed signals in MainMenuTests
2014-01-12 10:22:38 +01:00
c82ee4ce1f
Added AbsoluteUrlMixin and used it in any model.
...
cleaned up get_absolute_url() in some models
2014-01-12 00:35:16 +01:00
3fe9169786
Merge pull request #1175 from normanjaeckel/MultipleParticipantsForm
...
Added form field for multiple creation of new participants. Fixed #178 .
2014-01-11 15:26:36 -08:00
b95a856904
Added form field for multiple creation of new participants. Fixed #178 .
2014-01-11 23:09:59 +01:00
Norman Jäckel