8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-25 04:43:10 +00:00
Commit graph

2440 commits

Author SHA1 Message Date
chirac
62d86be364 Merge branch 'home' into 'dev'
Ajout du gid au sérialiser Adherent util pour la création des home

See merge request federez/re2o!217
2018-08-16 19:59:25 +02:00
grisel-davy
ded0aadb9d Ajout du gid au sérialiser Adherent 2018-08-16 19:51:56 +02:00
klafyvel
de5b6c903f Merge branch 'fix_153' into 'dev'
Fix #153, pas de solde par solde

See merge request federez/re2o!258
2018-08-16 19:44:08 +02:00
Gabriel Detraz
9c065b57e3 Fix #153, pas de solde par solde 2018-08-16 19:37:45 +02:00
chirac
164497b02e Merge branch 'whitelist-cliquable' into 'dev'
Whitelist cliquable

See merge request federez/re2o!257
2018-08-16 18:20:11 +02:00
grisel-davy
92cdb3004e nom cliquable dans les bans aussi 2018-08-16 18:15:02 +02:00
grisel-davy
c148306eb3 nom cliquable dans la liste des whitelist 2018-08-16 18:15:02 +02:00
klafyvel
3cae0564ef Merge branch 'fix_93_store_custom_invoices' into 'dev'
Fix 93 store custom invoices

See merge request federez/re2o!203
2018-08-16 00:39:09 +02:00
Hugo LEVY-FALK
6cc22c376d Adapte les migrations de custom_invoice à la branche dev 2018-08-16 00:22:39 +02:00
Hugo LEVY-FALK
63c80d69a3 Fix de render_tex 2018-08-16 00:22:07 +02:00
Hugo LEVY-FALK
19bd78bc8d Fix des traductions et de détails de front. 2018-08-16 00:08:29 +02:00
Hugo LEVY-FALK
1284d9ffec Migration des permissions 2018-08-16 00:08:29 +02:00
Hugo LEVY-FALK
bad89ea7c2 Réfléchir avant de pusher le klafyvel doit se rappeler. fix les traductions 2018-08-16 00:08:29 +02:00
Hugo LEVY-FALK
37dbf3d82a i18n pour cotisations 2018-08-16 00:08:29 +02:00
Hugo LEVY-FALK
822ca101ac CHANGELOG avec les commandes à lancer pour postgre. 2018-08-16 00:07:33 +02:00
Hugo LEVY-FALK
e38ae33c6e Utilise le filter tick pour afficher les booléens de custom invoice 2018-08-16 00:06:36 +02:00
Hugo LEVY-FALK
5236b659b6 Fix l'historique 2018-08-16 00:06:35 +02:00
Hugo LEVY-FALK
d6091d117c Custom invoices. 2018-08-16 00:06:35 +02:00
klafyvel
0527206eb4 Merge branch 'fix_141_send_invoice' into 'dev'
Fix 141 send invoice

See merge request federez/re2o!198
2018-08-16 00:00:53 +02:00
Hugo LEVY-FALK
4ab0dad146 Documentation propre de render_tex et create_pdf 2018-08-15 23:56:49 +02:00
Delphine SALVY
9dd54a99a5 Fix 141 : envoi des factures par mail 2018-08-15 23:56:49 +02:00
Delphine SALVY
904c7b279b POC de l'envoi de facture par mail. 2018-08-15 23:56:49 +02:00
klafyvel
a02db1547a Merge branch 'change_self_shell' into 'dev'
users can change their shell

See merge request federez/re2o!255
2018-08-15 23:42:25 +02:00
Hugo LEVY-FALK
1e47fa16a0 Rend can_change_shell de User cast-proof 2018-08-15 23:14:30 +02:00
Gabriel Detraz
ba31a94c20 users can change their shell 2018-08-15 22:11:18 +02:00
klafyvel
65fed7455c Merge branch 'compay_fix' into 'dev'
Fix comnpay url

See merge request federez/re2o!251
2018-08-15 22:09:52 +02:00
Hugo LEVY-FALK
9b58fc1829 fix migrations 2018-08-15 22:02:39 +02:00
Gabriel Detraz
56e6cfffe2 Fix comnpay url 2018-08-15 22:01:02 +02:00
klafyvel
008fd836e0 Merge branch 'mail_interne_fix' into 'dev'
Mail interne fix

See merge request federez/re2o!247
2018-08-14 13:32:41 +02:00
Hugo LEVY-FALK
49585cade1 Ajoute la possibilité d'utiliser uniquement le compte mail local. 2018-08-14 13:28:39 +02:00
Hugo LEVY-FALK
680b8a7ec7 Rend l'affichage des mails locaux plus intuitif 2018-08-14 13:28:39 +02:00
Charlie Jacomme
cef93af15a last email migration 2018-08-14 13:28:39 +02:00
Charlie Jacomme
ff2a6c2722 many fix mail 2018-08-14 13:28:39 +02:00
Charlie Jacomme
e70b063a3d fix mail problems: check pseudo taken and lower) 2018-08-14 13:28:39 +02:00
grisel-davy
84764ce51b verification des extension mail externe et lower des adresses mail pour mieux verifier les doublons 2018-08-14 13:28:38 +02:00
klafyvel
740843975a Merge branch 'gpg_fingerprint' into 'dev'
Gpg fingerprint

See merge request federez/re2o!245
2018-08-14 10:39:07 +02:00
Hugo LEVY-FALK
b73ccdd043 Affiche la fingerpring PGP correctement. 2018-08-14 10:13:10 +02:00
Hugo LEVY-FALK
7deb99f883 Fix les migrations 2018-08-14 10:13:10 +02:00
Charlie Jacomme
a5870aacce gpg fpr display 2018-08-14 10:13:09 +02:00
Benjamin Graillot
787ceab520 [Adherent] Ajout gpg_fingerprint 2018-08-14 10:13:09 +02:00
chirac
95df4eef3c Merge branch 'typo' into 'dev'
typo Editer -> Éditer

See merge request federez/re2o!253
2018-08-13 11:20:51 +02:00
Fardale
f123f13e10 typo Editer -> Éditer 2018-08-13 00:31:31 +02:00
chirac
cddb442b8e Merge branch 'regen_services_on_demand' into 'dev'
bouton de regen des services

See merge request federez/re2o!246
2018-08-12 19:19:26 +02:00
grisel-davy
b455de0de2 bouton de regen des services 2018-08-12 19:13:07 +02:00
chirac
f983a8c22a Merge branch 'recrypt_password_on_login' into 'dev'
Produce newer hash upon login

See merge request federez/re2o!249
2018-08-12 19:12:31 +02:00
Charlie Jacomme
382398a351 Produce newer hash upon login 2018-08-12 19:06:56 +02:00
chirac
a55a6b3052 Merge branch 'fix_frontend' into 'dev'
Fix frontend

See merge request federez/re2o!244
2018-08-12 18:40:18 +02:00
Gabriel Le Bouder
602be85013 end of connection-blacklist of the user we are looking at 2018-08-12 18:30:54 +02:00
Charlie Jacomme
80708e872e Fix messages for usage in API 2018-08-12 18:30:54 +02:00
Gabriel Le Bouder
771e8cc3fa on centre le texte dans les boites du profil 2018-08-12 18:30:54 +02:00