root
|
827780def3
|
pip c'est la vie, mais askip ça plaît pas.
|
2018-01-28 08:57:40 +01:00 |
|
Hugo LEVY-FALK
|
2381fd4bf9
|
On a besoin de pycrypto.
|
2018-01-28 08:56:41 +01:00 |
|
Hugo LEVY-FALK
|
ff68769c5a
|
Affiche le rechargement si le moyen de paiement est défini.
|
2018-01-28 08:55:37 +01:00 |
|
Hugo LEVY-FALK
|
bbb8788276
|
Meilleure gestion du AESField
|
2018-01-28 08:55:37 +01:00 |
|
|
|
754c43d331
|
Cache le bouton si nécessaire.
|
2018-01-28 08:55:37 +01:00 |
|
Hugo Levy-Falk
|
d694330149
|
Stockage en BDD des identifiants comnpay.
|
2018-01-28 08:55:37 +01:00 |
|
|
|
c57f155e24
|
Oubli d'ajout de fichiers
|
2018-01-28 08:55:37 +01:00 |
|
|
|
b0fca7f6b6
|
Implémentation de l'auto inscription
|
2018-01-28 08:55:37 +01:00 |
|
Gabriel Detraz
|
a71e01e18a
|
Montant minimal de rechargement + refactor de la fonction payment + self adhesion
|
2018-01-28 08:55:36 +01:00 |
|
Gabriel Detraz
|
5319ed266c
|
Un peu de joli icone
|
2018-01-28 08:55:36 +01:00 |
|
Gabriel Detraz
|
cbe541d382
|
Fix, le solde est calculé pour des factures valides
|
2018-01-28 08:55:36 +01:00 |
|
Hugo LEVY-FALK
|
f7657a2236
|
Rechargement via comnpay du solde.
|
2018-01-28 08:55:36 +01:00 |
|
|
|
d9ebb266d5
|
Users can pay their own cotisation with their solde.
|
2018-01-28 08:55:36 +01:00 |
|
chirac
|
891014babd
|
Merge branch 'commentaires' into 'master'
Commentaires
See merge request federez/re2o!67
|
2018-01-21 20:15:24 +01:00 |
|
Gabriel Detraz
|
5f569cb4f8
|
Merge branch 'master' into commentaires
|
2018-01-21 19:12:35 +00:00 |
|
Gabriel Detraz
|
41645aefc5
|
Affichage de messages dans l'installateur
|
2018-01-21 19:07:10 +00:00 |
|
chirac
|
a549b752ce
|
Merge branch 'patch-2' into 'master'
Update README.md
See merge request federez/re2o!66
|
2018-01-21 18:22:19 +01:00 |
|
chirac
|
4000c18971
|
Update README.md
|
2018-01-21 18:17:41 +01:00 |
|
Gabriel Detraz
|
c7c1ee82dd
|
Desactivation des réglages de sécurité HTTPS par défault
|
2018-01-21 16:45:11 +00:00 |
|
Gabriel Detraz
|
2070d3841b
|
Fix la creation superuser broken
|
2018-01-21 16:40:00 +00:00 |
|
chirac
|
3648046ddf
|
Merge branch 'fix_service_collision' into 'master'
Fix Service usage in machine templates.
See merge request federez/re2o!64
|
2018-01-20 17:36:10 +01:00 |
|
klafyvel
|
3ce592b12b
|
Merge branch 'fix_initial_migration' into 'master'
Fix problèmes sur les migrations
See merge request federez/re2o!65
|
2018-01-20 17:00:44 +01:00 |
|
Gabriel Detraz
|
410f92c299
|
Fix problèmes sur les migrations
|
2018-01-20 15:23:42 +00:00 |
|
root
|
926a51d382
|
Merge branch 'fix_service_collision' of https://gitlab.federez.net/federez/re2o into fix_service_collision
|
2018-01-20 01:31:49 +01:00 |
|
Hugo LEVY-FALK
|
3459b520e9
|
Fix Service usage in machine templates.
|
2018-01-20 01:29:02 +01:00 |
|
Hugo LEVY-FALK
|
e2b4269c6b
|
Fix Service usage in machine templates.
|
2018-01-20 01:29:02 +01:00 |
|
root
|
7fc31714c9
|
Merge branch 'fix_service_collision' of https://gitlab.federez.net/federez/re2o into fix_service_collision
|
2018-01-20 01:25:27 +01:00 |
|
Hugo LEVY-FALK
|
12ab3abb01
|
Fix Service usage in machine templates.
|
2018-01-20 01:25:04 +01:00 |
|
Hugo LEVY-FALK
|
b3d7715c54
|
Fix Service usage in machine templates.
|
2018-01-20 01:01:39 +01:00 |
|
chirac
|
61b169808b
|
Merge branch 'fix_date' into 'master'
Evaluation dynamique de la date
See merge request federez/re2o!63
|
2018-01-10 21:31:59 +01:00 |
|
Gabriel Detraz
|
d36a971378
|
Evaluation dynamique de la date
|
2018-01-10 21:23:40 +01:00 |
|
klafyvel
|
e6c5e0c3f9
|
Merge branch 'no_cache_ban' into 'master'
Suppression de la mise en cache sur les ban et whitelist
See merge request federez/re2o!62
|
2018-01-10 18:42:37 +01:00 |
|
Gabriel Detraz
|
3b2ec6c9c9
|
Suppression de la mise en cache sur les ban et whitelist
|
2018-01-10 18:36:24 +01:00 |
|
klafyvel
|
d570ba45ad
|
Merge branch 'fix_djangofield' into 'master'
Fix sur les fieldpermissions topologie et machines
See merge request federez/re2o!61
|
2018-01-09 08:03:57 +01:00 |
|
Gabriel Detraz
|
916c2e3e9f
|
Fix sur les fieldpermissions topologie et machines
|
2018-01-08 23:59:46 +01:00 |
|
chirac
|
9ee8d91489
|
Merge branch 'password_fix' into 'master'
Fix changement de mdp
See merge request federez/re2o!60
|
2018-01-08 12:40:42 +01:00 |
|
Gabriel Detraz
|
ed905e4177
|
Fix changement de mdp
|
2018-01-08 12:35:34 +01:00 |
|
chirac
|
99c69a5d37
|
Merge branch 'fix_optionaluser' into 'master'
Fix preferences/edit_options/OptionalUser
See merge request federez/re2o!59
|
2018-01-08 11:42:51 +01:00 |
|
LEVY-FALK Hugo
|
d1a17ff763
|
Fix preferences/edit_options/OptionalUser
|
2018-01-08 11:04:00 +01:00 |
|
klafyvel
|
b5df319bc4
|
Merge branch 'anti_troll' into 'master'
Anti troll
See merge request federez/re2o!58
|
2018-01-08 09:05:30 +01:00 |
|
Gabriel Detraz
|
405bc03668
|
Protège les objects cotisations des users avec droits
|
2018-01-08 02:15:03 +01:00 |
|
Gabriel Detraz
|
644ca18478
|
Editions des machines des users avec droits et de l'asso seulement avec droit all
|
2018-01-08 01:21:57 +01:00 |
|
Gabriel Detraz
|
f52d869b5f
|
Protection avancée sur les utilisateurs dotés de droits
|
2018-01-07 23:56:08 +01:00 |
|
chirac
|
2576e3b4c7
|
Merge branch 'migrations_2.5' into 'master'
Correction sur les migrations
See merge request federez/re2o!57
|
2018-01-07 21:11:28 +01:00 |
|
Gabriel Detraz
|
3b2256c283
|
Correction sur les migrations
|
2018-01-07 21:08:58 +01:00 |
|
klafyvel
|
234aa26319
|
Merge branch 'reverse_everywhere' into 'master'
removes hard-coded urls, calls reverse. Fix issue #63
Closes #63
See merge request federez/re2o!56
|
2018-01-07 20:54:29 +01:00 |
|
FERNET Laouen
|
d3f07cf63a
|
removes hard-coded urls, calls reverse. Fix issue #63
|
2018-01-07 20:29:43 +01:00 |
|
chirac
|
23732800b3
|
Merge branch 'acl' into 'master'
Acl
See merge request federez/re2o!55
|
2018-01-07 02:38:41 +01:00 |
|
Gabriel Detraz
|
2c6697a269
|
Compatibilité python2
|
2018-01-07 02:30:01 +01:00 |
|
Gabriel Detraz
|
0c0df90d75
|
Cosmétique pour 5-1
|
2018-01-07 02:15:02 +01:00 |
|
