rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 09:26:27 +00:00
Code Issues Releases Wiki Activity
2175 commits 211 branches 14 tags 12 MiB
Commit graph

2175 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexandre Iooss
a0bb34f740 Update .gitignore to ignore more files 
Based on the Python template : https://github.com/github/gitignore/

I'm using PyCharm which creates .idea folders. So I need this to
make my life easier.
 2018-09-21 12:47:59 +02:00
chirac
1d8095f223 Merge branch 'fix_mr294' into 'dev' 
Fix merge request 294

See merge request federez/re2o!299
 2018-09-20 16:21:47 +02:00
Alexandre Iooss
9e578bf93d Fix merge request 294 2018-09-20 15:38:36 +02:00
chirac
e1c6c84c72 Merge branch 'former_user_checkbox_fix170' into 'dev' 
Changed AdherentForm usage and fixed issue #170

See merge request federez/re2o!294
 2018-09-20 14:35:41 +02:00
edpibu
2db88d628a Added checkbox for GTU. 2018-09-20 14:35:01 +02:00
edpibu
d0fdf841cf Fixed label creation on AdherentCreationForm. Added AdherentEditForm. shell and gpg_fingerprint fields have been moved from AdherentForm to AdherentEditForm. 2018-09-20 14:35:01 +02:00
edpibu
1d107d33f2 Fixed field creation 2018-09-20 14:35:01 +02:00
edpibu
b7359f5b38 Fix 170: Ajout d'une case à cocher pour éviter les doublons de comptes 2018-09-20 14:35:01 +02:00
chirac
eb712c7c6f Merge branch 'fix_inital_migration' into 'dev' 
Fix initial migration

See merge request federez/re2o!295
 2018-09-20 14:32:28 +02:00
Alexandre Iooss
992dc97024 Fix initial migration 
Initial migration was failing due to change_facture_pdf not being
initialised at the right time.
 2018-09-19 10:06:09 +02:00
Benjamin Graillot
0e56f22fdf Merge branch 'divers_fix' into 'dev' 
Divers fix

See merge request federez/re2o!290
 2018-09-08 21:49:28 +02:00
detraz
f2c132016f Les factures sont validées en post_paiement + bug fix paiement relation 2018-09-08 21:17:08 +02:00
detraz
9fdadaf478 Le home est une methode + règle les problèmes de la casse sur le pseudo 2018-09-08 21:17:08 +02:00
detraz
5b347f3db4 Fix, utilise la bonne fonction d'envoie de mails 2018-09-08 21:17:08 +02:00
detraz
52f3d4d550 Not yet member, possibilité de trouver les users pas encore adhérents 2018-09-08 21:17:08 +02:00
chirac
d3271c5cbf Merge branch 'feature_mailto_link_on_user_profile' into 'dev' 
Lien pour envoyer un mail directement à un utilisateur sur la page profil

See merge request federez/re2o!289
 2018-09-03 12:18:50 +02:00
Hugo LEVY-FALK
6661487306 Lien pour envoyer un mail directement à un utilisateur sur la page profil 2018-09-03 12:12:12 +02:00
klafyvel
712df09f2d Merge branch 'search_user' into 'dev' 
Permet la recherche avec telephone et email des users

See merge request federez/re2o!287
 2018-09-02 20:29:29 +02:00
detraz
eae05e4b7c Permet la recherche avec telephone et email des users 2018-09-02 20:22:25 +02:00
grizzly
6f624e9e40 Merge branch 'frontend_buttons' into 'dev' 
Frontend buttons

See merge request federez/re2o!286
 2018-09-02 19:06:58 +02:00
detraz
dacf1e4615 Correction des boutons sur les autres apps 2018-09-02 18:28:54 +02:00
detraz
32be355fd8 Corrections de front buttons et labels cotisations 2018-09-02 18:07:43 +02:00
klafyvel
865c24cfde Merge branch 'paiement_note' into 'dev' 
Module de paiement par note

See merge request federez/re2o!285
 2018-09-01 21:25:35 +02:00
