rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-25 08:23:46 +00:00
Code Issues Releases Wiki Activity
1167 commits 211 branches 14 tags 12 MiB
Commit graph

1167 commits

This branch
This branch
All branches
Author SHA1 Message Date
klafyvel
ab79b2c919 Merge branch 'moamoak/mailing_API' into 'master' 
Improve the API for multiple mailings

See merge request federez/re2o!94
 2018-03-07 18:19:55 +01:00
Maël Kervella
8c2f634901 REST : Add API for mailing for club and other 
Access /users/rest/ml/std/
    for list of standard mailings
Access /users/rest/ml/std/member/<ml_name>/
    for list of members of specific standard mailing
Access /users/rest/ml/club/
    for list of club mailings
Access /users/rest/ml/club/member/<ml_name>/
    for list of members of specific club mailing
Access /users/rest/ml/club/admin/<ml_name>/
    for list of admins of specific club mailing
 2018-03-07 16:04:43 +00:00
Maël Kervella
377447d23b Club : Add option to specify if a mailing should be generated for 2018-03-07 16:04:22 +00:00
klafyvel
082f684781 Merge branch 'better_dropdown' into 'master' 
Better selection of user while editing interface

Closes #73

See merge request federez/re2o!93
 2018-03-06 17:45:02 +01:00
Maël Kervella
ac75bba842 Machines : Remove old form 2018-03-06 16:34:17 +00:00
klafyvel
3a3960bf9d Merge branch 'remove_cookie_banner' into 'master' 
Remove cookie banner

Closes #75

See merge request federez/re2o!92
 2018-03-06 17:17:23 +01:00
klafyvel
d7be9e9083 Merge branch 'fix_mailing' into 'master' 
Fix : Droit machines.serveur pour l'API des mailings

See merge request federez/re2o!89
 2018-03-06 17:16:30 +01:00
Maël Kervella
d9a2c1e72d Machines : dropdown in edit_interface form 
Replace the dropdown for the field user in the edit_interface HTML form
with a massive_bootstrap_form.
Related to https://gitlab.federez.net/federez/re2o/issues/73
 2018-03-06 16:06:44 +00:00
Maël Kervella
0e60e97482 Base Template : Remove useless cookie banner 
See https://gitlab.federez.net/federez/re2o/issues/75 for details
 2018-03-06 15:48:43 +00:00
Maël Kervella
130b5f9088 Fix : Droit machines.serveur pour l'API des mailings 2018-03-05 15:53:03 +00:00
moamoak
92c5a084e5 Merge branch 'Fix_migration_dependencies' into 'master' 
Fix : Dépendances des migrations nécessaire

See merge request federez/re2o!88
 2018-03-05 16:13:54 +01:00
Maël Kervella
611044d963 Fix : Dépendances des migrations nécessaire 2018-03-05 12:34:00 +00:00
chirac
be430c4651 Merge branch 'about_page' into 'master' 
About page

See merge request federez/re2o!87
 2018-03-05 00:03:24 +01:00
Matthieu Michelet
28cd45f3ed Ajout de fichier manquant 2018-03-04 23:58:16 +01:00
Matthieu Michelet
f8da5ba8e0 Implémentation de la création automatique de la liste des contributerus triée par nombre de commits 2018-03-04 23:46:20 +01:00
chirac
31e159e16a Merge branch 'fix_migration' into 'master' 
Devrait fixer le bug sur cotisations/migrations/0026_auto_20171028_0126.py

See merge request federez/re2o!86
 2018-03-03 00:47:29 +01:00
chirac
38ed79a1f1 Merge branch 'create_aes_key_at_install' into 'master' 
Crée la clé AES à l'installation.

See merge request federez/re2o!85
 2018-03-03 00:47:23 +01:00
Hugo LEVY-FALK
107fa6b902 Devrait fixer le bug sur cotisations/migrations/0026_auto_20171028_0126.py 2018-03-03 00:17:42 +01:00
Hugo LEVY-FALK
45060e54db Crée la clé AES à l'installation. 2018-03-02 19:24:59 +01:00
chirac
668724e5ff Merge branch 'fix_ntlm' into 'master' 
Modifie le pwd_ntml à la modification de password.

See merge request federez/re2o!84
 2018-03-02 00:39:37 +01:00
Hugo LEVY-FALK
456fc547aa Modifie le pwd_ntml à la modification de password. 2018-03-02 00:14:58 +01:00
chirac
c8240747ef Merge branch 'fix_whitelist' into 'master' 
Fix l'ajout de whitelist

