Commit Graph

10 Commits

Author SHA1 Message Date
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
Yohann D'ANELLO 23243e09bb Fix some errors on JS string interpolation 2020-11-15 23:37:36 +01:00
Yohann D'ANELLO 5635598bbc Extract strings from javascript files and translate them in french 2020-11-15 23:28:41 +01:00
Yohann D'ANELLO 18a8ff1b8a Set credit/debit reason non mandatory 2020-10-07 09:45:09 +02:00
Yohann D'ANELLO c61bb2e90d When we credit the note of a club directly, fill the last name and the first name information with the club name instead of empty 2020-10-07 09:39:40 +02:00
Yohann D'ANELLO e48ef92137 Revert commit that broke beta branch 2020-09-23 18:32:09 +02:00
Yohann D'ANELLO 3ba61385a3 Debit is not credit 2020-09-20 11:12:44 +02:00
elkmaennchen d566def706 Try to translate js, not working... 2020-09-19 22:03:45 +02:00
Alexandre Iooss c720e5483e Move transfer.js where it belongs 2020-09-09 16:45:15 +02:00
Alexandre Iooss 0fd3e9db78 Move consos.js where it belongs 2020-09-09 16:42:45 +02:00