ynerant 395c52220f Merge branch 'master' into 'tranfer_front' ...

# Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html

2020-05-07 18:48:35 +02:00

..

api

Guests can pay with CB or coins, lot of other improvements

2020-03-28 16:52:58 +01:00

fixtures

Update permission fixtures

2020-04-06 10:45:32 +02:00

migrations

move apps to own dir

2019-08-11 14:47:44 +02:00

tests

move apps to own dir

2019-08-11 14:47:44 +02:00

__init__.py

Unify file headers

2020-02-18 21:30:26 +01:00

admin.py

Make erdnaxe be happy

2020-03-07 22:28:59 +01:00

apps.py

Unify file headers

2020-02-18 21:30:26 +01:00

forms.py

Improve survey, comment code

2020-04-20 01:26:53 +02:00

models.py

Launching WEI app, add models

2020-04-11 03:37:06 +02:00

tables.py

Guests can pay with CB or coins, lot of other improvements

2020-03-28 16:52:58 +01:00

urls.py

Fix activity in Guest model

2020-03-27 19:16:38 +01:00

views.py

Merge branch 'master' into 'tranfer_front'

2020-05-07 18:48:35 +02:00