Aarni Halinen 91cbdef71f Merge branch 'develop' into 'Django2.0' ...

# Conflicts:
#   webapp/urls.py

2018-07-18 20:44:23 +03:00

..

management

Add translation for role models and remove summary field from PresetRole

2017-10-19 14:25:28 +03:00

migrations

Rest framework for Event and SignupForm

2018-07-10 22:33:26 +03:00

static

Merge branch 'feature-contacts' into develop

2018-05-16 22:49:38 +03:00

templates

Merge branch 'feature-contacts' into develop

2018-05-16 22:49:38 +03:00

__init__.py

…

admin.py

Move signup models back to webapp

2018-07-05 18:58:33 +03:00

apps.py

Fix webapp and sikweb py files pep8

2017-09-20 21:15:46 +03:00

forms.py

Move ohlhafv to its own app

2018-01-28 18:54:45 +02:00

models.py

Rest framework for Event and SignupForm

2018-07-10 22:33:26 +03:00

serializers.py

Add contacts API

2018-07-18 20:40:19 +03:00

tables.py

Move ohlhafv to its own app

2018-01-28 18:54:45 +02:00

tests.py

Fix webapp and sikweb py files pep8

2017-09-20 21:15:46 +03:00

translation.py

Rest framework for Event and SignupForm

2018-07-10 22:33:26 +03:00

urls.py

Merge branch 'develop' into 'Django2.0'

2018-07-18 20:44:23 +03:00

utils.py

Fix missing settings import

2018-01-30 14:50:32 +02:00

views.py

Merge branch 'develop' into 'Django2.0'

2018-07-18 20:44:23 +03:00