detraz
f5eb4616f5 Rename note en note_kfet 2018-09-01 21:22:08 +02:00
Pierre-Antoine Comby
6b1597c0c6 Module de paiement par note 2018-09-01 21:22:08 +02:00
chirac
1e72a6b6eb Merge branch 'fix_var_names_in_custom_invoices' into 'dev' 
Fix le choix des articles pour les custom invoices

See merge request federez/re2o!284
 2018-09-01 19:41:38 +02:00
Hugo LEVY-FALK
9b080450ab Fix le choix des articles pour les custom invoices 2018-09-01 19:37:34 +02:00
chirac
ed7c758a30 Merge branch 'fix_history_button_invoice' into 'dev' 
Fix history button invoice

See merge request federez/re2o!282
 2018-09-01 19:35:24 +02:00
Hugo LEVY-FALK
f68a1ae2a9 Corrige les classes css du bouton historique des cotisations 2018-09-01 19:25:45 +02:00
chirac
3b0186eb41 Merge branch 'feature_redirect_to_target_user_homepage_after_comnpay' into 'dev' 
Redirige vers l'utilisateur cible après un paiement par comnpay.

See merge request federez/re2o!283
 2018-09-01 19:25:12 +02:00
Hugo LEVY-FALK
5d65e87229 Redirige vers l'utilisateur cible après un paiement par comnpay. 2018-09-01 12:10:47 +02:00
klafyvel
c917f0b7ab Merge branch 'fix_send_mail' into 'dev' 
Fix l'envoie de mail, en postsave maintenant (plus propre)

See merge request federez/re2o!281
 2018-09-01 11:58:50 +02:00
detraz
d609bb6493 Post save custom dans la fonction save, pour __original_valid 2018-09-01 02:16:50 +02:00
Gabriel Detraz
2dd410fedf Fix l'envoie de mail, en postsave maintenant (plus propre) 2018-09-01 01:15:37 +02:00
detraz
cd8a23da31 Fix import de users.User 2018-09-01 00:55:18 +02:00
klafyvel
5af66b400b Merge branch 'user_adh_pas_encore' into 'dev' 
User adh pas encore

See merge request federez/re2o!279
 2018-08-31 23:27:32 +02:00
Hugo LEVY-FALK
ded8f89ba8 Fix couleurs du texte pour l'état 'actif' 2018-08-31 22:25:38 +02:00
chirac
ea78da87e0 Que en anglais docstring models.py 2018-08-31 13:37:08 +02:00
Gabriel Detraz
48773668d1 No harcoded var 2018-08-31 13:35:33 +02:00
Gabriel Detraz
0ffdde5a6a Cree une fonction pour set active les utilisateurs cotisant 2018-08-31 13:29:01 +02:00
grisel-davy
5ab8bb4f0e Empeche la syncronisation ldap pour les users_not_yet_member 2018-08-31 12:06:32 +02:00
grisel-davy
fa3aca906f Les nouveau users ne sont pas adhérents et n'ont pas de home 2018-08-31 12:06:32 +02:00
chirac
3e679757af Merge branch 'web_register_mac' into 'dev' 
Web register mac

See merge request federez/re2o!278
 2018-08-29 11:54:09 +02:00
Laouen Fernet
1de72714d0 translation for commit f355175b + typos 2018-08-29 11:27:10 +02:00
Gabriel Detraz
5d30e95aa4 Ebauche, interface de capture de mac et d'enregistrement de chambre 2018-08-29 11:27:10 +02:00
chirac
be1c0cef22 Merge branch 'typos' into 'dev' 
Typos in README

See merge request federez/re2o!275
 2018-08-29 11:25:19 +02:00
Vincent Le Gallic
c73485f7ab Typos in README 2018-08-29 10:32:48 +02:00
chirac
61bd9de8d1 Merge branch 'hotfix_ipv4_field' into 'dev' 
Fix l'erreur sur l'utilisation du massive bootstrap form pour l'ipv4

See merge request federez/re2o!276
 2018-08-28 12:50:51 +02:00
Hugo LEVY-FALK
e546a2228a Fix l'erreur sur l'utilisation du massive bootstrap form pour l'ipv4 2018-08-28 12:31:43 +02:00
chirac
9fbf17004a Merge branch 'solde-users' into 'dev' 
Solde users

See merge request federez/re2o!273
 2018-08-27 19:08:52 +02:00