Emanuel Schuetze
648d5a6ad7
Fixed CKEditor stuff:
...
- Added missing insertpre plugin and allow <pre> tag with class
attribute. Added font style to base.css.
- Removed unused link to old ckeditor.css (now managed by
django-ckeditor).
2014-07-14 22:54:53 +02:00
Norman Jäckel
dee81e58b3
Bump version to 2.0a1-dev.
2014-07-14 22:33:54 +02:00
Norman Jäckel
5db47bef76
Update version to 1.6.1-dev
2014-06-02 20:37:51 +02:00
Norman Jäckel
9d40e22783
Release 1.6
2014-06-02 20:37:50 +02:00
Norman Jäckel
2ebd215198
Merge pull request #1321 from emanuelschuetze/template-fixes
...
Last template fixes for 1.6
2014-06-02 18:23:04 +02:00
Emanuel Schuetze
0ebb2eb901
Last template fixes in agenda, motion and assignment list view.
2014-06-01 22:48:15 +02:00
Norman Jäckel
c2ae991fb2
Update help texts in start script. Set x-bit for manage.py.
2014-05-31 12:40:51 +02:00
Oskar Hahn
513000d241
Merge pull request #1316 from normanjaeckel/FixWorkflowBug
...
Fixed bug with workflows. Fixed #1309 .
2014-05-28 12:32:12 +02:00
Norman Jäckel
efb6c17903
Added stylesheet to list of speakers overlay. Fixed #1310 .
2014-05-28 00:30:33 +02:00
Norman Jäckel
52f7dff0f1
Fixed bug with workflows. Fixed #1309 .
2014-05-28 00:20:13 +02:00
Norman Jäckel
c5db1c5e02
Merge pull request #1315 from emanuelschuetze/translations
...
Updated final translations for 1.6 (DE, FR, PT, CS)
2014-05-27 22:45:40 +02:00
Emanuel Schuetze
45c5f13980
Updated final translations for 1.6 (DE, FR, PT, CS)
2014-05-27 21:25:08 +02:00
Emanuel Schuetze
91ebd719bc
Fixed #1311 (Motion poll slides shows wrong value for Abstain vote)
2014-05-22 17:26:38 +02:00
Norman Jäckel
769695bf14
Merge pull request #1307 from emanuelschuetze/en-translationfile
...
Updated EN translation file for transifex
2014-05-20 21:59:00 +02:00
Emanuel Schuetze
431f437ded
Fixed motion title in motion list view ( #1148 ).
2014-05-20 20:29:57 +02:00
Emanuel Schuetze
f1743a3790
Updated EN translation file for transifex
...
String freeze for 1.6.
2014-05-20 12:33:23 +02:00
Norman Jäckel
7ee5f688ae
Update version to 1.6c1-dev
2014-05-19 23:02:39 +02:00
Norman Jäckel
fca8da8ae6
Release 1.6b2
2014-05-19 23:02:39 +02:00
Norman Jäckel
2bfa5f3a72
Prepared for release.
...
Small style changes, CHANGELOG and README.rst update.
2014-05-19 22:55:54 +02:00
Norman Jäckel
f9729fdae3
Merge pull request #1301 from normanjaeckel/MotionTitle
...
Changed motion title behavior.
2014-05-19 22:49:23 +02:00
Norman Jäckel
48471699c2
Merge pull request #1304 from emanuelschuetze/translations
...
Updated translations (from transifex).
2014-05-19 22:48:19 +02:00
Norman Jäckel
00eabcb8c8
Changed motion title appearance. Fixed #1148 .
2014-05-19 22:42:43 +02:00
Emanuel Schuetze
715edf8a03
Updated translations (from transifex).
2014-05-19 22:30:50 +02:00
Norman Jäckel
ae99784372
Enabled reload always when DEBUG==True.
2014-05-19 22:29:05 +02:00
Oskar Hahn
22bacd1054
bind the reload of the webserver on the debug settings
...
fix #1163
2014-05-19 22:18:45 +02:00
Emanuel Schütze
bf8bb31cdb
Merge pull request #1298 from emanuelschuetze/fix-995
...
Improved html templates for mobile devices (responsive).
2014-05-19 22:17:26 +02:00
Emanuel Schuetze
6bdfc33182
Motion CSV Import: Create new category if category is unkown.
2014-05-19 20:31:38 +02:00
Oskar Hahn
16a6ad4a9e
Merge pull request #1278 from rolandgeider/ckeditor
...
Replace own CKeditor with dedicated app
2014-05-19 15:15:54 +02:00
Oskar Hahn
0feed94bf6
Merge pull request #1297 from emanuelschuetze/fix-1104
...
Fixed #1104 (Enable copy/paste in dashboard widgets)
2014-05-19 14:58:01 +02:00
Oskar Hahn
53e0a1086d
Merge pull request #1294 from emanuelschuetze/fix-1158
...
Fixed #1158 (Clean up assignment.css)
2014-05-19 14:57:17 +02:00
Norman Jäckel
38a4cf1bc3
Merge pull request #1295 from emanuelschuetze/pdf-fix
...
PDF: Added missing 'fontName'.
2014-05-19 09:57:50 +02:00
Norman Jäckel
5dc4742f2f
Merge pull request #1291 from emanuelschuetze/fix-1235
...
Fixed #1235 (DeprecationWarning in utils.views.PDFView).
2014-05-19 09:54:45 +02:00
Norman Jäckel
60ba0f6900
Merge pull request #1292 from ostcar/fix_list_of_speaker_on_related_item
...
Fixed link to list of speaker on related items.
2014-05-19 09:50:47 +02:00
Roland Geider
e9d52245cb
Replace own CKeditor with dedicated app
2014-05-19 00:00:18 +02:00
Emanuel Schuetze
802fde42ce
Improved html templates for mobile devices (responsive).
...
Fixed #995 (Use responsive navbar for main menu in backend template)
2014-05-18 22:19:02 +02:00
Emanuel Schuetze
6cb99d9128
Fixed #1104 (Enable copy/paste in dashboard widgets)
2014-05-18 20:42:29 +02:00
Emanuel Schuetze
5f202c22a7
PDF: Add missing 'fontName'.
...
And set 'registerFontFamily(...)' to use bold/italic in regular paragraphs.
2014-05-18 13:57:20 +02:00
Emanuel Schuetze
99ee335925
Fixed #1158 (Clean up assignment.css)
2014-05-17 21:15:46 +02:00
Oskar Hahn
3419855a1e
Fix link to list of speaker item on related items
...
fix #1242
2014-05-17 14:21:57 +02:00
Emanuel Schuetze
bacc9ca87b
Fixed #1235 (DeprecationWarning in utils.views.PDFView)
2014-05-17 13:42:18 +02:00
Oskar Hahn
f0572551b3
Fix default-slide-preview-url
...
Fix #1246
2014-05-17 13:30:37 +02:00
Norman Jäckel
b16641c0dc
Renamed 'permission_required' to 'required_permission' etc.
...
Renamed method and attribute of openslides.utils.views.PermissionMixin. Renamed attribute of widgets and main menu entries. Fixed #1160 .
2014-05-15 20:07:09 +02:00
Norman Jäckel
ecf0e8b0d7
Cleaned up some widgets and the base.css. Removed icon definitions.
2014-05-15 17:23:46 +02:00
Emanuel Schuetze
f651ccf3b9
Fixed #1275 (Creating assignment pdf failed)
2014-05-13 21:39:27 +02:00
Oskar Hahn
86ac16dd14
Merge pull request #1283 from normanjaeckel/FixEnglishString
...
Fixed English strings concerning agenda items and organizational items a...
2014-05-13 13:08:05 +02:00
Oskar Hahn
c132346d14
Merge pull request #1284 from normanjaeckel/RefactorConfig
...
Changed permission system for config pages.
2014-05-13 13:03:09 +02:00
Oskar Hahn
bebd73dde2
Merge pull request #1282 from normanjaeckel/FixWidgets
...
Fixed permission error in some widgets.
2014-05-13 13:00:45 +02:00
Oskar Hahn
e6cbfdf575
Merge pull request #1281 from normanjaeckel/AssignmentPollBug
...
Fixed error when creating an assignment poll. Fixed #1203 .
2014-05-13 12:59:58 +02:00
Oskar Hahn
cfea637676
Merge pull request #1277 from emanuelschuetze/fix-mediafileprojector
...
Added missing mediafile projector stylefile for pdf.js presentation.
2014-05-13 12:57:51 +02:00
Norman Jäckel
9f99ef8a38
Fixed error when creating an assignment poll. Fixed #1203 .
2014-05-12 22:58:23 +02:00
Norman Jäckel
43429d4015
Changed some docstrings.
2014-05-12 22:57:57 +02:00
Norman Jäckel
ee82c2c105
Fixed English strings concerning agenda items and organizational items and their relation. Fixed #1271 .
2014-05-12 22:56:57 +02:00
Norman Jäckel
c747f09ad0
Changed permission system for config pages.
...
Config pages are now only available for users with permission 'config.can_manage'. Fixed #1159 .
2014-05-12 22:56:19 +02:00
Norman Jäckel
ebe8f90d1e
Fixed permission error in some widgets.
...
Fixed agenda item widget, assignment widget, motion widget, participant user widget and participant group widget. Fixed #1279 .
2014-05-12 22:55:49 +02:00
Emanuel Schuetze
1deaaf241e
Added missing mediafile projector stylefile for pdf.js presentation.
2014-05-09 14:03:53 +02:00
Norman Jäckel
d4358d6aae
Update version to 1.6b2-dev
2014-05-05 21:30:12 +02:00
Norman Jäckel
a581393b32
Release 1.6b1
2014-05-05 21:28:53 +02:00
Norman Jäckel
1857195812
Updated German translation.
2014-05-05 21:11:09 +02:00
Norman Jäckel
b8cd2d360b
Merge pull request #1270 from emanuelschuetze/fix1178
...
Adds plugin directory for win32 portable version (Fixed #1178 ).
2014-05-05 21:07:51 +02:00
Emanuel Schütze
7add4c5691
Portable: Create empty plugins directory.
...
Fixed file permissions.
2014-05-05 21:01:25 +02:00
Norman Jäckel
7e085be54c
Updated English language file.
2014-05-05 20:31:22 +02:00
Norman Jäckel
808715f34f
Merge pull request #1262 from emanuelschuetze/fix-1260-1261
...
Fix for new percent base choice config (Fixed #1260 )
2014-05-05 20:28:20 +02:00
Emanuel Schütze
5953e58c99
Fixed #1260 (Change description of percent base choices)
2014-05-05 20:21:21 +02:00
Oskar Hahn
921e4ab2bd
Merge pull request #1268 from emanuelschuetze/translationstrings
...
Updated translation strings.
2014-05-05 16:15:44 +02:00
Oskar Hahn
9be0409869
Merge pull request #1266 from andkit/issue1253
...
Fix #1253 data table in motion overview displayed incorrectly
2014-05-05 16:14:59 +02:00
Andy Kittner
3584da89c3
Automatically load plugins from portable plugins dir; closes #1178
...
All modules/ packages in the openslides/plugins subdirectory of the
portable version will be automatically added to INSTALLED_PLUGINS
2014-05-05 00:55:22 +02:00
Emanuel Schütze
3ece699cd6
Add get_win32_portable_user_data_path() function in main.py to return
...
correct user data path ("/openslides") of portable version.
2014-05-05 00:55:17 +02:00
Emanuel Schütze
9c43523f06
Updated translation strings.
...
Improved shortcut countdown layout.
2014-05-04 20:49:05 +02:00
Andy Kittner
4af6fe1c9a
Fix #1253 data table in motion overview displayed incorrectly
2014-05-04 16:40:50 +02:00
Norman Jäckel
d638d5b7e2
Fixed bug of numbering view when there are orga items. Renamed toRoman to to_roman.
2014-05-04 14:00:28 +02:00
Stefan Frauenknecht
f8bd4b0d86
Numbering of agenda items, part 2.
...
Config item agenda_agenda_fixed removed'.
Config items agenda_agenda_fixed and agenda_enable_auto_numbering removed.
FixAgendaView and ResetAgendaView removed. AgendaNumberingView added.
Old two fix- and reset numbering buttons replaced by 'Number agenda items'.
2014-05-04 13:47:01 +02:00
Norman Jäckel
5254cc83a6
Updated numbering feature.
...
Fixed organizational item structuring. Prevented organizational items
from having agenda items as descendents. Some coding style changes.
Added CHANGELOG and README entries.
2014-05-04 13:47:01 +02:00
Stefan Frauenknecht
2c5b3a8e4f
Automatic numbering of agenda items
2014-05-04 13:47:01 +02:00
Norman Jäckel
1fbd77e701
Updated English language files.
2014-05-02 23:53:51 +02:00
Emanuel Schuetze
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
Norman Jäckel
84f9963bea
Updated English language files.
2014-04-28 23:45:44 +02:00
Norman Jäckel
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
Emanuel Schütze
945771e8a6
Use right projector logo (as in stable/1.5.x branch).
2014-04-28 22:07:06 +02:00
Emanuel Schütze
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
Emanuel Schütze
579c9d49f0
Fixed #1240 (No assignment poll form fields for votes invalid and votes cast)
2014-04-28 21:57:17 +02:00
Norman Jäckel
3379f9542a
Update English translation files.
2014-04-28 21:11:15 +02:00
Oskar Hahn
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
Emanuel Schütze
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
Norman Jäckel
42796f6118
Added global chatbox for managers.
2014-04-27 20:58:22 +02:00
Emanuel Schütze
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
Oskar Hahn
3d092f6dcc
countdown shortcuts
2014-04-27 19:48:57 +02:00
Norman Jäckel
ac1ab81d7a
New projector view with the current list of speakers.
2014-04-15 01:00:56 +02:00
Norman Jäckel
f8cdad711c
Simplify overlay api methods.
2014-04-15 00:33:34 +02:00
Norman Jäckel
2a10feecad
Added CSV import, fixed #1186 . Also cleaned up motion and user CSV import.
2014-04-13 20:35:19 +02:00
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
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
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
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
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
Roland Geider
5bac8ec1e4
Correctly handle nested lists in the motion PDF
...
See #1217
2014-03-31 22:07:14 +02:00
Oskar Hahn
3b65e89f7c
fix user status view (activate, deactivate user without js)
2014-03-30 17:22:42 +02: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