591d230cbb
Fix field order in motion forms.
...
Add documentation for new attribute.
Added .idea to .gitignore.
2015-01-18 01:01:38 +01:00
e2e16a4c34
explicitly define fields attribute to fix deprecation warnings
2015-01-17 22:28:32 +01:00
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
0d56424c90
Refactored REST api in agenda, core and users app.
2015-01-17 15:58:51 +01:00
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
1a1d072454
remove update_projector and add inform_changed_data
2015-01-17 15:16:49 +01:00
e19c2a26eb
Merge pull request #1406 from rolandgeider/typo
...
Fix typos.
2015-01-17 14:26:35 +01:00
06b5ad5f2e
Fix typos
2015-01-17 12:12:08 +01:00
86261bda28
Merge branch 'stable/1.6.x' into 'master'.
...
Conflicts:
CHANGELOG
2015-01-17 10:27:27 +01:00
b6a82c961a
Merge pull request #1404 from normanjaeckel/Changelog
...
Updated Changelog.
2015-01-17 10:24:44 +01:00
46f6a3f14e
Updated Changelog.
2015-01-17 10:21:22 +01:00
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
0b995b21ac
Merge pull request #1401 from normanjaeckel/DjangoRESTFramework
...
Added DjangoRESTFramework
2015-01-17 09:25:18 +01:00
b0422c4680
Added api viewset for agenda items.
...
Fixed style checker problem.
2015-01-17 09:18:40 +01:00
8cb70017da
Added api viewset for users.
2015-01-17 08:51:57 +01:00
7644cb9a09
Added api viewset for custom slides.
2015-01-17 08:51:54 +01:00
7ed5d2fc43
Setup Django REST Framework.
2015-01-17 08:49:52 +01:00
82f46708f6
Merge pull request #1397 from emanuelschuetze/haystack-fix
...
Fixed haystack indexing problem for m2m objects.
2015-01-17 00:21:45 +01:00
9b89e10cc7
Merge pull request #1398 from emanuelschuetze/portable-install-script
...
Improved portable install script.
2015-01-17 00:20:49 +01:00
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
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
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
3127048be5
Fixed haystack indexing problem for m2m objects.
...
Updated django-haystack to <2.4.
2015-01-16 23:07:56 +01:00
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
f0af21103c
Updated pdf.js to 1.0.907
2015-01-16 22:16:31 +01:00
4257ecefb3
Merge pull request #1400 from ostcar/fix_localized_thing
...
Fix LocalizedModelMultipleChoiceField
2015-01-16 21:05:41 +01:00
83a0844a0e
Merge pull request #1399 from emanuelschuetze/translationstrings-1.7
...
Fixed missing translation strings.
2015-01-16 20:49:40 +01:00
4f27b9b63d
Fix LocalizedModelMultipleChoiceField
...
It has to be a generator, so it does not call the queryset
2015-01-16 20:47:43 +01:00
a9468cb0a4
Fixed missing translation strings.
2015-01-16 14:25:34 +01:00
dac781d8aa
Merge pull request #1395 from normanjaeckel/Fix1394
...
Fixed bug. Projector was not updated when an object was deleted.
2015-01-15 21:14:22 +01:00
ec7fa0eea3
Install all portable packages from requirements_production.txt.
2015-01-14 22:14:34 +01:00
3ba86a6441
Updated English language files.
2015-01-11 19:04:21 +01:00
3ec55daaf9
Fixed bug. Projector was not updated when an object was deleted. Fixex #1394 .
2015-01-11 18:43:05 +01:00
adefb49457
Merge pull request #1393 from emanuelschuetze/bsmselect-updated
...
Reduce the usage of bsmselect jquery plugin.
2015-01-09 22:17:00 +01:00
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
1389ad1d03
Merge pull request #1392 from normanjaeckel/Fix1391
...
Fixed bug in ResetPasswordView. Fixed #1391 .
2015-01-06 17:01:26 +01:00
06919fa543
Fixed bug in ResetPasswordView. Fixed #1391 .
2015-01-06 16:27:50 +01:00
34b6ca80f3
Merge branch 'stable/1.6.x'
...
Conflicts:
CHANGELOG
openslides/users/signals.py
2015-01-06 13:04:07 +01:00
088216b320
Merge pull request #1388 from emanuelschuetze/motion-tags-updated
...
Template improvements for tags of agenda items, motions and assignments
2015-01-05 17:30:09 +01:00
3cfb9b739b
Template improvements for tags of agenda items, motions and
...
assignments.
2015-01-05 13:57:37 +01:00
d0d674601d
Merge pull request #1381 from ostcar/motion-tags
...
Tags for motions
2015-01-05 13:55:26 +01:00
bcb1ee1213
Tags for motions, agenda items and assignments
2015-01-03 17:00:48 +01:00
e42345b3d1
Merge pull request #1380 from ostcar/amendments
...
Feature: amendments
2015-01-03 15:22:10 +01:00
2951b4b38c
Feature: amendments
2015-01-03 15:17:49 +01:00
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
a93e5aa785
Merge pull request #1377 from normanjaeckel/WorkflowAndPermissions
...
Hide motions from non staff users in early workflow state.
2015-01-02 21:03:12 +01:00
8dafa2bfcd
Added possibility to hide motions from non staff users in some states.
2015-01-02 19:32:56 +01:00
b9efa7fff1
Merge pull request #1379 from normanjaeckel/FixGetObject
...
Cleaned up utils.views (especially get_object() method).
2014-12-25 00:07:25 +01:00
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
ecdfa37173
Merge pull request #1369 from normanjaeckel/AppLoadingSystem
...
Added Django's application configuration.
2014-12-10 18:02:49 +01:00
André Böhlke