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 |
|
Emanuel Schuetze
|
18fe7e2d89
|
Update to bootstrap 3.3.1.
|
2015-01-21 12:23:32 +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 |
|
Norman Jäckel
|
0d56424c90
|
Refactored REST api in agenda, core and users app.
|
2015-01-17 15:58:51 +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
|
8cb70017da
|
Added api viewset for users.
|
2015-01-17 08:51:57 +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 |
|
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
|
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 |
|
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
|
c454faef94
|
Updated Django to 1.7.x
|
2014-10-14 17:14:52 +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 |
|