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
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
Oskar Hahn
4257ecefb3
Merge pull request #1400 from ostcar/fix_localized_thing
...
Fix LocalizedModelMultipleChoiceField
2015-01-16 21:05:41 +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
Norman Jäckel
1389ad1d03
Merge pull request #1392 from normanjaeckel/Fix1391
...
Fixed bug in ResetPasswordView. Fixed #1391 .
2015-01-06 17:01:26 +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
Oskar Hahn
d0d674601d
Merge pull request #1381 from ostcar/motion-tags
...
Tags for motions
2015-01-05 13:55:26 +01:00
Oskar Hahn
bcb1ee1213
Tags for motions, agenda items and assignments
2015-01-03 17:00:48 +01:00
Oskar Hahn
e42345b3d1
Merge pull request #1380 from ostcar/amendments
...
Feature: amendments
2015-01-03 15:22:10 +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
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
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
b9efa7fff1
Merge pull request #1379 from normanjaeckel/FixGetObject
...
Cleaned up utils.views (especially get_object() method).
2014-12-25 00:07:25 +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
ecdfa37173
Merge pull request #1369 from normanjaeckel/AppLoadingSystem
...
Added Django's application configuration.
2014-12-10 18:02:49 +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
Emanuel Schütze
75b28847d5
Merge pull request #1368 from normanjaeckel/Release-1.6.1
...
Release 1.6.1
2014-12-08 21:08:35 +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
Norman Jäckel
35e31874a1
Updated CHANGELOG.
2014-12-04 15:42:35 +01:00
Norman Jäckel
d608dd3095
Merge pull request #1373 from emanuelschuetze/fix-1326-b
...
Fixed #1326 : Rearranged assignment pdf table cells to prevent a LayoutError.
2014-12-04 15:40:16 +01:00
Emanuel Schuetze
6df6b92dd7
Fixed #1326 (Rearanged assignment pdf table cells to prevent a LayoutError)
2014-11-28 20:58:19 +01:00
Norman Jäckel
3c6266b1c4
Merge pull request #1361 from ostcar/transaction
...
Used the new django transaction API.
2014-11-18 13:04:29 +01:00
Norman Jäckel
ed17ccfad2
Merge pull request #1362 from ostcar/requirements
...
Updated requirements.txt.
2014-11-04 18:32:01 +01:00
Norman Jäckel
b9842ecf94
Merge pull request #1367 from emanuelschuetze/fr-translation
...
Updated FR translation.
2014-10-27 21:21:29 +01:00
Norman Jäckel
ba34fa5121
Merge pull request #1366 from emanuelschuetze/portable-readme
...
Added version numbers of required packages to portable build instruction...
2014-10-27 21:19:49 +01:00
Norman Jäckel
0471be3d1e
Merge pull request #1365 from emanuelschuetze/fix-1354
...
Fixed #1354 : Added CKEditor plugin insterpre to README.
2014-10-27 21:18:26 +01:00
Emanuel Schuetze
8be1215e12
Updated FR translation.
2014-10-27 20:42:36 +01:00
Emanuel Schuetze
815789bd8e
Added version numbers of required packages to portable build instruction.
2014-10-27 20:29:06 +01:00
Emanuel Schuetze
9a4d357287
Fixed #1354 : Added CKEditor plugin insterpre to README.
2014-10-27 20:17:50 +01:00
Oskar Hahn
c12c83a7ae
Merge pull request #1363 from normanjaeckel/Languages
...
Updated German and Czech language files.
2014-10-26 18:17:24 +01:00
Norman Jäckel
c89f9bcccd
Updated German and Czech language files.
2014-10-26 16:12:20 +01:00
Oskar Hahn
939f3f8339
Update requirements.txt
...
Especially this is importand for haystack, because the old version had some DepricationWarnings.
This means, that django-haystack 2.1 and django 1.8 will not be compatible
See #1352
2014-10-19 15:40:32 +02: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
Norman Jäckel
087a5f1650
Merge pull request #1353 from ostcar/django17
...
Updated Django version to 1.7.
2014-10-17 19:27:56 +02:00
Oskar Hahn
fca2a2fd09
Merge pull request #1358 from normanjaeckel/LanguageFile
...
Updated English language files.
2014-10-17 07:57:08 +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
Oskar Hahn
0f40ce2c81
Merge pull request #1351 from frauenknecht/i1327_2
...
Fix #1327 - Related agenda item has no (auto) agenda number
2014-10-12 11:15:41 +02:00
