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

1948 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
chirac
1529d07b48 Merge branch 'fix_ldap_searc' into 'dev' 
Update schema.ldiff, limit de recherche à 50000

See merge request federez/re2o!241
 2018-08-09 11:06:00 +02:00
chirac
e270a738f2 Update schema.ldiff, limit de recherche à 50000 2018-08-09 11:04:47 +02:00
chirac
58c7b64de1 Merge branch 'get_mail_func' into 'dev' 
Fix bug evaluation des emailaddress + func get_mail sur user

See merge request federez/re2o!240
 2018-08-09 00:25:17 +02:00
Gabriel Detraz
50265a5c4b Fix bug evaluation des emailaddress + func get_mail sur user 2018-08-09 00:23:29 +02:00
chirac
ddce1892b7 Merge branch 'fix_firewall_synth' into 'dev' 
FIx la synthaxe correcte pour iptables

See merge request federez/re2o!239
 2018-08-09 00:04:50 +02:00
Gabriel Detraz
d3033e8f48 FIx la synthaxe correcte pour iptables 2018-08-09 00:03:44 +02:00
chirac
5723d39af0 Merge branch 'fix_cnames' into 'dev' 
Fix cnames

See merge request federez/re2o!238
 2018-08-08 23:57:39 +02:00
Charlie Jacomme
bb12346132 Fix cnames 2018-08-08 12:07:31 +02:00
chirac
ad1ce4ed08 Merge branch 'api_mail_aliases' into 'dev' 
add info for mail aliases export

See merge request federez/re2o!237
 2018-08-08 11:58:04 +02:00
Charlie Jacomme
1c8fb84f3c add info for mail aliases export 2018-08-08 11:57:22 +02:00
chirac
8e85dc1699 Merge branch 'mx_not_unique' into 'dev' 
mx not uniques, same mx for several extensions

See merge request federez/re2o!233
 2018-08-07 18:02:49 +02:00
Charlie Jacomme
96480ae588 mx not uniques, same mx for several extensions 2018-08-07 18:02:34 +02:00
chirac
a3ebf34601 Merge branch 'typos_and_fix_radius' into 'dev' 
Fix des erreurs, et améliore la lisibilité des logs

See merge request federez/re2o!236
 2018-08-07 18:01:17 +02:00
Gabriel Detraz
ef2101e0c5 Fix des erreurs, et améliore la lisibilité des logs 2018-08-07 17:22:58 +02:00
chirac
2b4680b54d Merge branch 'reverse_dns_zones' into 'dev' 
Reverse dns zones

See merge request federez/re2o!232
 2018-08-07 11:09:44 +02:00
Charlie Jacomme
b89823faa1 we want full ndd for ns and mx 2018-08-07 10:30:23 +02:00
Charlie Jacomme
b9a4dd6d65 ptr are empty if revere disabled 2018-08-07 09:57:59 +02:00