Norman Jäckel
c6705e687a
Merge pull request #1436 from ostcar/travis_cache
...
Speed up travis with cache for pip and npm.
2015-02-05 14:59:28 +01:00
Norman Jäckel
aad0e8d2d2
Merge pull request #1437 from ostcar/tornado_requests
...
Send data via tornado and sockjs.
2015-01-31 14:36:54 +01:00
Norman Jäckel
117c34c5f0
Merge pull request #1427 from normanjaeckel/DjangoRESTFrameworkConfigMediafile
...
Django REST framework: Motion, mediafile, config app and rework.
2015-01-31 14:25:53 +01:00
Norman Jäckel
7238b8159a
Added REST api for motion, mediafile and config app. Refactor REST api in other apps.
2015-01-31 14:15:10 +01:00
Oskar Hahn
7ec4cdcdf7
send data via tornado
2015-01-30 14:00:04 +01:00
Oskar Hahn
2e9b05eb5a
Speed up travis with cache for pip and node
2015-01-26 02:05:14 +01:00
Norman Jäckel
79577c9b8e
Merge pull request #1435 from ostcar/fix_assignment_poll_view
...
Fixed AssignmentPollUpdateView.
2015-01-25 19:04:47 +01:00
Oskar Hahn
c7b52245b7
Fix AssignmentPollUpdateView
2015-01-25 15:15:28 +01:00
Oskar Hahn
19fb7018af
Merge pull request #1431 from ostcar/fix_anonymous
...
fix #1430 - anonymous user and motion detail view
2015-01-25 01:39:35 +01:00
Oskar Hahn
b4e17b9b35
fix #1430 - anonymous user and motion detail view
2015-01-25 01:20:59 +01:00
Oskar Hahn
e87eb6af5f
Merge pull request #1434 from ostcar/fix_rest_anonymous
...
use our anonymous user object for the rest framework
2015-01-25 01:20:41 +01:00
Norman Jäckel
da33e83a4e
Merge pull request #1433 from normanjaeckel/ForgottenChangelog
...
Updated CHANGELOG.
2015-01-25 01:17:11 +01:00
Oskar Hahn
ac01d39eaa
use our anonymous user object for the rest framework
...
fix : #1432
2015-01-25 01:11:14 +01:00
Norman Jäckel
4f5a31d50f
Updated CHANGELOG.
2015-01-25 01:09:57 +01:00
Norman Jäckel
8b08b99d7d
Merge pull request #1423 from ostcar/tests
...
New Test order. Also cleaned up some things.
2015-01-24 19:20:28 +01:00
Oskar Hahn
e7230b7391
New Test order.
...
* seperate unittests and integration tests
* moved old tests in seperat folder 'old'
* created a testrunner that does not create a testdatabase, if only unittests are run
* wrote some unit- and integration tests as examples
* fixed user.get_short_name() to use the sort order from config
* fixed wrong url_pattern in the user app
2015-01-24 18:00:03 +01:00
Oskar Hahn
ea45469338
Merge pull request #1424 from ostcar/simple_anonymous_user
...
Use a real anonymous user object, instadt of a authentification backend
2015-01-23 15:53:03 +01:00
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
