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

3015 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Gabriel Le Bouder
af33c31738 logo euro au lieu du caractère 2018-08-12 18:30:54 +02:00
Gabriel Le Bouder
e515a5dfb9 fix de 582430d5afa6447f558448118a66fb3d3fabca44 2018-08-12 18:30:54 +02:00
grisel-davy
e68e2634ea on ne peut faire des recherches que si on en a le droit 2018-08-12 18:30:54 +02:00
grisel-davy
ec0b47ac05 réorganisation des onglets dasn la navbar 2018-08-12 18:30:54 +02:00
grisel-davy
c7a1d38b53 on ne voit la barre de recherche qu'avec les droits suffisants 2018-08-12 18:30:54 +02:00
Charlie Jacomme
7938c64a56 bug fix acl -> this system is not understanble, and is buggy 2018-08-12 18:30:54 +02:00
Charlie Jacomme
b24ef60d6a Preferences renamed in administration 2018-08-12 18:30:54 +02:00
Charlie Jacomme
018dae90fa update of footer and contributor text 2018-08-12 18:30:54 +02:00
Charlie Jacomme
2d41c8ba0b update contributors 2018-08-12 18:30:54 +02:00
grisel-davy
c16f635c48 frontend sur le profil 2018-08-12 18:30:54 +02:00
Charlie Jacomme
bb67127c3d media_url bug fix 2018-08-12 18:30:54 +02:00
Charlie Jacomme
51bfb5d6ce Aff_article template bug fix 2018-08-12 18:30:54 +02:00
grisel-davy
93f4983fb9 Suppresion du cache qui permetait de voir d'autres user 2018-08-12 18:30:54 +02:00
grisel-davy
5f4affd8ec Vu profil d'un autre user et solde correct 2018-08-12 18:30:54 +02:00
grisel-davy
8aefc37eca change couleur des panel heading en accordeon pour une meilleur comprehension 2018-08-12 18:30:54 +02:00
chirac
ee53be34ec Merge branch 'python2_radius' into 'dev' 
Python2 radius

See merge request federez/re2o!250
 2018-08-12 18:30:33 +02:00
Gabriel Le Bouder
0409031c40 removing spurius comment line 2018-08-12 18:24:48 +02:00
Charlie Jacomme
df5861424e radius, make python compatible, and add traceback 2018-08-12 18:24:48 +02:00
chirac
433a85f6c8 Merge branch 'python2_templatetag' into 'dev' 
templatetags python2 complient

See merge request federez/re2o!248
 2018-08-12 18:22:54 +02:00
Gabriel Le Bouder
e797eb89b2 templatetags python2 complient 2018-08-12 18:19:21 +02:00
chirac
6b484da4d3 Merge branch 'translate_global_msg' into 'dev' 
Allows to display a French or English general message based on user's language choice.

See merge request federez/re2o!252
 2018-08-12 18:13:00 +02:00
chirac
ed1a013c3f Rename instead of delete 2018-08-12 18:09:30 +02:00
Maxime Bombar
cd13c5240a Allows to display a French or English general message based on user's language choice. 2018-08-12 17:59:18 +02:00
chirac
e0f82c7d6d Merge branch 'python2_headers' into 'dev' 
Headers python2

See merge request federez/re2o!242
 2018-08-09 11:18:56 +02:00
Gabriel Detraz
c6db3283ee Headers python2 2018-08-09 11:15:57 +02:00