Commit Graph

3451 Commits

Author SHA1 Message Date
Oskar Hahn
0b29d13dc6 Merge pull request #1412 from ostcar/management
Rework of management command
2015-01-23 15:48:14 +01:00
Oskar Hahn
35024764cf Rework of management command 2015-01-23 15:40:12 +01:00
Oskar Hahn
285d8c2cfb Use a real anonymous user object, instadt of a authentification backend 2015-01-23 15:38:14 +01:00
Oskar Hahn
8b88d38ac5 Merge branch 'stable/1.7.x'
Conflicts:
	openslides/__init__.py
	openslides/assignment/views.py
	openslides/motion/pdf.py
	openslides/users/pdf.py
2015-01-23 02:33:17 +01:00
Norman Jäckel
ea0b8e584f Merge pull request #1420 from normanjaeckel/Release_1.7b1
Release 1.7b1
2015-01-21 21:14:21 +01:00
Norman Jäckel
33c4562e62 Updated version to 1.7 2015-01-21 20:58:03 +01:00
Norman Jäckel
136f57057f Release 1.7b1 2015-01-21 20:58:03 +01:00
Norman Jäckel
8080096050 Updated CHANGELOG. 2015-01-21 20:58:03 +01:00
Norman Jäckel
fb0600809c Merge pull request #1421 from normanjaeckel/FixChatbox
Fixed bug in chatbox.
2015-01-21 20:57:05 +01:00
Norman Jäckel
afc2b246db Fixed bug in chatbox. 2015-01-21 17:24:39 +01:00
Norman Jäckel
814a75839a Merge pull request #1418 from emanuelschuetze/translations-1.7
Updated translations (DE, FR, CS, PT) for 1.7.
2015-01-21 16:27:10 +01:00
Emanuel Schuetze
6cbec7a32a Updated translations (DE, FR, CS, PT) for 1.7. 2015-01-21 15:59:27 +01:00
Oskar Hahn
9fc07125f1 Merge pull request #1417 from emanuelschuetze/fix-1415
Show special characters in PDF, like "&". (Fixed #1415)
2015-01-21 14:35:09 +01:00
Emanuel Schuetze
4296fb0360 Show special characters in PDF, like "&". (Fixed #1415)
Added escape function for agenda, motion, assignment and participants
pdf views.
2015-01-21 13:03:03 +01:00
Emanuel Schütze
2f03359fbf Merge pull request #1413 from emanuelschuetze/bootstrap3
Update to bootstrap 3.3.1.
2015-01-21 12:32:04 +01:00
Emanuel Schuetze
18fe7e2d89 Update to bootstrap 3.3.1. 2015-01-21 12:23:32 +01:00
Oskar Hahn
c890fd138a Merge pull request #1414 from normanjaeckel/UpdateMetadata
Update metadata files and copyright notes.
2015-01-20 19:54:27 +01:00
Norman Jäckel
0351d8982f Update metadata files and copyright notes. 2015-01-20 14:42:41 +01:00
Norman Jäckel
c5a7cc889e Merge pull request #1411 from boehlke/master
Fix #1352 and fix order in motion form.
2015-01-18 09:07:24 +01:00
André Böhlke
591d230cbb Fix field order in motion forms.
Add documentation for new attribute.
Added .idea to .gitignore.
2015-01-18 01:01:38 +01:00
Oskar Hahn
98cb6503a5 Merge pull request #1409 from normanjaeckel/DjangoRESTFramework-MoreWork
Added api for assignments.
2015-01-18 00:22:12 +01:00
Norman Jäckel
4821a3b59b Added api for assignments.
Also small changes in agenda REST api.
2015-01-17 22:46:23 +01:00
André Böhlke
e2e16a4c34 explicitly define fields attribute to fix deprecation warnings 2015-01-17 22:28:32 +01:00
Norman Jäckel
413abf2b9a Merge pull request #1408 from normanjaeckel/DjangoRESTFramework-Work
Refactored REST api in agenda, core and users app.
2015-01-17 16:27:22 +01:00
Norman Jäckel
0d56424c90 Refactored REST api in agenda, core and users app. 2015-01-17 15:58:51 +01:00
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
Norman Jäckel
e19c2a26eb Merge pull request #1406 from rolandgeider/typo
Fix typos.
2015-01-17 14:26:35 +01:00
Roland Geider
06b5ad5f2e Fix typos 2015-01-17 12:12:08 +01:00
Norman Jäckel
86261bda28 Merge branch 'stable/1.6.x' into 'master'.
Conflicts:
	CHANGELOG
2015-01-17 10:27:27 +01:00
Oskar Hahn
b6a82c961a Merge pull request #1404 from normanjaeckel/Changelog
Updated Changelog.
2015-01-17 10:24:44 +01:00
Norman Jäckel
46f6a3f14e Updated Changelog. 2015-01-17 10:21:22 +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
Oskar Hahn
0b995b21ac Merge pull request #1401 from normanjaeckel/DjangoRESTFramework
Added DjangoRESTFramework
2015-01-17 09:25:18 +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
Oskar Hahn
579e4b325e Merge pull request #1389 from normanjaeckel/BowerAndGulp
Used Bower and gulp to manage third party JS and CSS libraries
2015-01-17 00:20:43 +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
4257ecefb3 Merge pull request #1400 from ostcar/fix_localized_thing
Fix LocalizedModelMultipleChoiceField
2015-01-16 21:05:41 +01:00
Oskar Hahn
83a0844a0e Merge pull request #1399 from emanuelschuetze/translationstrings-1.7
Fixed missing translation strings.
2015-01-16 20:49:40 +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