root
|
5f2a0d2a13
|
pip c'est la vie, mais askip ça plaît pas.
|
2018-01-28 08:57:40 +01:00 |
|
Hugo LEVY-FALK
|
4cceb01891
|
On a besoin de pycrypto.
|
2018-01-28 08:56:41 +01:00 |
|
Hugo LEVY-FALK
|
9123822e3a
|
Affiche le rechargement si le moyen de paiement est défini.
|
2018-01-28 08:55:37 +01:00 |
|
Hugo LEVY-FALK
|
c7d5b7a39b
|
Meilleure gestion du AESField
|
2018-01-28 08:55:37 +01:00 |
|
|
|
a7a956b700
|
Cache le bouton si nécessaire.
|
2018-01-28 08:55:37 +01:00 |
|
Hugo LEVY-FALK
|
cd3a94fbe3
|
Stockage en BDD des identifiants comnpay.
|
2018-01-28 08:55:37 +01:00 |
|
|
|
6188e4bbc4
|
Oubli d'ajout de fichiers
|
2018-01-28 08:55:37 +01:00 |
|
|
|
6445a26223
|
Implémentation de l'auto inscription
|
2018-01-28 08:55:37 +01:00 |
|
Gabriel Detraz
|
a72d70e527
|
Montant minimal de rechargement + refactor de la fonction payment + self adhesion
|
2018-01-28 08:55:36 +01:00 |
|
Gabriel Detraz
|
a5653ed7f7
|
Un peu de joli icone
|
2018-01-28 08:55:36 +01:00 |
|
Gabriel Detraz
|
247697367d
|
Fix, le solde est calculé pour des factures valides
|
2018-01-28 08:55:36 +01:00 |
|
Hugo LEVY-FALK
|
f414cec623
|
Rechargement via comnpay du solde.
|
2018-01-28 08:55:36 +01:00 |
|
|
|
f80d32be98
|
Users can pay their own cotisation with their solde.
|
2018-01-28 08:55:36 +01:00 |
|
Gabriel Detraz
|
e47e1005d0
|
Merge branch 'commentaires' into 'master'
Commentaires
See merge request federez/re2o!67
|
2018-01-21 20:15:24 +01:00 |
|
Gabriel Detraz
|
02084bf817
|
Merge branch 'master' into commentaires
|
2018-01-21 19:12:35 +00:00 |
|
Gabriel Detraz
|
014c413c36
|
Affichage de messages dans l'installateur
|
2018-01-21 19:07:10 +00:00 |
|
Gabriel Detraz
|
bf01e6e946
|
Merge branch 'patch-2' into 'master'
Update README.md
See merge request federez/re2o!66
|
2018-01-21 18:22:19 +01:00 |
|
Gabriel Detraz
|
83b44e9a75
|
Update README.md
|
2018-01-21 18:17:41 +01:00 |
|
Gabriel Detraz
|
c2c1daab79
|
Desactivation des réglages de sécurité HTTPS par défault
|
2018-01-21 16:45:11 +00:00 |
|
Gabriel Detraz
|
160b95c836
|
Fix la creation superuser broken
|
2018-01-21 16:40:00 +00:00 |
|
Gabriel Detraz
|
d5c0068733
|
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 |
|
Hugo LEVY-FALK
|
96070d2b3c
|
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
|
e5e337f99a
|
Fix problèmes sur les migrations
|
2018-01-20 15:23:42 +00:00 |
|
root
|
3b66427422
|
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
|
4b090c3855
|
Fix Service usage in machine templates.
|
2018-01-20 01:29:02 +01:00 |
|
Hugo LEVY-FALK
|
c2ee100de3
|
Fix Service usage in machine templates.
|
2018-01-20 01:29:02 +01:00 |
|
root
|
e966564ecf
|
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
|
155513c8b3
|
Fix Service usage in machine templates.
|
2018-01-20 01:25:04 +01:00 |
|
Hugo LEVY-FALK
|
5f7c42a5b5
|
Fix Service usage in machine templates.
|
2018-01-20 01:01:39 +01:00 |
|
Gabriel Detraz
|
9ca54c4c6a
|
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
|
dfa62464c6
|
Evaluation dynamique de la date
|
2018-01-10 21:23:40 +01:00 |
|
Hugo LEVY-FALK
|
dcb52d938b
|
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
|
2e53f7e8da
|
Suppression de la mise en cache sur les ban et whitelist
|
2018-01-10 18:36:24 +01:00 |
|
Hugo LEVY-FALK
|
db349bb544
|
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
|
06acf73856
|
Fix sur les fieldpermissions topologie et machines
|
2018-01-08 23:59:46 +01:00 |
|
Gabriel Detraz
|
b18ad6c20e
|
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
|
d1d5efd590
|
Fix changement de mdp
|
2018-01-08 12:35:34 +01:00 |
|
Gabriel Detraz
|
01816813c4
|
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 |
|
Hugo LEVY-FALK
|
a84f387588
|
Fix preferences/edit_options/OptionalUser
|
2018-01-08 11:04:00 +01:00 |
|
Hugo LEVY-FALK
|
9551ce90af
|
Merge branch 'anti_troll' into 'master'
Anti troll
See merge request federez/re2o!58
|
2018-01-08 09:05:30 +01:00 |
|
Gabriel Detraz
|
41ff31e919
|
Protège les objects cotisations des users avec droits
|
2018-01-08 02:15:03 +01:00 |
|
Gabriel Detraz
|
f2446bdb98
|
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
|
bd5e6575d8
|
Protection avancée sur les utilisateurs dotés de droits
|
2018-01-07 23:56:08 +01:00 |
|
Gabriel Detraz
|
40b3e5eba4
|
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
|
3ac7ff48d7
|
Correction sur les migrations
|
2018-01-07 21:08:58 +01:00 |
|
Hugo LEVY-FALK
|
d1499683b6
|
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 |
|
Laouen Fernet
|
2bb40a9cf9
|
removes hard-coded urls, calls reverse. Fix issue #63
|
2018-01-07 20:29:43 +01:00 |
|
Gabriel Detraz
|
0423442556
|
Merge branch 'acl' into 'master'
Acl
See merge request federez/re2o!55
|
2018-01-07 02:38:41 +01:00 |
|
Gabriel Detraz
|
8c67ce93d5
|
Compatibilité python2
|
2018-01-07 02:30:01 +01:00 |
|
Gabriel Detraz
|
3e4966da66
|
Cosmétique pour 5-1
|
2018-01-07 02:15:02 +01:00 |
|
