Yohann D'ANELLO 8434c0062c Merge branch 'beta' into JS_translations ... # Conflicts: # apps/note/static/note/js/consos.js # locale/de/LC_MESSAGES/django.po # locale/es/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po		2020-11-16 00:59:26 +01:00
..
api	Reorder import statements of apps/activity	2020-08-10 15:30:39 +02:00
fixtures	Add activity type "Other"	2020-08-31 00:20:09 +02:00
migrations	We are in production, then we commit migrations	2020-09-05 10:05:17 +02:00
templates/activity	Extract strings from javascript files and translate them in french	2020-11-15 23:28:41 +01:00
tests	Fix some linting, some complex functions are remaining	2020-09-05 14:29:40 +02:00
__init__.py	Unify file headers	2020-02-18 21:30:26 +01:00
admin.py	Replace timezone.now().date() by date.today()	2020-08-16 00:36:34 +02:00
apps.py	Unify file headers	2020-02-18 21:30:26 +01:00
forms.py	Add placeholders in activity form	2020-08-31 00:15:02 +02:00
models.py	All transactions are now atomic	2020-09-11 22:52:16 +02:00
tables.py	Update Django Tables 2, change accessor from dot to __	2020-09-01 17:58:58 +02:00
urls.py	Export activites as an ICS Calendar	2020-09-04 18:36:20 +02:00
views.py	Cache ICS calendar	2020-09-21 15:13:59 +02:00