See merge request federez/re2o!83
 2018-02-28 22:03:14 +01:00
Hugo LEVY-FALK
76f86cd1e5 Fix l'ajout de whitelist 2018-02-28 21:59:49 +01:00
chirac
d8005624f5 Merge branch 'create_machine_users' into 'master' 
Création d'un réglage permettant de modifier le droit de créer une machine

See merge request federez/re2o!82
 2018-02-28 16:43:57 +01:00
Joanne Steiner
5e9b4e962e Création d'un réglage permettant de modifier le droit de créer une machine 2018-02-28 16:39:54 +01:00
matthieu
1802fbdaa7 Merge branch 'about_page' of https://gitlab.federez.net/federez/re2o into about_page 2018-02-23 22:08:05 +01:00
matthieu
f8c66c50bd changement de positionnement du bouton a propos, désormais en lien sur le footer 2018-02-23 21:56:56 +01:00
matthieu
18d51628c5 Ortho 2018-02-23 20:09:14 +01:00
Yoann Pietri
d9b5a68a77 Contributeurs sur 2 colonnes. 2018-02-23 19:38:11 +01:00
matthieu
6b253f5188 Ajout d'une page A propos présantant l'association, re2o et listant c'est principaux contributeurs. Ajout d'un champ description 
(dans les parametres d'association) dans l'onglet préférences.
issue #64
 2018-02-23 19:38:11 +01:00
chirac
2aec9782ed Merge branch 'fix_payment' into 'master' 
Répare le champ AESField (test de value inutile)

See merge request federez/re2o!81
 2018-02-23 11:31:42 +01:00
Hugo LEVY-FALK
d3a4d71241 Ne pas afficher en clair dans les logs les mdp c'est bon esprit. 2018-02-23 08:21:43 +01:00
Hugo LEVY-FALK
d2d3a66ab1 Répare le champ AESField (test de value inutile) 2018-02-22 19:52:59 +01:00
klafyvel
6dae1af936 Merge branch 'fix_create_club' into 'master' 
Dissocie les variables all_can_create entre adherent et club

See merge request federez/re2o!80
 2018-02-22 19:48:09 +01:00
Joanne Steiner
d74def2ed8 Dissocie les variables all_can_create entre adherent et club 2018-02-22 18:19:01 +01:00
klafyvel
aa513f7732 Merge branch 'fix_ban' into 'master' 
Fix valeur par défaut du search_time.

See merge request federez/re2o!78
 2018-02-21 00:01:41 +01:00
Hugo LEVY-FALK
c5255a15bc Fix valeur par défaut du search_time. 2018-02-20 23:58:44 +01:00
klafyvel
19177f7f6e Merge branch 'fix_ban' into 'master' 
Fix des bans

See merge request federez/re2o!77
 2018-02-20 22:28:48 +01:00
Hugo LEVY-FALK
36b038bec1 Fix des bans 2018-02-20 22:23:52 +01:00
chirac
489439fd63 Merge branch 'fix_time' into 'master' 
Fix l'évaluation de la date, non plus à l'import

See merge request federez/re2o!76
 2018-02-17 07:43:54 +01:00
Gabriel Detraz
bdd28c7aae Fix l'évaluation de la date, non plus à l'import 2018-02-17 07:40:49 +01:00
klafyvel
5f9602ef10 Merge branch 'reverse_v6' into 'master' 
Export des prefix v6

See merge request federez/re2o!75
 2018-02-13 08:19:46 +01:00
Gabriel Detraz
ea497e56f3 Export des prefix v6 2018-02-13 02:22:36 +01:00
klafyvel
3116df935d Merge branch 'facto' into 'master' 
Factorisation des get__

See merge request federez/re2o!74
 2018-01-31 21:08:25 +01:00
Gabriel Detraz
79dfadc81c Factorisation des get__ 2018-01-31 19:43:56 +00:00
klafyvel
de51aaba8d Merge branch 'button' into 'master' 
Button

See merge request federez/re2o!73
 2018-01-31 09:20:13 +01:00
klafyvel
c2b4156957 Merge branch 'self_password' into 'master' 
Self password

See merge request federez/re2o!72
 2018-01-31 09:18:53 +01:00
klafyvel
54d1172eff Merge branch 'optimisations' into 'master' 
Optimisations

See merge request federez/re2o!71
 2018-01-31 09:14:47 +01:00
Gabriel Detraz
62aea40044 Et preferences 2018-01-31 06:44:20 +01:00
Gabriel Detraz
7e559a6598 Topologie et cotisations aussi avec label correct 2018-01-31 06:40:48 +01:00