Norman Jäckel
2b744942e7
Merge pull request #1407 from ostcar/super_signal
...
Remove update_projector and add inform_changed_data.
2015-01-17 15:25:41 +01:00
Oskar Hahn
1a1d072454
remove update_projector and add inform_changed_data
2015-01-17 15:16:49 +01:00
Roland Geider
06b5ad5f2e
Fix typos
2015-01-17 12:12:08 +01:00
Oskar Hahn
0a24b7267b
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
README.rst
openslides/assignment/models.py
openslides/users/forms.py
requirements_production.txt
tests/settings.py
2015-01-17 10:18:29 +01:00
Norman Jäckel
b0422c4680
Added api viewset for agenda items.
...
Fixed style checker problem.
2015-01-17 09:18:40 +01:00
Norman Jäckel
8cb70017da
Added api viewset for users.
2015-01-17 08:51:57 +01:00
Norman Jäckel
7644cb9a09
Added api viewset for custom slides.
2015-01-17 08:51:54 +01:00
Norman Jäckel
7ed5d2fc43
Setup Django REST Framework.
2015-01-17 08:49:52 +01:00
Norman Jäckel
82f46708f6
Merge pull request #1397 from emanuelschuetze/haystack-fix
...
Fixed haystack indexing problem for m2m objects.
2015-01-17 00:21:45 +01:00
Norman Jäckel
9b89e10cc7
Merge pull request #1398 from emanuelschuetze/portable-install-script
...
Improved portable install script.
2015-01-17 00:20:49 +01:00
Norman Jäckel
f7cb518430
Used Bower and gulp to manage third party JavaScript and Cascading Style Sheets libraries.
...
Cleaned up settings. Updated development section in README.rst.
Removed jQuery, jquery.cookie and bootstrap from repository.
2015-01-17 00:12:04 +01:00
Emanuel Schuetze
fd266a4e45
Fixed AttributeError in chatbox on_open method.
...
Fixed TODO and updated get session method for session key.
2015-01-16 23:41:46 +01:00
Emanuel Schuetze
3127048be5
Fixed haystack indexing problem for m2m objects.
...
Updated django-haystack to <2.4.
2015-01-16 23:07:56 +01:00
Oskar Hahn
5d0737f656
Merge pull request #1396 from DebVortex/feature/update-pdfjs
...
Updated pdf.js to 1.0.907
2015-01-16 22:37:49 +01:00
Max Brauer
f0af21103c
Updated pdf.js to 1.0.907
2015-01-16 22:16:31 +01:00
Oskar Hahn
4f27b9b63d
Fix LocalizedModelMultipleChoiceField
...
It has to be a generator, so it does not call the queryset
2015-01-16 20:47:43 +01:00
Emanuel Schuetze
a9468cb0a4
Fixed missing translation strings.
2015-01-16 14:25:34 +01:00
Norman Jäckel
3ba86a6441
Updated English language files.
2015-01-11 19:04:21 +01:00
Norman Jäckel
3ec55daaf9
Fixed bug. Projector was not updated when an object was deleted. Fixex #1394 .
2015-01-11 18:43:05 +01:00
Emanuel Schuetze
91cef13326
Improve the usage of bsmselect jquery plugin.
...
Allow to disable the plugin for defined <select multiple> form fields
with extra css class 'dont_use_bsmselect'. (E.g. not for the group form
fields permissions and users.)
Partly fixed changes from pull request #1381 .
2015-01-08 10:58:25 +01:00
Norman Jäckel
06919fa543
Fixed bug in ResetPasswordView. Fixed #1391 .
2015-01-06 16:27:50 +01:00
Oskar Hahn
34b6ca80f3
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
openslides/users/signals.py
2015-01-06 13:04:07 +01:00
Emanuel Schuetze
3cfb9b739b
Template improvements for tags of agenda items, motions and
...
assignments.
2015-01-05 13:57:37 +01:00
Oskar Hahn
bcb1ee1213
Tags for motions, agenda items and assignments
2015-01-03 17:00:48 +01:00
Oskar Hahn
2951b4b38c
Feature: amendments
2015-01-03 15:17:49 +01:00
Norman Jäckel
dcd8b7a639
Merge branch 'stable/1.6.x' into 'master'.
...
Conflicts:
CHANGELOG
openslides/agenda/views.py
openslides/assignment/views.py
openslides/mediafile/views.py
openslides/users/views.py
openslides/utils/views.py
tests/motion/test_pdf.py
tests/settings.py
2015-01-02 22:11:56 +01:00
Norman Jäckel
8dafa2bfcd
Added possibility to hide motions from non staff users in some states.
2015-01-02 19:32:56 +01:00
Norman Jäckel
f6b1a84545
Cleaned up utils.views to increase performance when fetching single objects from the database for a view. Fixed #1378 .
2014-12-25 00:02:50 +01:00
Norman Jäckel
4f04223e08
Added Django's application configuration.
...
Used customized AppConfig classes in openslides.core, openslides.account,
openslides.projector, openslides.agenda, openslides.motion, openslides.assignment,
openslides.users, openslides.mediafile, openslides.config.
Refactored loading of signals, template signals and slides.
2014-12-10 17:16:58 +01:00
Norman Jäckel
808aae597f
Merge branch 'stable/1.6.x' into 'master'.
...
Conflicts:
CHANGELOG
openslides/__init__.py
openslides/assignment/views.py
2014-12-08 22:17:22 +01:00
Norman Jäckel
750918fe74
Update version to 1.6.2-dev
2014-12-04 15:47:21 +01:00
Norman Jäckel
9a50dab5fc
Release 1.6.1
2014-12-04 15:45:19 +01:00
Emanuel Schuetze
6df6b92dd7
Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError)
2014-11-28 20:58:19 +01:00
Emanuel Schuetze
8be1215e12
Updated FR translation.
2014-10-27 20:42:36 +01:00
Norman Jäckel
c89f9bcccd
Updated German and Czech language files.
2014-10-26 16:12:20 +01:00
Oskar Hahn
88222857bb
Use the new django transaction API
...
fixes #1027
2014-10-19 10:52:48 +02:00
Oskar Hahn
5c6f7a41a8
Merge branch 'stable/1.6.x'
...
Conflicts:
tests/assignment/test_views.py
2014-10-18 08:53:51 +02:00
Oskar Hahn
bcd6b9fad4
Merge pull request #1356 from ostcar/poll404
...
Returns a 404 response if a requested poll does not exist.
2014-10-17 19:42:47 +02:00
Oskar Hahn
cb03908a1b
Returns a 404 response if a requested poll does not exist.
...
fixes #1355
2014-10-17 07:55:41 +02:00
Norman Jäckel
ff9fedd14f
Updated English language files.
2014-10-16 23:28:02 +02:00
Oskar Hahn
c454faef94
Updated Django to 1.7.x
2014-10-14 17:14:52 +02:00
Stefan Frauenknecht
ebadb9078c
Bugix in method get_title. Return item no for related objects.
2014-10-12 10:55:56 +02:00
Oskar Hahn
9b381b712e
Merge pull request #1341 from frauenknecht/i1324
...
Fix #1324 - Agenda item has whitespaces before number.
2014-10-12 10:31:31 +02:00
Norman Jäckel
af8dead5a3
Fixed motion detail view template. Added block to enable extra content via plugins. Updated CHANGELOG.
2014-10-12 10:23:38 +02:00
Oskar Hahn
3527b0a75b
Refactory of the participant app
...
* New user model (used Django's AbstractBaseUser)
* Renamed the app to users
* removed person api
See #861
Fixed #576 #478
2014-10-12 10:06:54 +02:00
Emanuel Schuetze
2a389b4a7f
Fixed #1326 : Assignment PDF fails when having a lot of posts.
...
Print always 7 signature lines in assingment pdf.
Added test.
2014-10-10 22:24:28 +02:00
Stefan Frauenknecht
276f76d320
Omit leading zero in method item_no if no agenda prefix is given.
2014-10-10 21:30:22 +02:00
Oskar Hahn
32137b6523
Use python3
...
python3.3 and python3.4 are supported
2014-08-24 21:21:11 +02:00
Emanuel Schuetze
f6d0a96126
Show supporters on motion slide if available.
2014-07-14 22:54:53 +02:00
Emanuel Schuetze
587a3766d2
Fixed participant csv import for group id
...
- Allowed to add multiple groups in csv group id field (e.g. "3,4")
- Fixed bug that group ids > 9 can not be imported.
- Updated error message if group id does not exists.
2014-07-14 22:54:53 +02:00
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
Norman Jäckel
ee3ec3d4b6
Fixed flake8 errors.
2014-03-27 20:38:13 +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
e7f67457db
Regrouped config collections and pages. Fixed #1201 .
2014-03-13 00:41:57 +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
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
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
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
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
4c3791a9a8
Merge pull request #1193 from emanuelschuetze/rename-static-files
...
Rename and clean up static directories.
2014-01-16 13:35:38 -08:00
Emanuel Schuetze
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
Norman Jäckel
4b63f3a288
Coupled assignment candidates with list of speakers. Fixed #1092 .
2014-01-13 15:22:46 +01:00
Oskar Hahn
d72fe39da6
Merge branch 'stable/1.5.x'
2014-01-12 13:38:07 +01:00
Oskar Hahn
bbd7542341
Fixed agenda_item.is_active_slide() with related item and list of speakers
2014-01-12 12:48:38 +01:00
Norman Jäckel
04b0cfb0bc
Used entry points to detect plugins automaticly.
2014-01-12 12:48:24 +01:00
Norman Jäckel
e0223c950b
Added possibility to use custom templates and static files in user data path directory.
2014-01-12 11:05:54 +01:00
Oskar Hahn
6409f828d7
Added a poll description field for each assignment poll
...
fixed signals in MainMenuTests
2014-01-12 10:22:38 +01:00
Oskar Hahn
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
Norman Jäckel
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
Norman Jäckel
b95a856904
Added form field for multiple creation of new participants. Fixed #178 .
2014-01-11 23:09:59 +01:00
Oskar Hahn
90f9313faa
Use the jsonfield as requirement
2014-01-11 23:01:29 +01:00
Oskar Hahn
56c8dcdac1
Merge branch 'stable/1.5.x'
2014-01-11 22:58:39 +01:00
Oskar Hahn
558bef2e91
Merge pull request #1167 from normanjaeckel/MainError
...
Fixed error in main script when using other database engine. Fixed #1166 .
2014-01-11 13:49:57 -08:00
Oskar Hahn
cde6232477
Merge branch 'stable/1.5.x'
...
Conflicts:
openslides/projector/projector.py
openslides/templates/base.html
2014-01-11 22:30:14 +01:00
Oskar Hahn
ad09a18e3f
removed edit and view in get_absolute_view
2014-01-11 17:39:16 +01:00
Oskar Hahn
4c86c9cd07
Fix list_of_speaker overlay
...
* Issue a warning message, if a overlay raises a exception
* Fixed #1131
2014-01-11 09:21:35 +01:00
Norman Jäckel
19ccbd3b17
Fixed error in main script when using other database engine. Fixed #1166 .
2014-01-11 08:51:17 +01:00
Norman Jäckel
21ff62dd32
Changes in projector and core app and in utils.
...
Changed api for main menu entries.
Enhanced http error pages using a classed based views.
Moved dashboard and select widgets view from projector to core app.
Also some small clean ups.
2014-01-10 16:17:54 +01:00
Norman Jäckel
22960748a3
Added permission to see participants also to the manager group. See #1150 .
2013-12-23 19:14:11 +01:00
Norman Jäckel
1e52959f70
Fixed error when a file was removed from filesystem. Fixed #1120 .
2013-12-23 18:46:04 +01:00
Norman Jäckel
03fd7fd142
Fixed http status code when requesting a non-existing static page using Tordado web server. Fixed #1161 .
2013-12-23 17:42:11 +01:00
Norman Jäckel
9a3243706b
Inserted api for the personal info widget.
2013-12-09 12:16:16 +01:00
Norman Jäckel
405fadb6f5
Rename some classes of the poll api. Clean up the poll api.
2013-12-07 00:24:11 +01:00
Norman Jäckel
bdf1679eb0
Rename classes in the config api.
...
Also change attributes for config collection without view.
2013-12-06 10:47:20 +01:00
Norman Jäckel
fee983045b
Change API for plugins, esp. for names and versions of plugins. Also enhance possibility to patch existing OpenSlides urlpatterns.
...
Fix some other tests by the way.
2013-12-05 16:40:54 +01:00
Norman Jäckel
91ca066aa5
Enable update and delete view for uploader refering to his own files.
2013-12-03 01:53:37 +01:00
Norman Jäckel
43c6efa222
Disable participant widgets by default. Fixes #988 .
2013-12-02 18:03:28 +01:00
Oskar Hahn
2cf2774e58
Merge pull request #1139 from DerPate/fix_last_gpl_header
...
remove the last occurence of gnu gpl license header fix #1130
2013-12-02 07:46:09 -08:00
Dominik Breu
a3bf29acf2
remove the last occurence of gnu gpl license header fix #1130
2013-12-01 22:52:08 +01:00
Norman Jäckel
1fb1f17d15
New API for widgets using a metaclass.
...
It is now possible to define a default state and to submit extra stylefiles and javascript files when defining a widget in an app. This is done by a new metaclass in openslides.utils.dispatch. Also fixed some other tests.
2013-12-01 21:30:12 +01:00
Emanuel Schuetze
25d7e0f99b
Fixed dummy-notification message class and generic new_message function.
2013-11-29 13:04:29 +01:00
Emanuel Schuetze
42f10fa03d
Fixed projector template: Removed double <hr> in welcome and custom slide.
2013-11-29 13:04:28 +01:00
Norman Jäckel
f510399230
Update version to 1.6a1-dev.
2013-11-25 23:42:52 +01:00
Norman Jäckel
dfa334782e
Update version to 1.5.1-dev
2013-11-25 20:26:06 +01:00
Norman Jäckel
dc529feda4
Release 1.5
2013-11-25 20:26:06 +01:00
Oskar Hahn
5541861176
Merge pull request #1125 from emanuelschuetze/documentation1.5
...
Documentation1.5
2013-11-25 11:08:25 -08:00
Emanuel Schuetze
0d149180dd
Updated documentation for 1.5
...
- Updated all screenshots.
- Improved image handling with autoimage extension.
- Some minor content updates for 1.5 version.
- Fixed wrong list of speakers icon.
2013-11-25 17:14:11 +01:00
Oskar Hahn
49ca243153
Add function get_active_object and bugfixes
...
* Dont throw errors in overlay.get_projector_html if debug == False
* fixe check of active slide in agenda
* Fix #1121
2013-11-25 11:35:03 +01:00
Oskar Hahn
d6a824936d
Merge pull request #1119 from ostcar/translate_languages
...
translate lanuage names in global_settings
2013-11-24 15:08:42 -08:00
Oskar Hahn
d02721a1f1
translate lanuage names in global_settings
...
Fixes : #1118
2013-11-25 00:07:06 +01:00
Emanuel Schuetze
ed427048af
Final update of all languages for 1.5: CS, DE, FR, PT.
2013-11-24 20:37:13 +01:00
Oskar Hahn
f8048da76c
Fixed countdown and projector update issues
...
* agenda_item.get_absolute_url('projector') returns the activate-url of the related slide.
* agenda_item.is_activate() returns True, if the related item is active
* Fixed set_active_slide to accept kwargs
* Reset countdown when saving a new duration time
* Update countdown overlay when begin_speak and end_speak is called
* Fixed blinking countdown
Fixes : #1078 , #1076 , #1075
2013-11-24 10:04:01 +01:00
Norman Jäckel
d2d8b5a39d
Fix start script help text.
2013-11-23 18:49:51 +01:00
Norman Jäckel
2af3b320c8
Merge pull request #1116 from emanuelschuetze/template-fix2
...
Minor template fixes
2013-11-23 08:25:33 -08:00
Emanuel Schuetze
f1fd3208bd
Template fixes
...
- Agenda overview: Fixed padding of duration column.
- Agenda overview: Optimize header information for small devices with bootstrap's row-fluid class.
- Fixed text align in assignment detail template.
2013-11-23 15:05:19 +01:00
Emanuel Schuetze
8ca4f0409f
Use btn-mini class for list of speakers question in agenda view.
2013-11-22 20:39:28 +01:00
Emanuel Schuetze
f59b25e0dc
Updated EN po file.
2013-11-22 15:35:24 +01:00
Emanuel Schuetze
301bc8ac7c
Translate state.name in motion log message.
2013-11-22 15:34:32 +01:00
Emanuel Schuetze
94abda60b5
Added help text for duration field in agenda item form. ( Fixed #1085 )
2013-11-22 10:04:00 +01:00
Norman Jäckel
5bff907b34
Merge pull request #1091 from emanuelschuetze/template-fixes
...
Fixed a lot of template bugs from irc test session.
2013-11-21 10:48:40 -08:00
Dominik Breu
8e6269b495
fix #1085 maybe could be done better but for 1.5 integration this could be used . input 60< is converted to hh:mm
2013-11-21 08:13:24 +01:00
Emanuel Schuetze
9aed1f764d
Fixed a lot of template bugs.
...
- agenda overview: Text align right for duration column.
- item summary slide: Show 'get_title_supplement' after each related agenda item.
- item detail view: Add ":" in button after item content_type
- projector: Show <hr> below title/subtitle line.
- motion view: Check manage permission for delete version button in version history table.
- motion detail view: Update version authorized badges and go to buttons.
- motion list: Link warning icon to newest version.
- assignment detail view: Added ballot paper pdf button.
- Group slide and overview: Show members.
- Use dynamic title column width in participants pdf.
- Fixed missing translations in user settings form.
- IE8/9 fix for projector template style.
- Style linebreak and border in h1 title with css.
2013-11-20 22:05:10 +01:00
Norman Jäckel
c34b407945
Fix templatetag, #1077 .
2013-11-19 17:57:03 +01:00
Oskar Hahn
3d19ae7db2
Merge pull request #1082 from normanjaeckel/SetStateView
...
Add check for set state view, fix #1080 .
2013-11-19 08:13:10 -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
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
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
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
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
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
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
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
cc0298eaa0
Use encoded string for insert in sys.path and print during main script. Fix #1022 .
2013-11-10 22:21:14 +01: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
Norman Jäckel
c4850e4b19
Move run_tornado import into runserver function because its imports needs settings (new in Django 1.6).
2013-11-10 22:15:13 +01:00
Emanuel Schuetze
0a2c73842a
Updated translations (DE, PT, CS).
2013-11-10 21:56:07 +01:00
Norman Jäckel
d2309cbe49
Merge pull request #1026 from normanjaeckel/EnglishTransFile
...
Update English translation files.
2013-11-10 12:27:09 -08:00
Norman Jäckel
7b45231211
Merge pull request #1001 from ostcar/django1.6
...
Update to Django 1.6
2013-11-10 12:26:06 -08:00
Norman Jäckel
ec0a27e545
Update English translation files.
2013-11-10 21:13:57 +01:00
Emanuel Schuetze
1fb0a21d0b
Some more template fixes:
...
- Fixed #992 (Use correct countdown format)
- Fixed #909 (Backend und projector template style)
* Search bar with same border-radius like login button.
* Projector: Fixed overlay message style. Allow HTML code (use template filter 'safe').
* Dashboard: Tooltips, Buttons and Widget fixes.
- Fixed template does not exists error if custom slide is activated.
- Countdown: Add css to show negative countdown in red.
- Add missing translation strings to English po file (for transifex).
2013-11-10 20:50:30 +01:00
Emanuel Schuetze
34701c67a6
Template improvements.
...
- motion detail template: Fixes motion manage state template block.
- mediafile list template: Fixed missing activeline class.
- item detail template: Fixed is_active_slide conditions.
- assignment view template: Use bottongroup instead of single radio buttons.
- Projector template: Updated header and countdown style. Removed footer.
- Added config options to show logo and/or title/description.
- Projector template: New config options to set background color and font color for projector header.
- Make WLAN form labels not translateable.
2013-11-10 20:27:38 +01:00
Emanuel Schuetze
45588024fd
Fixed #957 (Allow list-style in CKEditor)
...
Allowed additional css styles 'color' and 'background-color'
for span html fields in ck-editor (and bleach).
2013-11-10 19:33:38 +01:00
Oskar Hahn
31729534fa
Merge pull request #1016 from emanuelschuetze/fix897
...
Use correct server time for all clients
2013-11-10 08:32:16 -08:00
Emanuel Schuetze
3b8c8145d7
Fixed #897 (Use correct server time for clock/countdown on other clients)
2013-11-09 21:28:45 +01:00
Oskar Hahn
2a7a50a817
Show default_slide if an error occurs in a slide
...
See #925
2013-11-09 15:14:55 +01:00
Oskar Hahn
ab048e3393
Update to Django 1.6
2013-11-07 18:56:06 +01:00
Oskar Hahn
e92af391c3
Merge pull request #1005 from ostcar/activate_view
...
Update scroll and sale in activate view.
2013-11-07 09:53:34 -08:00
Oskar Hahn
5fff885c89
Merge pull request #1012 from ostcar/issue_998
...
removed unused javascript. Fixes #998
2013-11-07 08:03:42 -08:00
Oskar Hahn
fe68fffdda
removed unused javascript. Fixes #998
2013-11-07 13:53:33 +01:00
Oskar Hahn
01eb64c1d2
Update scroll and sale in activate view.
...
Fixes #939
2013-11-07 12:45:17 +01:00
Oskar Hahn
929587971a
Merge pull request #1006 from normanjaeckel/CheckPort
...
Check used port, fix #985 .
2013-11-06 13:03:40 -08:00
Oskar Hahn
2309bd4772
Merge pull request #1004 from ostcar/update_projector_default_slide
...
Update projector when the title of the default slide changes
2013-11-06 12:34:33 -08:00
Norman Jäckel
17a2eb97cb
Check used port, fix #985 .
2013-11-06 17:49:41 +01:00
Oskar Hahn
cc8b573b62
Update projector when the title of the default slide changes
2013-11-06 17:28:17 +01:00
Oskar Hahn
1ebca3b12e
Fixed participant edit view
2013-11-06 17:08:54 +01:00
Oskar Hahn
5040de8dcb
Merge pull request #1000 from ostcar/javascript
...
Fixed some javascript related problems
2013-11-06 07:40:51 -08:00
Oskar Hahn
2d07644d3c
Fixed some javascript related problems
2013-11-06 14:58:30 +01:00
Emanuel Schuetze
97d6cd37b4
Updated EN po file for transifex.
2013-11-06 08:56:40 +01:00
Oskar Hahn
0752d476e4
Change to MIT Licence
...
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
Oskar Hahn
2691e2b239
More Tests for projector views
2013-11-04 14:53:07 +01:00
Oskar Hahn
71666094e7
Add tests for the projector code
2013-10-30 18:58:15 +01:00
Emanuel Schuetze
4234b46b36
Update version to 1.5-dev
2013-10-29 22:31:43 +01:00
Emanuel Schuetze
efcaffaa02
Release 1.5b1
2013-10-29 22:31:28 +01:00
Max Brauer
bd332bd3d5
added possibility to show pdfs on the projector
2013-10-29 22:05:11 +01:00
Emanuel Schuetze
ccdf5ef2e0
Motion PDF: Keep whitespaces in monospace <pre> tags and replace it with ' '.
2013-10-29 14:57:23 +01:00
Oskar Hahn
558b4e9f86
Merge pull request #966 from normanjaeckel/NewCommandDevSettings
...
New command create-dev-settings. Clean up main script. Fix wrong path fo...
2013-10-29 00:08:16 -07:00
Norman Jäckel
3ec18194fa
New command create-dev-settings. Clean up main script. Fix wrong path for Windows version.
2013-10-29 00:48:49 +01:00
Emanuel Schuetze
2c4a2b3628
Fixed #943 : User settings menu button should not run out of the screen (right side)
2013-10-28 21:43:11 +01:00
Oskar Hahn
10bd38d3a5
Fixed reload of javascript
2013-10-28 21:17:32 +01:00
Oskar Hahn
76c0a98ab8
Merge pull request #960 from ostcar/time_format
...
Time format
2013-10-28 13:05:53 -07:00
Oskar Hahn
ffe612359f
use the server_time for countdown and clock
2013-10-28 21:05:32 +01:00
Dominik Breu
ef687ad23c
Fix for wrong format of clock and countdown on projector
2013-10-28 21:05:28 +01:00
Norman Jäckel
b2afa77e25
Add error message if a invalid answer was send via POST to a QuestionView. Fix #940 .
2013-10-28 17:02:18 +01:00
Oskar Hahn
47c60078b3
Use sockjs instead of only websocket
2013-10-27 20:50:10 +01:00
Oskar Hahn
6f7dabe870
Merge pull request #955 from normanjaeckel/Fix927
...
Add message if someone adds himself to the list of speakers. Fix #927 .
2013-10-25 23:59:00 -07:00
Oskar Hahn
e27c746f4a
Merge pull request #954 from emanuelschuetze/password-pdf
...
Use DIN A4 format and wlan ssid qrcode on access data PDF
2013-10-25 23:56:21 -07:00
Emanuel Schuetze
a513477033
Fixed #948 : Use DIN A4 format and wlan ssid qrcode on access data PDF.
2013-10-25 20:51:48 +02:00
Norman Jäckel
218d0bad23
Add message if someone adds himself to the list of speakers. Fix #927 .
2013-10-24 18:24:19 +02:00
Emanuel Schuetze
84d2619289
Improved projector zoom and scroll behaviour.
...
Zoom and scroll the full content div (incl. title and sidebar).
Add zoom and scroll level in projector live view widget.
2013-10-23 19:44:37 +02:00
Norman Jäckel
6175ce25c5
Fix #934 : Error in motion import with bad csv file.
2013-10-22 00:18:58 +02:00
Norman Jäckel
9d80c05f90
Fix url_name_args bug.
...
Fix delete view for motion categories. Add test for custom slide delete view.
2013-10-21 22:51:38 +02:00
Oskar Hahn
8303c4444f
Merge pull request #933 from emanuelschuetze/requirements
...
Requirements
2013-10-21 12:59:10 -07:00
Emanuel Schuetze
f1a8993452
Used reportlabs qrcode widget (instead of extra qrcode package).
2013-10-21 21:27:07 +02:00
Emanuel Schuetze
d76846e385
Updated EN + DE translation file.
2013-10-21 21:20:55 +02:00
Emanuel Schütze
af14f962df
Merge pull request #936 from emanuelschuetze/translation
...
Updated EN djanog.po file.
2013-10-21 11:50:29 -07:00
Emanuel Schuetze
8b8435109b
Updated EN djanog.po file.
2013-10-21 20:46:59 +02:00
Norman Jäckel
b0e3c7d456
Fix missing url_name_args = [] lines in different views.
...
Fix custom slide create and update view.
Fix motion category create and update view.
2013-10-21 19:10:53 +02:00
Emanuel Schuetze
bac918a9e8
Some bug fixing for 1.5b1
...
- Fixed #921 (Check THANKS URL for jQuery UI Nested Sortable)
- Fixed #919 (Permission problem in agenda)
- Fixed #918 (Search does not work for guest users)
- Fixed search-bar position.
- Updated EN po files.
2013-10-21 14:39:28 +02:00
Oskar Hahn
82f0df4fea
Send js to the projector
...
* fixed scroll and scale of the projector
2013-10-21 07:53:21 +02:00
Norman Jäckel
273140007e
Fix url_name_args problems in user and group views. Add tests.
2013-10-20 21:42:17 +02:00
Oskar Hahn
c399eea2dd
Merge pull request #920 from normanjaeckel/CountdownAndAgenda
...
Countdown and agenda
2013-10-19 22:19:26 -07:00
Norman Jäckel
40faaa39c6
Changed begin speach behavior. Fix merge conflicts. Add tests.
2013-10-19 14:52:37 +02:00
Norman Jäckel
a1ad1e4c49
Some changes in __main__.py and utils.main and other.
...
Reinsert --no-browser option.
Move some code to utils.main.
Some other small style changes.
Fix merge conflict misstakes.
Change settings behavior. Add tests.
Fix rebase problems.
2013-10-19 14:44:46 +02:00
Andy Kittner
21a1d77e29
fix gui/portable for pull request #903
2013-10-19 14:44:20 +02:00
Norman Jäckel
c63b7f995f
Clean up main.py and move code to __main__.py and utils/main.py.
2013-10-19 14:44:20 +02:00
Emanuel Schuetze
40af20cedb
New feature: couple countdown with list of speakers
...
'Begin speach' button starts countdown, 'end speach' button stops countdown.
2013-10-18 22:30:05 +02:00
Norman Jäckel
30371e964f
Insert new feature: attachments for motions.
...
Fixed #522 . Database struture changed.
2013-10-18 12:32:29 +02:00
Roland Geider
8f274c2691
Add CKeditor to the agenda item text field
2013-10-18 10:18:05 +02:00
Oskar Hahn
68b9a2e291
Cache the results of ItemDelete.get_answer_options
...
Fix #911
2013-10-18 07:49:39 +02:00
Oskar Hahn
d3f673a276
Merge pull request #912 from normanjaeckel/Fix910
...
Fix wrong question_url_name in ItemDelete view. Fix #910 .
2013-10-17 22:36:04 -07:00
Norman Jäckel
d76a04f443
Fix wrong url_name_args in ItemDelete view. Fix #910 .
2013-10-17 22:00:00 +02:00
Emanuel Schuetze
e277b8babf
Full text search with haystack and whoosh.
...
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
Roland Geider
95fe58eb99
Add prototype of full text search integration in openslides
...
Allow for empty title and text body, fix pep8 errors
2013-10-15 22:35:53 +02:00
Oskar Hahn
d937262d28
Use flake8 instead of pep8. Orderd the imports with isort
...
* changed the fab-command pep8 to check
* checked and fixed any code with flake8. Also the urls.py
* checkt the projector app with pylint
2013-10-14 18:43:12 +02:00
Oskar Hahn
d644d49579
Cleaned up utils
2013-10-13 20:43:26 +02:00
Emanuel Schuetze
a4d024f45c
Some template fixes and improvements:
...
- Fixed absoluteurl in motion detail template. Renamed '_edit' to '_update'.
- Fixed wrong projector link ind assigment poll template.
- Improved assignment projector slide.
- Fixed #884 : Add PDF note to translation string "Show paragraph numbering"
2013-10-12 20:29:27 +02:00
Oskar Hahn
6aae8bff15
More projector fixtures
...
* Update projector when polls are updated.
* Update projector when assignment candidates are updated
* Update projector when motion submitter are updated
* Fixed the assignment publish poll view
* Added projector.api.register_slide_model
2013-10-10 18:40:24 +02:00
Emanuel Schuetze
84d5293fbc
Rework (projector) template with bootstrap.
...
- Always use templatetag 'absolute_url' instead of (depricated) 'model_url'.
Search and replace all old arguments: edit -> update, view -> detail, delete
- Fixed bug in setting default value in 'absolute_url' templatetag
(default value is defined in models.py only).
Updated 'backend' template.
2013-10-07 08:57:22 +02:00
Oskar Hahn
d681e94eed
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
AUTHORS
2013-10-04 09:13:51 +02:00
Oskar Hahn
6926630d3e
Added Feature for config app, to return the default value for a key
2013-09-29 15:10:01 +02:00
Oskar Hahn
ecf5248962
Rework of the projector with websocket
...
* Set a static projector title
* absolute_urls for the activate links
* update the projector when a slide changes (in save())
* insert the absolute_url template filter
* Preview to slides
* renamed is_active to is_active_slide
* The SlideMixin has to come before the PersonMixin
* Update list of speakers
* Render Countdown via JS
* Reconnect projector after connection lost
* Overlays can allways be active and do not appear in the widget
* Rewrote the clock as overlay
2013-09-24 23:35:05 +02:00
Oskar Hahn
93079938a3
Fixed keyerror on user setting page
...
Fix #891
2013-09-24 23:31:45 +02:00
Emanuel Schuetze
7f172692da
Added Portuguese translation (Thanks to Marco A.G.Pinto)
2013-09-24 22:13:50 +02:00
Oskar Hahn
d2f5302e28
Merge pull request #888 from ostcar/sucess_message
...
Success_message in utils.views
2013-09-14 21:34:47 -07:00
Max Brauer
bf4825a3e0
Refactored assignments app to use class based views instead of
...
functions.
2013-09-14 18:20:35 +02:00
Oskar Hahn
477daa3fdf
Success_message in utils.views
2013-09-14 11:09:45 +02:00
Oskar Hahn
66679c8efe
Merge branch 'stable/1.4.x'
...
Conflicts:
openslides/__init__.py
2013-09-14 11:07:02 +02:00
Norman Jäckel
cd2f01ed26
Update version to 1.4.3-dev
2013-09-10 21:40:44 +02:00
Norman Jäckel
5854bb1f50
Release 1.4.2
2013-09-10 21:38:30 +02:00
Emanuel Schuetze
f2829eb173
Updated DE and FR translation (one new translation string).
2013-09-10 20:58:59 +02:00
Emanuel Schuetze
e621335169
Updated English translation file (for new translation string in motion config).
2013-09-10 09:07:12 +02:00
Emanuel Schuetze
0246525a7a
Updated DE, FR, CS translation (typo in EN translation string).
2013-09-09 22:12:10 +02:00
Oskar Hahn
7faf59a82b
Merge pull request #878 from ostcar/change_agenda_items
...
Fixed wrong ordering of agenda items after order change
2013-09-09 02:04:27 -07:00
Oskar Hahn
3bf1f24a4a
Fixed wrong ordering of agenda items after order change
...
Fixed #875
2013-09-08 11:17:32 +02:00
Norman Jäckel
404d0fc272
Add on_change_callback to config variables. These callback can be defined in the ConfigVariable object and is called, when the variable is changed.
2013-09-08 11:16:23 +02:00
Oskar Hahn
a28ca8a4a3
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/assignment/models.py
2013-09-07 16:48:55 +02:00
Norman Jäckel
26607da154
Fix delete of assignments with related agenda items.
2013-09-07 16:33:10 +02:00
Oskar Hahn
b228a02429
Merge remote-tracking branch 'openslides/stable/1.4.x'
2013-09-07 15:42:16 +02:00
Oskar Hahn
5ad3085551
Merge pull request #871 from normanjaeckel/DefaultWidgetSorting
...
Add default sorting of widgets. Fix #493
2013-09-07 06:36:21 -07:00
Oskar Hahn
afe186add4
Fixed repr in widget
2013-09-07 15:19:03 +02:00
Norman Jäckel
a50617676a
Add default sorting of widgets. Fix #493
2013-09-07 15:13:27 +02:00
Emanuel Schuetze
1045f14026
Fixed missing creation time of motion version.
...
Show now string if identifier is not set set (in widgets and motion detail).
2013-09-07 14:31:21 +02:00
Norman Jäckel
c800884a43
Use GenericForeignKey for agenda related items, fix #865
2013-09-07 14:30:25 +02:00
Oskar Hahn
9084216f06
Merge branch 'stable/1.4.x'
2013-09-07 00:15:31 +02:00
Emanuel Schuetze
cb7d54973d
Fixed #858 : Removed max value (8) of config field "motion_min_supporters".
...
Removed supporters signature field in motion pdf to prevent the unused signature fields
which are printed for each required supporters if you have a high minimum supporters number.
2013-09-06 21:59:54 +02:00
Emanuel Schuetze
48f8e82eda
Fixed #859 : New config option to disable paragraph numbering in motion pdf
...
Default value: disabled
2013-09-06 21:59:54 +02:00
Emanuel Schuetze
9dcdf67398
Fixed typo in English translation string in djangojs.po.
2013-09-06 21:59:53 +02:00
Emanuel Schuetze
67175042f9
Fixed #857 : Use jquery plugin 'bsmSelect' for <select multiple> form elements.
2013-09-06 21:59:52 +02:00
Emanuel Schuetze
011786d360
Updated CKEditor from 4.1.1 to 4.2.
2013-09-06 21:59:52 +02:00
Emanuel Schuetze
ec61bd8cdc
Fixed #854 : IE fix for ckeditor's plugin insertpre:
...
Removed 'class' attribute to fix viw in IE8+.
Use monospace in insertpre dialog in IE.
Updated German translation file.
2013-09-06 21:59:50 +02:00
Norman Jäckel
c88d180808
Deletes config cache after each test if it exists.
2013-08-19 18:05:03 +02:00
Oskar Hahn
25bac4a704
Fixed a bug when setting a config var before getting one
2013-08-19 17:59:35 +02:00
Oskar Hahn
20cf960c82
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/core/templatetags/tags.py
2013-08-19 17:54:50 +02:00
Oskar Hahn
1113b6d861
Added template filter 'absolute_url'
2013-08-19 11:21:29 +02:00
Oskar Hahn
99895a28d1
Fix get_absolute_url for deleted persons.
...
Fix #845
2013-08-19 10:50:37 +02:00
Oskar Hahn
967c199a56
Removed utils from INSTALLED_APPS.
...
Moved utils.management and utils.templatetags to core
2013-08-11 09:40:14 +02:00
Oskar Hahn
b8d23164f7
Merge remote-tracking branch 'openslides/stable/1.4.x'
...
Conflicts:
openslides/__init__.py
2013-07-29 20:52:05 +02:00
Norman Jäckel
1225c5bbb6
Update version to 1.4.2-dev
2013-07-29 20:19:29 +02:00
Norman Jäckel
119fb90bfd
Release 1.4.1
2013-07-29 20:17:26 +02:00
Oskar Hahn
b03e8cc06b
Fixed #833
2013-07-29 19:45:06 +02:00
Emanuel Schuetze
20d7a3b539
Add paragraph around each motion version warning (to show each warning in one line).
2013-07-29 09:06:36 +02:00
Norman Jäckel
30c3f5ea64
Disable deleting active versions of a motion
2013-07-28 01:14:15 +02:00
Oskar Hahn
b7edee8fdf
Merge pull request #836 from ostcar/issue-833
...
Fixed tooltip and duration in agenda.
2013-07-27 15:29:21 -07:00
Oskar Hahn
8743d75d10
Use get_active_version in motion.__unicode__()
...
Fixes the bug, that motion.__unicode__() raises an AttributeError, if the active_version
was None.
Fixes #822
2013-07-27 10:11:28 +02:00
Oskar Hahn
b39cb8e8a4
Fixed tooltip and duration in agenda.
...
The tooltip did not show the end of an agenda item, but of the hole event.
If a item was closed, it was not used to calculate the end of the event.
Fixed #833
2013-07-27 10:02:40 +02:00
Emanuel Schuetze
bb538953ee
Added Czech translation (Thanks to Pavel Fric!)
2013-07-26 21:37:58 +02:00
Oskar Hahn
7726fa87a9
Merge pull request #831 from ostcar/issue-823
...
Generate poll-urls via model_url
2013-07-25 14:11:33 -07:00
Norman Jäckel
2128e787bf
Start Browser on custom IP, fixed #827
2013-07-25 17:03:04 +02:00
Oskar Hahn
b83b1c49e9
Generate poll-urls via model_url
...
Fixed Bug to wrong poll urls
Fixed #823
2013-07-18 09:50:54 +02:00
Oskar Hahn
ec3db2ffff
Prepare OpenSlides master for the next major release
2013-07-18 08:50:08 +02:00
Norman Jäckel
9d01881986
Update version to 1.4.1-dev
2013-07-08 20:08:10 +02:00
Norman Jäckel
304c572f85
Release 1.4
2013-07-08 20:05:31 +02:00
Oskar Hahn
526eeb5cea
Merge pull request #818 from ostcar/issue_814
...
Fixed #814 Sorting of candidates in the assignment
2013-07-08 05:27:19 -07:00
Oskar Hahn
47d70d5a73
Fixed #814 Sorting of candidates in the assignment
2013-07-08 14:08:27 +02:00
Oskar Hahn
f2d13e5ec9
Merge pull request #817 from ostcar/master
...
Issue 794
2013-07-08 05:03:40 -07:00
Oskar Hahn
8ebf3f9038
Merge pull request #815 from emanuelschuetze/csv-files
...
Updated CSV files with demo data. Minor fixes for motion.
2013-07-08 04:49:08 -07:00
Oskar Hahn
f39e8dd92e
Fixed #794 bug when a non speaking list slide was active, when a projector tab was opend
2013-07-08 13:44:44 +02:00
Emanuel Schuetze
b12fdb09cd
Updated German translation (some typos).
2013-07-08 13:40:06 +02:00
Norman Jäckel
d703ef9c4f
Rename visual strings of permissions: Add plural s ( fix #797 ). Also update all language files.
2013-07-08 00:03:47 +02:00
Emanuel Schuetze
5bff15762e
Motion detail template: Removed category from title (already in meta block)
2013-07-07 23:04:26 +02:00
Emanuel Schuetze
7e5c3f6a27
Removed whitespace in filename of motion pdf (identifier: PrefixNumber).
2013-07-07 22:00:10 +02:00
Oskar Hahn
aca2570cb7
Merge pull request #800 from andkit/portable-improvements
...
Portable improvements
2013-07-06 23:57:00 -07:00
Oskar Hahn
04ee38dcc0
Merge pull request #809 from emanuelschuetze/fixes-1.4
...
Fixed #798 and #803
2013-07-05 08:08:48 -07:00
Emanuel Schuetze
3fadb99ffd
Fixed #803 (Groups not translated on user detail view and overview pdf)
2013-07-05 15:49:10 +02:00
Emanuel Schuetze
4625c4731d
Updated translation. Fixed #798 (typo in translation of permissions).
2013-07-05 14:51:37 +02:00
Andy Kittner
b568546fb8
Add some explanation to is_portable(); fixes #729
2013-07-04 23:29:56 +02:00
Norman Jäckel
834851acbd
Typo in assignment view ( fixed #805 )
2013-07-04 15:40:47 +02:00
Emanuel Schuetze
5dd65cb173
Fixed motion pdf and template issues:
...
- Fixed #790 (Unicode Error while creating motion pdf if motion text contains umlauts and motion is imported from CSV)
- Fixed #742 : Added categories and identifier to motion pdf.
- Fixed wrong title order (app title - OpenSlides).
2013-06-28 12:43:58 +02:00
Emanuel Schuetze
db7e22229e
Fixed comments by norman.
2013-06-27 09:20:28 +02:00
Emanuel Schuetze
cf773c34a8
Updated translations.
2013-06-26 21:36:06 +02:00
Oskar Hahn
bf8482fc03
Merge pull request #786 from emanuelschuetze/1.4-fixes
...
Some template and doc fixes
2013-06-26 10:11:28 -07:00
Oskar Hahn
7d1eb5207a
Fixes #765 . Avoids the django AbstracUser username validator
...
Also changed added a white-space in the default username again
2013-06-26 19:00:52 +02:00
Emanuel Schuetze
64e7cfd98e
Some template and doc fixes
...
- Fixed #766 (agenda overview parent item look).
- Fixed #767 (Documentation sphinx bootstrap theme: html header)
- Fixed #785 (Enlarged doc screenshots by hover via CSS)
- Updated sphinx-bootstrap-theme to 0.2.4
- Add btn class for agenda end time tooltip
2013-06-25 22:15:51 +02:00
Norman Jäckel
7dddd70493
Fix whitespaces in translated strings.
2013-06-25 17:44:31 +02:00
Emanuel Schuetze
4a0c40a333
Fixed white projector live view in IE 10 (missing transform-origin).
2013-06-25 14:03:36 +02:00
Norman Jäckel
c3d0c0f852
Update translation source files
2013-06-21 23:36:23 +02:00
Oskar Hahn
00d57e3011
Fixed #463 , typo in urls.py
2013-06-21 09:01:56 +02:00
Norman Jäckel
bad64144da
Fix translation of messages with additional content
2013-06-20 23:36:23 +02:00
Norman Jäckel
989f6b2d84
Space in Motion Log
2013-06-20 22:37:32 +02:00
Norman Jäckel
96c5b1d2dc
Fix numbering with category prefix in simple workflow, fix #769
2013-06-20 18:03:22 +02:00
Oskar Hahn
08a71c17a3
Fixed #770 . Ordering of Users in GroupForm regulated by the config var.
2013-06-20 08:33:55 +02:00
Norman Jäckel
c5beb07fbc
Update version to 1.4-dev (final)
2013-06-17 20:19:02 +02:00
Norman Jäckel
0039207899
Release 1.4c1
2013-06-17 20:17:32 +02:00
Oskar Hahn
32771d946e
Merge pull request #754 from emanuelschuetze/fixes-for-1.4c1
...
IE-Template fix and README/main.py updates.
2013-06-17 11:13:05 -07:00
Emanuel Schuetze
42809048f9
Updated and adjusted options help text in main.py and README.
2013-06-17 19:59:58 +02:00
Emanuel Schuetze
f191d3687b
Updated French translations (by Moira via transifex).
2013-06-17 17:54:05 +02:00
Emanuel Schuetze
7dc2b0d904
Fixed #753 (Wrong scaling of projector live view in Internet Explorer)
...
Supports IE8+ only. Dropped IE7 support.
2013-06-17 17:30:46 +02:00
Emanuel Schuetze
c450dfb1d5
Fixed typo.
2013-06-17 10:44:55 +02:00
Oskar Hahn
c14302dd6f
small translation update
2013-06-16 18:44:14 +02:00
Oskar Hahn
64af0b162f
Create admin-user after syncdb
2013-06-16 17:07:55 +02:00
Emanuel Schuetze
5237e1d90d
Fixed #745 and #744 : Make widgets fixable and collapsable.
...
Fixed widget header style issues.
2013-06-16 12:15:52 +02:00
Oskar Hahn
fd731d68fa
Merge pull request #733 from normanjaeckel/Fix_Syncdb
...
Disable interactive mode of the syncdb command, fixed #696
2013-06-16 02:31:27 -07:00
Norman Jäckel
31547f8e1a
Save identifier in MotionSetStateView, fixed #739
2013-06-16 01:06:47 +02:00
Norman Jäckel
dfc160af5b
Disable interactive mode of the syncdb command, fixed #696
2013-06-16 01:05:22 +02:00
Oskar Hahn
575da78f3a
Editview for releated agenda items.
...
Releated Agenda Items need there own edit view to edit some agenda specifc
values.
Also added a new filter 'trans' to translate variables.
Fixes #710
2013-06-16 00:55:07 +02:00
Oskar Hahn
9853f2c433
Change the Workflow of a motion in CreateView.
...
The Manager can choose the workflow in the createview. The default value
is the workflow from the config.
In the UpdateView the workflow in which the motion is, is choosen by
default.
The workflow will only be reset, if it is changed.
2013-06-16 00:53:49 +02:00
Emanuel Schuetze
a383a4305b
Fixed some (pdf) template issues and updated (DE) translation.
...
- Fixed #737 (Motion edit link is missing for normal delegate users)
- Fixed motion pdf filename errors (now use motion-<identifier>.pdf or if no identifier: motion-<title>.pdf with using djangos slugify for special chars in title)
- Fixed motion pdf build error if there is an unauthorized version
- Enlarge max_length of event name field to 50 chars.
- Align participant import instruction with motion import page.
- Added title field to particpants-demo_en.csv.
- participant overview: Show comma after last_name only if first_name and last_name are given.
- Changed all page titles to "<specific action page> - <event-name>" (moved event-name to the end of the string)
- Updated EN tranlation string.
- Updated DE translations.
2013-06-15 17:50:30 +02:00
Oskar Hahn
e630d600ed
Fixes #648
...
delete function for the motion versions
2013-06-15 09:18:21 +02:00
Norman Jäckel
3afc58be9e
Add request to all widgets, fixed #653
2013-06-13 23:45:30 +02:00
Norman Jäckel
48f237a92f
Print listening info to command line
2013-06-13 16:58:34 +02:00
Oskar Hahn
6dad2e5161
Listen per default to the public
2013-06-13 16:58:34 +02:00
Oskar Hahn
efd10eaecc
Fixed #718
...
An string argument was not used in the assignment app
2013-06-13 16:47:35 +02:00
Norman Jäckel
a0c023cf45
Use ordinal numbers in assignment and motion polls, fixes #456 . Include humanize app to portable
2013-06-13 15:48:55 +02:00
Oskar Hahn
42ad1113fa
Fixed #724
...
The motion updated view now uses the last_versio instead of the active_Version
2013-06-11 11:42:20 +02:00
Norman Jäckel
aa0728ff60
User lockout protection, fixed #666
...
Protection of updating and deleting users and groups if this caused a lockout of the requesting user.
2013-06-11 11:02:40 +02:00
Oskar Hahn
4b0c62d29a
Fixes #721
...
Saving the anonymous user into a list of speakers.
Also raises an AttributeError if someone tries to save the anonymous user
into any person field.
2013-06-09 18:57:42 +02:00
Norman Jäckel
0d1db941b8
Insert LocalizedModelChoiceField for use in MotionSetWorkflowMixin. Fixed #713 .
2013-06-09 16:41:58 +02:00
Emanuel Schuetze
a3038f3eb2
Set version to 1.4rc1-dev.
2013-06-04 01:05:15 +02:00
Emanuel Schuetze
27ed6a7c1d
1.4b2 release.
2013-06-04 01:02:25 +02:00
Emanuel Schütze
37da0cc7bb
Merge pull request #709 from emanuelschuetze/fixes-for-1.4b2
...
Fixes and improvements for 1.4b2
2013-06-03 15:58:13 -07:00
Emanuel Schuetze
a96b8a7833
Updated FR translations (Thanks to Moira).
2013-06-04 00:47:29 +02:00
Emanuel Schuetze
880b3cd19b
Updated DE translations.
2013-06-04 00:47:29 +02:00
Andy Kittner
9826e3ec06
Add a simple wxPython based gui frontend for openslides
2013-06-04 00:07:22 +02:00
Andy Kittner
fb91317ce1
Add command to backup the database
2013-06-04 00:07:22 +02:00
Andy Kittner
21c739a94f
Add --no-run parameter
...
This parameter allows e.g. to synchronize the database without starting
the webserver.
2013-06-04 00:07:22 +02:00
Emanuel Schuetze
cf791e599a
Updated EN translation strings and updated EN po files.
...
Template fixes and improvements.
2013-06-03 23:33:01 +02:00
Emanuel Schuetze
bdfdb4c064
Fixed #652 : Button for ageda item with related sid.
2013-06-03 22:42:16 +02:00
Emanuel Schuetze
4126c180c8
Fixed #701 : Check bootstrap tooltips on all buttons.
2013-06-03 22:42:16 +02:00
Emanuel Schuetze
cd84d64071
Fixed #702 : list of speakers projetor/overlay style.
2013-06-03 22:42:15 +02:00
Emanuel Schuetze
ef6eaf8fa4
Fixed #703 : Mcrophon icons for list of speakers
2013-06-03 22:42:14 +02:00
Emanuel Schuetze
e5e7e1bcce
Template improvements.
...
Improved agenda and participants overview.
2013-06-03 22:38:45 +02:00
Emanuel Schütze
d615c63eb1
Merge pull request #705 from normanjaeckel/ChangeMotionDefaultNumbering
...
Motion: Change default numbering method
2013-06-03 13:35:34 -07:00
Norman Jäckel
dc5b1e0893
Motion: Change default numbering method
2013-06-03 19:18:59 +02:00
Norman Jäckel
5c18635418
Change order of agenda fields
2013-06-03 19:16:42 +02:00
Norman Jäckel
a575a7a8c6
Fix #696
2013-06-03 00:23:47 +02:00
Norman Jäckel
93b02fa62b
Update docstrings, small enhancements to Oskar's motion rework.
2013-06-02 23:28:17 +02:00
Oskar Hahn
cd19920223
Rework of the motion model, to make it more explcit.
2013-06-02 23:28:17 +02:00
Norman Jäckel
d4739f5dd7
Fixed #130 : New config var for removal of supports when a motion is edited by the submitter in early state.
2013-06-02 15:48:21 +02:00
Emanuel Schuetze
5643065b84
Added en po files and updated en and fr po files (makemessages only) for transifex.
2013-06-01 21:58:25 +02:00
Oskar Hahn
4faf91424b
Fixed #682 Error if a group was added to a list of speakers
2013-06-01 09:10:15 +02:00
Norman Jäckel
e5db00b637
Add tests for the list of speakers global links. Add end_speach link on the list of speakers widget.
2013-05-31 17:25:48 +02:00
Oskar Hahn
4aeb329d7c
Merge pull request #690 from normanjaeckel/DeleteFeatureRejectVersion
...
Fix #679
2013-05-31 06:44:59 -07:00
Norman Jäckel
31c04c280a
Fix #679
2013-05-31 14:54:53 +02:00
Norman Jäckel
7624dc67af
Fixed #687
2013-05-31 14:34:49 +02:00
Stefan Frauenknecht
1e188761d4
Validator for agenda_start_time aded. PEP8 issue 'missing whitespace after ','' resolved
2013-05-31 14:01:30 +02:00
Norman Jäckel
9e5088d49e
Fixed #683
2013-05-31 13:15:55 +02:00
Emanuel Schuetze
d5becd5c18
Fixed #431 : Template improvements (removed unused loaded tags and check of all html template files)
2013-05-30 23:25:49 +02:00
Emanuel Schuetze
17778ac80f
Fixed #574 : Changed DOCTYPE to HTML5 (for base.html and base-projector.html).
2013-05-30 22:23:48 +02:00
Emanuel Schuetze
a97cf4a680
Motion import improved:
...
- add semicolon support (use utils/csv_ext.py as participant import)
- show all warnings of each line in one warning message
- show success message with total counter (x of n motions imported).
- improved warning and error strings
2013-05-30 22:23:38 +02:00
Emanuel Schuetze
4ec33106ed
Fixed #680 (Open all PDFs in new tab).
2013-05-29 22:59:33 +02:00
Emanuel Schuetze
9fb2052b3d
Bugfixing, template improvements, translation updates.
...
- Fixed #649 : Clean old motion fragments in template and pdf (about motion notes).
- Fixed motion pdf issues: missing submitters, voting result and make motion state translateable- Added post_save function also for UserUpdateView.
2013-05-29 22:59:24 +02:00
Norman Jäckel
9d698854a9
Insert Next Speaker Button in speaker widget
2013-05-24 01:44:58 +02:00
Norman Jäckel
6566a2897c
Fixed #675 : CSS for list of speakers slide and overlay
2013-05-24 00:52:09 +02:00
Norman Jäckel
00910b218e
Fix appearance of agenda items with related sid, also some other small fixes and template fixes
2013-05-24 00:31:52 +02:00
Norman Jäckel
099ed76d0e
Insert info to list of speakers overlay widget checkbox
2013-05-23 23:31:57 +02:00
Norman Jäckel
c94f78c430
Fix message_list loop with a map
2013-05-23 23:19:53 +02:00
Norman Jäckel
894f16ec53
Several template and bug fixes, some minor view behavior changes
2013-05-23 00:32:32 +02:00
Emanuel Schuetze
c59f729a80
Set version to 1.4b2
2013-05-17 01:33:04 +02:00
Emanuel Schuetze
d5221d2ab5
Release 1.4b1.
2013-05-17 01:31:45 +02:00
Emanuel Schuetze
eedc79ca8f
Added non_field.errors in form.html.
2013-05-16 23:59:22 +02:00
Norman Jäckel
bf58f2a6cc
Ensure that the user has either a first name or a last name
2013-05-16 23:59:22 +02:00
Norman Jäckel
a65a4662ae
Fixed Pep 8 Error
2013-05-16 23:44:07 +02:00
Emanuel Schuetze
fa8b9d3888
Fixed translation issue for motion state.
2013-05-16 22:53:38 +02:00
Emanuel Schütze
6dbd606232
Merge pull request #660 from normanjaeckel/TranslatedStateChanged
...
Translate changed state in motion log (Fixed #656 )
2013-05-16 13:37:09 -07:00
Norman Jäckel
148ac53d11
Translate changed state in motion log ( Fixed #656 )
...
The database has to be reset.
2013-05-16 21:51:11 +02:00
Emanuel Schuetze
b5a5acbf2c
Some last (template) improvements for next release
...
- Added dataTable function for group overview table.
- Added default form help text for groups and an explanation for group overview table.
- Updated translation.
- Translate group name in form.
- Username: FirstName instead of First_Name
- Hide group 'registered' from UserForm
- Linked persons/candidates/submitter etc. to UserView
- Fixed permissions in template
Translation
2013-05-16 21:03:42 +02:00
Oskar Hahn
e76aa499f3
Merge pull request #659 from normanjaeckel/LogMotionImport
...
Log Entry for imported motions Fixed #655
2013-05-16 04:36:39 -07:00
Oskar Hahn
9a881eceeb
Merge pull request #651 from normanjaeckel/Workflow_Adjustablility_2
...
Workflow adjustablility (new feature)
2013-05-16 04:35:58 -07:00
Oskar Hahn
1dab39012c
Merge pull request #661 from normanjaeckel/PermitRejectVersionLog
...
Log permitting and rejecting motion versions (Fixed #657 )
2013-05-16 04:31:41 -07:00
Norman Jäckel
c163d6984d
Insert motion preamble in text field of the form of new motions ( Fixed #643 )
2013-05-16 01:38:51 +02:00
Norman Jäckel
5adf55bc8c
Log permitting and rejecting motion versions ( Fixed #657 )
2013-05-16 01:28:39 +02:00
Norman Jäckel
27da18f489
Fixed #655 Log Entry for imported motions
2013-05-16 00:58:37 +02:00
Norman Jäckel
bca8d3af15
Update view contains possibility for managers to change the workflow. Also other small fixes.
2013-05-16 00:25:44 +02:00
Emanuel Schuetze
c1996b81fc
Updated translation.
2013-05-15 09:43:59 +02:00
Emanuel Schuetze
4849955a16
Some more template improvements
...
- Better config icon.
- Renamed media to files (only for GUI).
- Add datatable function for motion and asssignemnt overview table. Removed old filter/sorting code.
- Some more template styling work.
2013-05-15 09:43:11 +02:00
Oskar Hahn
cefd509ae4
Merge pull request #650 from emanuelschuetze/template-improvements
...
Template improvements
2013-05-14 14:31:53 -07:00
Emanuel Schuetze
d1b6c38880
Fixed #627 (Open Link in new Tab) by setting back bootstrap.min.js to 2.3.0 release.
...
(bootstrap*.css are still from 2.3.1)
2013-05-14 23:21:46 +02:00
Emanuel Schuetze
b082f8a8fc
A lot of template improvements
...
- Translate group name in participant overview table.
- Move 'status_link' function from participants.js to utils.js for using in VoteCollector plugin.
- Added hook 'post_js' for VoteCollector plugin.
- Fixed poll id in poll_form.
- Improved 'show log' button
- Used welcome_title for default custom slide
- Used bootstraps' fluid grid nesting for responsive layout of widgets.
- Added microphone icon for 'add-me-to-list-of-speakers' button.
- Format motion identifier and title in (motion and account) widgets.
- Format list of speakers (slide, overlay, view, overview)
- Format list of speakers widget and view. Added view to link to current list of speakers (without add to list).
- Fixed motion slide. Made up/down animation faster and the scroll way shorter.
- Fixed icon name.
- Set default context of 'extra_javascript' to use kwargs['context']['extra_javascript'].append('...') without error.
- Fixed translation of motion state.
Moved css code.
2013-05-14 23:20:54 +02:00
Norman Jäckel
f07485627f
Motion identifier setting and versioning.
...
Now the view decides, whether to setup a new version or not. Automatic identifier setting is the default. Also some fixes of the motion save method.
2013-05-13 23:13:14 +02:00
Oskar Hahn
b8b5acd5f2
Merge pull request #639 from normanjaeckel/Url_name_args
...
Fixed 'Can't create agenda item of a motion'
2013-05-13 11:51:15 -07:00
Norman Jäckel
0f17f74fee
Fix and update motion csv import.
2013-05-13 18:30:20 +02:00
Oskar Hahn
485518975a
motion csv import
2013-05-13 18:25:59 +02:00
Norman Jäckel
864d20274e
Fixed #636 . Insert general url_name_args attribute to some generic views in utils.views.
2013-05-13 18:15:53 +02:00
Oskar Hahn
865860a96f
Merge pull request #640 from normanjaeckel/Fixes
...
Some Fixes
2013-05-13 05:06:29 -07:00
Oskar Hahn
e9a361cfea
Merge pull request #637 from normanjaeckel/ShowCategory
...
Show category in motion table. Fix template when a motion has no category.
2013-05-12 13:58:47 -07:00
Norman Jäckel
a469831f1f
Fixed link 'Put me on the list of speakers' when the list is already closed.
2013-05-12 02:06:55 +02:00
Norman Jäckel
af493d28e8
Items now appear also in the personal info widget (where someone is on the list of speakers).
2013-05-12 01:46:40 +02:00
Norman Jäckel
af6659a67e
Hide list of speakers overlay on list of speakers slide
2013-05-12 01:16:41 +02:00
Norman Jäckel
3ba5fd2dc6
Fixed bad typo in import users function
2013-05-12 00:56:40 +02:00
Norman Jäckel
411f8d0892
Fixed hiding of orga items on summary slides
2013-05-11 16:26:43 +02:00
Norman Jäckel
76d7409830
Change version view. New way to get name and version from plugins.
2013-05-11 14:27:46 +02:00
Norman Jäckel
98c7611622
Fixed wrong permission on agenda detail view
2013-05-11 13:53:43 +02:00
Norman Jäckel
96f5122c00
Show category in motion table. Fix template when a motion has no category.
2013-05-11 00:20:42 +02:00
Norman Jäckel
719b6ff790
Rework on list of speakers. Insert a method to get a formated list for various use in the templates.
2013-04-29 20:17:50 +02:00
Oskar Hahn
52e16d2e34
Show a defined value of last speakers
...
Some work on the design of the speaker-list on the projector
2013-04-29 20:05:42 +02:00
Norman Jäckel
0b85164b84
Add second time field for list of speakers. Now you can click begin and end speach.
2013-04-29 20:05:42 +02:00
Oskar Hahn
b0e5854833
Fixed #629
2013-04-28 10:21:31 +02:00
Oskar Hahn
04edef9d8a
Fixed #604
2013-04-28 10:02:19 +02:00
Oskar Hahn
100238bc66
Fixed #580
2013-04-28 09:37:15 +02:00
Oskar Hahn
04b3a196ad
Merge pull request #620 from CatoTH/ckeditor-4.1.1
...
Upgrade CKEditor from 4.1rc to 4.1.1
2013-04-25 06:17:07 -07:00
Oskar Hahn
017561572d
Merge pull request #621 from CatoTH/Issue615
...
sortable and disableSelection are not always defined; lead to issue #615
2013-04-25 06:16:32 -07:00
Norman Jäckel
b6f2176cc8
Move Version page out of config menu. Insert Link into the footer.
2013-04-25 12:37:44 +02:00
Tobias Hößl
5865a73a3e
sortable and disableSelection are not always defined; lead to issue #615
2013-04-24 19:51:33 +02:00
Tobias Hößl
4aa033989a
Upgrade CKEditor from 4.1rc to 4.1.1
2013-04-24 19:04:02 +02:00
Emanuel Schuetze
8ca8b6911d
Set version to 1.4b1-dev
2013-04-24 15:50:49 +02:00
Emanuel Schuetze
b43a6ae1f6
Release 1.4-alpha1
2013-04-24 15:31:55 +02:00
Emanuel Schuetze
e268d43580
Fixed motion poll pdf (use correct delegates group, use template without header/footer)
2013-04-24 15:14:29 +02:00
Emanuel Schuetze
5071daa148
Updated translations.
2013-04-24 14:36:04 +02:00
Emanuel Schuetze
210df06c76
Minor template fixes.
2013-04-24 11:58:09 +02:00
Emanuel Schuetze
81b82c559d
Updated jQuery UI to v1.10.2.
...
Changed link in agenda view to static file.
2013-04-24 11:34:24 +02:00
Emanuel Schuetze
abad75c129
A lot of template improvements and translation fixes
...
- Fixed agenda widget for special slide views (e.g. list of speakers, summary).
- Fixed back to motion(s) link
- Set icon for list of speakers widget.
- Fixed overlay widget layout of form elements.
- Added submenu with other config_pages to version.html.
- Updated completly DE translations, fixed EN strings.
- Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only.
Updated translation.
- Improved projector template (clock image, fixed facicon, added subtitle for list of speakers)
- Changed permission strings ('oneself'). Added check if group(pk=3) exists.
- Added event name and description to base template. Some minor template layout fixes.
- Use static subtile (no context var). Show last 2 old_speakers for projector.
- Cut old_speakers.
- Projektor template style changes (e.g. overlay list of speakers).
2013-04-24 10:38:03 +02:00
Oskar Hahn
f581169e1e
Fixed saving anonymous user in a PersonField
2013-04-24 09:28:58 +02:00
Tobias Hößl
acba281581
Sorting agenda items with nestedSortable.
2013-04-23 17:24:27 +02:00
Norman Jäckel
7fbe609d04
Rename the state flag dont_set_new_version_active to leave_old_version_active.
2013-04-22 22:31:58 +02:00
Oskar Hahn
ba75a34017
Fixed list of speakers overlay cache problem
2013-04-22 22:09:09 +02:00
Oskar Hahn
02d1025346
Motion poll PDF
2013-04-22 21:47:40 +02:00
Oskar Hahn
4f9041df65
Merge pull request #603 from ostcar/participant_name
...
Fixed username
2013-04-22 12:38:09 -07:00
Oskar Hahn
6b558907c0
Fixed username
2013-04-22 13:49:13 +02:00
Oskar Hahn
0549d22ec8
Fixed manage.py runserver.
...
The reload function did not work
2013-04-21 18:42:58 +02:00
Oskar Hahn
2d7bf8ca9a
fixed #558
2013-04-19 19:56:59 +02:00
Oskar Hahn
10b51f6897
Fixed #595
2013-04-19 19:39:33 +02:00
Oskar Hahn
db1503ad7b
Format fix
2013-04-19 19:15:57 +02:00
Roland Geider
56844d93f2
Move CKeditor configuration to a separate JS file
...
Remove unneeded try-except block
2013-04-18 13:26:01 +02:00
Emanuel Schuetze
1d1f5fa218
Added html support for motion text.
...
Use html parser 'beautifulsoup' to replace html tags which not supported by reportlab pdf.
'pip install bs4' required.
Fixed nested ol lists and unicode warning.
New requirement: beautifulsoup4
HTML support for reportlab.
Move parse html code into new function. Added missing html support in pdf for motion reason.
Added version number for bleach and beautifulsoup4. Moved to core requirements block.
Added bs4, bleach and html5lib requirements to portable build script. Updated portable readme for 1.4.
2013-04-18 13:23:40 +02:00
Roland Geider
01885c9304
Add first version of server-side filtering of HTML with bleach
...
Fix formatting (pep8 and otherwise)
Make the CleanHtml a mixin so it can be used easier, add a test case
Mark HTML fields as 'safe' in the template
Update list of allowed HTML tags, take special care for reportlab
Add heading tags to white list
Rename get_clean_html to get_clean_html_fields
2013-04-18 13:20:27 +02:00
Tobias Hößl
ce333d4c40
Initial attempt to integrate CKEditor into OpenSlides
2013-04-18 13:20:27 +02:00
Emanuel Schuetze
e81ed882ca
Fixed #553 : Switch projector control scroll arrows
2013-04-15 22:04:59 +02:00
Oskar Hahn
33f74c3025
List of speakers. Part 2
2013-04-15 19:28:44 +02:00
Emanuel Schuetze
1a416e5726
Updated template and some minor fixed for list of speakers. Updated projector slide.
2013-04-15 19:23:37 +02:00
Oskar Hahn
fa95119936
New Feature: List of speakers.
2013-04-15 19:23:37 +02:00
Oskar Hahn
f52df88cd6
fixed error on new overlay api
2013-04-15 15:47:18 +02:00
Oskar Hahn
bbf4b33086
New Overlay API
2013-04-15 13:24:08 +02:00
Norman Jäckel
0155690630
Protection for participant managers, Issue #122
...
Raises a validation error, if a non-superuser user edits himself and
removes the last group containing the permission to manage participants
2013-04-14 23:52:20 +02:00
Norman Jäckel
82b1796875
Fixed issue #585 . Sort group members by first name or last name in group detail view according to config variable
2013-04-13 18:13:11 +02:00
Oskar Hahn
632c9476ed
Merge pull request #584 from emanuelschuetze/participants-1
...
Participants fields: add 'title', remove 'type', use 'groups'
2013-04-09 13:25:18 -07:00
Emanuel Schuetze
2c5bae7b01
#560 fixed: FormField to choose permissions is too small
2013-04-09 20:12:57 +02:00
Emanuel Schuetze
9f6da9f33b
Reorder GroupDetailView code in view.py.
2013-04-09 19:53:18 +02:00
Emanuel Schuetze
2a97a61a14
Remove participants field 'type'. Use 'group' field instead. Updated csv import, overview table and user detail view
2013-04-09 11:21:55 +02:00
Emanuel Schuetze
051f9af1f7
#436 : New participant field 'title'
2013-04-09 08:51:31 +02:00
Norman Jäckel
82c804e2d6
Inserted a new config variable 'Stop submitting of new motions'
...
Normal delegates can not submit a new motion when this is set to true. Inserted also a new template filter to relate to config variables in if-clauses.
2013-04-05 11:49:57 +02:00
Roland Geider
e40a2e9332
Restart tornado on file changes, respect port and adress flags
2013-04-03 23:20:56 +02:00
Oskar Hahn
e7def39323
Merge pull request #582 from normanjaeckel/AgendaConfigJSFix
...
Moved javascript code for agenda config into extra file.
2013-04-03 10:21:08 -07:00
Norman Jäckel
5d472b274a
Update tests to extend test cover by coverage
2013-04-03 17:55:30 +02:00
Norman Jäckel
623cf60adf
Moved javascript code for agenda config into extra file. Moved translation to correct area for javascript files.
2013-04-03 14:51:19 +02:00
Norman Jäckel
b310d6077e
Move personal info widget to a new app: account.
2013-04-03 00:17:23 +02:00
Norman Jäckel
e3eabada8b
Update default groups and permissions.
2013-04-02 15:50:40 +02:00
Norman Jäckel
e1b149cde3
New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly.
...
Changes after some reviews are done.
Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
2013-03-28 15:31:13 +01:00
Emanuel Schuetze
71ac7a1cdb
New feature: qr-code for system url on participants password pdf.
...
(Note: New dependency! Run 'pip install qrcode')
Fixed pep8 issues. Create qr-code image for system url one time only.
New feature: qr-code for system url on participants password pdf.
(Note: New dependency! Run 'pip install qrcode')
Fixed pep8 issues. Create qr-code image for system url one time only.
Print qrcode image from StringIO stream.
Adapted table stylesheet for better integration of reportlab's Image object.
Fixed pep8 issue.
Made qrcode import as optional feature. Fixed pep8 issue.
2013-03-22 14:35:40 +01:00
Oskar Hahn
f5e6f736dc
Merge pull request #572 from normanjaeckel/Fileupload_3
...
Mediafile (new)
2013-03-20 03:23:50 -07:00
Norman Jäckel
156acc451f
Insert whitespace. Fix docstrings.
2013-03-20 11:17:24 +01:00
Norman Jäckel
d81c3bb1f8
Change order of classes for User and Group
2013-03-18 22:43:46 +01:00
Norman Jäckel
d82bb6ee33
Small modifications. Enhencement of tests.
2013-03-18 22:41:42 +01:00
Norman Jäckel
ad0e157bd1
Insert new app to upload files via the frontend. Let tornado server media files. Insert icon-mediafile css class. Insert extra_stylfiles context variable.
2013-03-18 21:44:02 +01:00
Norman Jäckel
571649d5a6
Fix typo in assignment.
2013-03-18 21:31:24 +01:00
Emanuel Schuetze
4e6818fb1a
Compressed jquery-ui files (for agenda config).
2013-03-18 20:22:54 +01:00
Emanuel Schuetze
b3fca8f6f2
Updated bootstrap from 2.2.2 to 2.3.1
2013-03-18 20:19:17 +01:00
Oskar Hahn
3832aa4178
Tests for the motion views
2013-03-15 12:18:27 +01:00
Oskar Hahn
c46ec570bf
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-15 02:16:26 +01:00
Oskar Hahn
81eb92a761
fixed pep8
2013-03-15 02:14:15 +01:00
Oskar Hahn
1a2ebf7b3b
removed some unused functions
2013-03-15 01:34:17 +01:00
Emanuel Schuetze
d180b4f331
Reverted support/unsupport changes (question)
2013-03-14 23:45:17 +01:00
Emanuel Schuetze
20118ae833
Improved version.get command
2013-03-14 23:35:57 +01:00
Emanuel Schuetze
2a2c704bf2
GetVersionMixin not required. Fixed htmldiff function.
2013-03-14 23:26:41 +01:00
Emanuel Schuetze
3f4df58807
Moved htmldiff function to utils.py. Fixed travis build error (pep8).
2013-03-14 23:22:11 +01:00
Emanuel Schuetze
49765bbe6e
Merge remote branch 'upstream/master' into motiontemplate
2013-03-14 23:05:38 +01:00
Emanuel Schuetze
b2dc3820bd
Changed motion.number to motion.identifier.
2013-03-14 23:04:32 +01:00
Emanuel Schuetze
88a32dc546
Updated motion version warnings (not latest/authorized version)
2013-03-14 22:56:25 +01:00
Emanuel Schuetze
73430e45d8
Changed style for empty category table.
2013-03-14 22:54:33 +01:00
Emanuel Schuetze
fa098f6bd3
Typo.
2013-03-14 22:54:00 +01:00
Oskar Hahn
43cd5aba00
Merge branch 'master' of github.com:OpenSlides/OpenSlides
2013-03-14 22:44:11 +01:00
Oskar Hahn
63932a348e
Merge pull request #561 from emanuelschuetze/datatables-participants
...
Datatables for participants table (reworked)
2013-03-14 14:40:01 -07:00
Emanuel Schuetze
0587c2019a
Integrated DataTables function for participants table (for client side sorting/filtering/pagination). Removed old server side sorting/filtering code.
...
Fixed csv import (added success url).
Added large csv file for testing import of >1000 participants.
Removed lage csv example file for paticipants (will be sustitute by a test script in future).
2013-03-14 22:34:40 +01:00
Oskar Hahn
545d4be04f
fixed update of person_api
2013-03-14 22:32:00 +01:00
Emanuel Schuetze
247f6c9431
Merge remote branch 'upstream/master' into motiontemplate
...
Conflicts:
openslides/motion/models.py
openslides/motion/views.py
2013-03-14 21:36:02 +01:00
Emanuel Schuetze
a1a11ff53c
New motion version diff view. Improved version history table in motion detail template.
2013-03-14 21:28:03 +01:00
Oskar Hahn
2944b6ded3
fixed travis
2013-03-13 00:29:53 +01:00
Oskar Hahn
71b9bd0a08
dont set identifier prefix, if it is empty
2013-03-12 23:54:37 +01:00
Oskar Hahn
b2c888b151
set identifier
2013-03-12 23:35:08 +01:00
Oskar Hahn
304887e8f3
Changed comlex workflow automaticly set the identifier
2013-03-12 22:13:17 +01:00
Oskar Hahn
d21185a449
Merge branch 'master' of github.com:OpenSlides/OpenSlides into category
2013-03-12 22:05:20 +01:00
Oskar Hahn
9cd69f59e0
Motion Identifier
2013-03-12 22:03:56 +01:00
Norman Jäckel
03fff46517
Add new TestCase class in utils to call the signal on running every test.
2013-03-12 21:38:22 +01:00
Norman Jäckel
9679be1867
Move builtin groups to a signal.
2013-03-12 20:58:22 +01:00
Emanuel Schuetze
196ad217b0
Fixed version history.
2013-03-11 23:58:45 +01:00
Emanuel Schuetze
d41ce146e2
Added category_delete function to template.
2013-03-11 21:50:16 +01:00
Emanuel Schütze
db97d3c312
Merge pull request #2 from ostcar/category
...
Category Delete View
2013-03-11 13:45:54 -07:00
Oskar Hahn
31ba70efd1
Category Delete View
2013-03-11 21:38:07 +01:00
Norman Jäckel
514577f7c6
Built-in Workflows are created by listening to a signal which is sent after syncdb.
2013-03-11 21:32:09 +01:00
Emanuel Schuetze
d9fbaf9aa7
Updated motion category template.
2013-03-11 21:29:56 +01:00
Emanuel Schütze
ff848a865a
Merge pull request #1 from ostcar/category
...
Category
2013-03-11 12:46:42 -07:00
Oskar Hahn
f411040c3a
Append missing files
2013-03-11 20:43:23 +01:00
Oskar Hahn
bc7be27131
Add CategoryFormField to the MotionForm
2013-03-11 20:41:02 +01:00
Oskar Hahn
2614a1cb2f
Categories for Motions
2013-03-11 20:17:19 +01:00
Emanuel Schuetze
1b93cec209
Merge remote branch 'upstream/master'
...
Conflicts:
openslides/motion/models.py
2013-03-11 19:16:16 +01:00
Emanuel Schuetze
42c847dfba
Update motion templates to new template design. Added some missing model and view functions.
2013-03-11 18:26:22 +01:00
Emanuel Schuetze
5c70b4a044
Update after comments: Removed user context var. Removed condition in unupport state check.
2013-03-11 16:56:56 +01:00
Emanuel Schuetze
ee0e599a6c
Update motion templates to new template design. Added some missing model and view functions.
2013-03-09 14:29:40 +01:00
Emanuel Schuetze
71b1bede6f
Set new button als primary/blue button.
2013-03-09 14:17:30 +01:00
Emanuel Schuetze
c3c200b423
Changed link to new csv import wiki page on github.
2013-03-09 14:16:28 +01:00
Emanuel Schuetze
48e1282cb9
Show duration clock only if start/end time is set.
2013-03-09 14:15:03 +01:00
Emanuel Schuetze
56a510e89c
Removed link to professional support in base template (footer).
2013-03-08 08:31:52 +01:00
Oskar Hahn
51a9e41015
Set new django setting. Put tornado code in a seperate file.
2013-02-27 18:54:06 +01:00
Oskar Hahn
757b97e4cb
Merge pull request #542 from frauenknecht/master
...
Issue #539 Default config value in agenda app
2013-02-22 03:54:30 -08:00
Stefan Frauenknecht
45856fc9b0
add signal callback to provide defaults
2013-02-20 23:50:34 +01:00
Stefan Frauenknecht
f81abe215f
Revert last changes
2013-02-20 23:48:04 +01:00
Stefan Frauenknecht
343aa018e4
Fixed Issue #539 - Default config value in agenda app
2013-02-20 22:09:40 +01:00
Norman Jäckel
03d57d17b0
Fix state attributes in motion pdf.
2013-02-19 23:43:20 +01:00
Norman Jäckel
6b71142747
Recover commit 6a639fe498
2013-02-18 22:08:21 +01:00
Oskar Hahn
853dcf8334
fixed pep8
2013-02-18 20:06:46 +01:00
Oskar Hahn
f388f3d41a
handle static files with tornado
2013-02-18 19:58:18 +01:00
Oskar Hahn
2822c39f8a
Merge branch 'master' into tornado
2013-02-18 19:08:58 +01:00
Oskar Hahn
ce1e1c112f
fixed pep8
2013-02-18 18:59:24 +01:00
Oskar Hahn
4f3f917812
some small code design changes
2013-02-18 18:56:37 +01:00
Oskar Hahn
cb5b735565
Merge branch 'master' into HEAD
2013-02-18 18:34:52 +01:00
Oskar Hahn
051723e686
Merge branch 'master' of github.com:OpenSlides/OpenSlides
...
Conflicts:
openslides/motion/models.py
openslides/motion/workflow.py
2013-02-18 18:31:35 +01:00
Norman Jäckel
2603d93d69
Fix PEP8 and tests.
2013-02-17 17:07:44 +01:00
Stefan Frauenknecht
1d1d72d45a
Fixed if condition with duration property which can be None
2013-02-16 11:55:40 +01:00
Stefan Frauenknecht
8103c09b81
PEP8 errors resolved
2013-02-16 10:41:22 +01:00
Emanuel Schuetze
0b3b91b8d5
Show item-tooltip in bootstrap tooltip style.
2013-02-15 08:51:08 +01:00
Emanuel Schuetze
4f60160667
Added missing success_url_name.
2013-02-15 08:50:42 +01:00
Emanuel Schuetze
e9c996340a
Used custom build jquery-ui javascript components file. Integrated required jquery-ui styles (no remote link). Added used jquery components/addons to THANKS file.
2013-02-15 08:39:36 +01:00
Norman Jäckel
8363b06fc1
Move motion exceptions to its own file in the motion app.
2013-02-14 19:27:36 +01:00
Norman Jäckel
2e37e4c18b
Comment the dev-file workflow.py
2013-02-14 11:16:46 +01:00
Norman Jäckel
f2dde228c9
Work on motion workflow system.
...
Also: Insert new base exception for OpenSlides.
Also: Insert a workflow field to the state class. Update tests. Rename versioning attribute.
2013-02-13 23:04:24 +01:00
Emanuel Schuetze
e3428d3e83
Some style work.
2013-02-11 23:01:48 +01:00
Emanuel Schuetze
e101fb8212
Merge branch 'master' into agenda-orga-items
...
Conflicts:
openslides/agenda/static/styles/agenda.css
openslides/agenda/templates/agenda/config.html
openslides/agenda/templates/agenda/item_row.html
openslides/agenda/templates/agenda/overview.html
openslides/locale/de/LC_MESSAGES/django.mo
openslides/locale/de/LC_MESSAGES/django.po
openslides/static/styles/base.css
requirements.txt
2013-02-11 22:36:19 +01:00
Emanuel Schuetze
a51a296434
Changed agenda start/end time to djangos DATETIME_FORMAT.
2013-02-09 22:59:15 +01:00
Oskar Hahn
6a639fe498
Add todos
2013-02-06 11:11:49 +01:00
Oskar Hahn
5573077b88
fixed pep8
2013-02-06 09:34:44 +01:00
Oskar Hahn
27c73092e1
Merge remote-tracking branch 'emanuel/newtemplate' into new_motion
...
Conflicts:
openslides/motion/templates/motion/overview.html
openslides/motion/templates/motion/poll_view.html
openslides/motion/templates/motion/view.html
2013-02-06 09:25:27 +01:00
Emanuel Schuetze
ce51f0ef7e
template: minor style changes
2013-02-05 23:42:30 +01:00
Emanuel Schuetze
6b4ee0e4f6
Updated translation.
2013-02-05 23:09:23 +01:00
Emanuel Schuetze
c8ddb21760
Fixed wrong hiding of open agenda child items if parent item is closed
2013-02-05 22:36:05 +01:00
Emanuel Schuetze
e49efb40d8
template: Added new css class for minimum column width.
2013-02-05 22:03:43 +01:00
Emanuel Schuetze
bfd01e67b6
template: Removed unused 'cycle' template tag.
2013-02-05 21:55:41 +01:00
Emanuel Schuetze
d809ff95bb
template: Removed unused participant.css
2013-02-05 21:51:09 +01:00
Emanuel Schuetze
64e3c1f3cb
template: Removed unused 'load staticfiles'.
2013-02-05 21:41:26 +01:00
Emanuel Schuetze
8388774f12
template: Minor style changes.
2013-02-05 21:33:07 +01:00
Emanuel Schuetze
82e35bebff
Fixed wrong deletion if user clicks "no" in confirm form.
2013-02-05 21:31:45 +01:00
Emanuel Schuetze
0c5459f96e
template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes.
2013-02-05 20:40:55 +01:00