rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-10-31 23:22:49 +00:00
Code Issues Releases Wiki Activity
1914 commits 211 branches 14 tags 12 MiB
Commit graph

1914 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gabriel Detraz
4d93c6db6a Fix history et i18n 2018-07-29 20:13:10 +02:00
chirac
feddc3f69b Conflicts fix switch_conf_json 
# Conflicts:
#   re2o/templatetags/acl.py
#   re2o/views.py
#   topologie/templates/topologie/aff_port.html
 2018-07-29 20:02:20 +02:00
chirac
12b6f74a13 Merge branch 'Dname' into 'master' 
Dname

See merge request federez/re2o!192
 2018-07-29 17:25:11 +02:00
chirac
4e9b0586ed Update models.py alignement 2018-07-29 16:45:12 +02:00
chirac
95dc427dc4 Merge branch 'master' into 'Dname' 
# Conflicts:
#   re2o/templatetags/acl.py
 2018-07-29 13:57:53 +02:00
chirac
c977eccafd Update aff_dname.html 2018-07-29 13:56:19 +02:00
chirac
9be8ca1cf4 Merge branch 'easier_acl' into 'master' 
Fix acl.py lower

See merge request federez/re2o!206
 2018-07-28 23:16:56 +02:00
chirac
53079c0a9e Fix acl.py lower 2018-07-28 23:13:51 +02:00
chirac
ac7c847354 Merge branch 'easier_acl' into 'master' 
Suppression du dictionnaire  dans re2o/templatetags/acl.py

See merge request federez/re2o!205
 2018-07-28 19:37:00 +02:00
Hugo LEVY-FALK
b5513db8ae Suppression du dictionnaire de mort dans re2o/templatetags/acl.py 2018-07-26 20:11:13 +02:00
Maël Kervella
1336b096a7 Fix link for membership 2018-07-25 18:57:28 +00:00
Maël Kervella
939d5326aa Fix if-else 2018-07-25 18:46:48 +00:00
Maël Kervella
74086539c0 translation 2018-07-25 18:43:28 +00:00
Maël Kervella
45676ef669 Fix indentation and missing div 2018-07-25 18:28:13 +00:00
chirac
af35507c6d Merge branch 'new_profil' into 'master' 
New profil

See merge request federez/re2o!197
 2018-07-24 22:39:04 +02:00
chirac
55ebc4c166 Merge branch 'Fix_mr_190' into 'master' 
Fix ticks

See merge request federez/re2o!202
 2018-07-24 12:01:55 +02:00
Maël Kervella
4bd0be94ed Translate to english 2018-07-23 22:04:21 +00:00
Gabriel Detraz
7631ea6c5f Correct credit for dname 2018-07-23 21:49:27 +00:00
Charlie Jacomme
342b7c1173 serializers pour dnames 2018-07-23 21:49:27 +00:00
Charlie Jacomme
a5988e29b8 migrations for dname 2018-07-23 21:49:27 +00:00
Charlie Jacomme
fc176a60c1 New DNAME model 2018-07-23 21:49:26 +00:00
Maël Kervella
a854174954 Fix shit 2018-07-23 21:41:30 +00:00
chirac
41cd115f51 Merge branch 'ticks' into 'master' 
Fix #143

Closes #143

See merge request federez/re2o!190
 2018-07-23 23:12:54 +02:00
moamoak
7457d840aa Merge branch 'python_legacy' into 'master' 
Legacy shaebang pour python2

See merge request federez/re2o!195
 2018-07-23 19:57:04 +02:00
Hugo LEVY-FALK
cf1057b717 utilisation du filtre tick partout où des booléens sont affichés. 2018-07-23 13:41:17 +00:00
Grizzly
2e1f4fa425 deplacement du templatetags et nettoyage du template 2018-07-23 13:17:29 +00:00
Grizzly
3777ec0f3a prise en compte des type non booléens 2018-07-23 13:17:29 +00:00
Grizzly
b8c50385fc ajout d'un templatetag tick pour afficher les booléens 2018-07-23 13:17:29 +00:00
chirac
137b3409c6 Update authentication.py 2018-07-23 11:05:01 +02:00
Gabriel Detraz
7dcd32cb1e Imports corrects 2018-07-23 00:05:59 +02:00
grisel-davy
9321e6b5ed Envoi le la variable d'activation du solde 2018-07-23 00:01:01 +02:00
grisel-davy
6b9896143f Prise en compte du bannissement et déployement des des infos si clique dans les titres 2018-07-23 00:00:37 +02:00
grisel-davy
c5af76f963 Changement des couleurs et prise en ompte de l'activation du solde 2018-07-22 23:59:57 +02:00
Gabriel Detraz
96318b7265 Legacy shaebang pour python2 2018-07-22 22:59:49 +02:00
chirac
a84e8b5575 Merge branch 'fix_65_history' into 'master' 
fix #65, gestion propre de l'historique.

Closes #65

See merge request federez/re2o!186
 2018-07-22 22:22:19 +02:00
Hugo LEVY-FALK
c7bf295838 i18n sur le title du bouton historique 2018-07-22 22:18:31 +02:00
klafyvel
f6a152f033 Merge branch 'fix_126' into 'master' 
Fix #126

Closes #126

See merge request federez/re2o!188
 2018-07-22 13:16:55 +02:00
klafyvel
5dc21ea054 Merge branch 'fix_#131' into 'master' 
Fix #131

Closes #131

See merge request federez/re2o!189
 2018-07-22 13:11:49 +02:00
moamoak
1438947095 Merge branch 'fix_24_add_404_page' into 'master' 
Fix #24 : adds a 404 page.

Closes #24

See merge request federez/re2o!185
 2018-07-22 00:15:39 +02:00
Hugo LEVY-FALK
8d6439f13b Regroupement avec l'erreur 500. 2018-07-20 20:12:03 +02:00
Hugo LEVY-FALK
2ee17b370b Passage par flags plutôt que par valeurs 2018-07-20 19:54:03 +02:00
Gabriel Detraz
2e6df9c235 Fix #131 2018-07-20 19:20:01 +02:00
moamoak
7cafc9e99d Merge branch 'get_shadow_expirefunc' into 'master' 
Function for shadow expire

See merge request federez/re2o!187
 2018-07-20 13:43:07 +02:00
chirac
6d8aeb6101 Update views.py 2018-07-20 12:59:24 +02:00
chirac
0bec40de58 Update models.py 2018-07-20 12:57:54 +02:00
Gabriel Detraz
fe378e7909 Function for shadow expire 2018-07-19 20:47:56 +02:00
Gabriel Detraz
11a59ee553 Fix #126 2018-07-19 20:37:01 +02:00
Hugo LEVY-FALK
fa6614adb5 i18n pour l'historique 2018-07-19 12:43:19 +02:00
Hugo LEVY-FALK
6b945bf322 fix #65, gestion propre de l'historique. 2018-07-19 12:30:15 +02:00
Hugo LEVY-FALK
f8796c6d04 Fix #24 : adds a 404 page. 2018-07-17 00:34:27 +02:00