8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-06-02 07:52:23 +00:00
Commit graph

2645 commits

Author SHA1 Message Date
Laouen Fernet fe4de10f7a Mark strings for translation in templates 2019-11-24 23:27:55 +01:00
Laouen Fernet 5d4d9d71bf Mark strings for translation in search 2019-11-24 23:27:55 +01:00
Laouen Fernet b5769bb1f8 Mark strings for translation in re2o 2019-11-24 23:27:55 +01:00
Laouen Fernet 038a11fb75 Mark strings for translation in preferences 2019-11-24 23:27:55 +01:00
Laouen Fernet a745e8cc9c Mark strings for translation in multi_op 2019-11-24 23:27:55 +01:00
Laouen Fernet ac5d8e2080 Mark strings for translation in machines 2019-11-24 23:27:55 +01:00
Laouen Fernet 07ce7bd8a7 Mark strings for translation in logs 2019-11-24 23:27:55 +01:00
Laouen Fernet 2454de2032 Mark strings for translation in cotisations 2019-11-24 23:27:55 +01:00
Laouen Fernet 3743a46bc5 Mark strings for translation in api 2019-11-24 23:27:55 +01:00
chirac 8624105378 Merge branch 'bug-massive-boostrap-form' into 'dev'
Fix massive fields sending incorrect data in POST request

See merge request federez/re2o!472
2019-11-24 23:23:11 +01:00
Jean-Romain Garnier 755e95e644 Fix massive fields sending incorrect data in POST request 2019-11-24 22:10:55 +00:00
chirac af05df6c85 Merge branch 'fix_debug_remains' into 'dev'
Fix klafy horrors

See merge request federez/re2o!470
2019-11-17 13:06:52 +01:00
Hugo Levy-Falk 09da1b4d43 Fix klafy horrors 2019-11-17 11:58:23 +00:00
chirac 5a83a577fa Merge branch 'display_preferences' into 'dev'
Add spaces where needed.

See merge request federez/re2o!469
2019-11-16 19:26:06 +01:00
Yoann Pétri 35ba5b6e49 Add spaces where needed. 2019-11-16 19:22:03 +01:00
chirac 540a8d0531 Merge branch '210-use-black-for-formatting' into 'dev'
Resolve "Use black for formatting"

See merge request federez/re2o!468
2019-11-04 23:16:57 +01:00
Hugo Levy-Falk c4a104b3b6 I like my black.
Just ran black on the whoe repository. Fix #210.
2019-11-04 22:47:24 +01:00
chirac 2460a7d2a0 Merge branch '229-kill-dead-code' into 'dev'
What Is Dead May Never Die 🧟

See merge request federez/re2o!467
2019-11-04 22:44:40 +01:00
Hugo Levy-Falk ce862a3bde What Is Dead May Never Die 🧟 2019-11-04 17:49:17 +01:00
chirac 180ba11a51 Merge branch '222-allow-short-time-membership' into 'dev'
Fix #222

See merge request federez/re2o!454
2019-11-04 16:45:37 +01:00
Hugo Levy-Falk 034b50bc58 Fix #189 2019-11-04 00:25:29 +01:00
Hugo Levy-Falk e0a65e4d04 Setup tests for Vente model. 2019-11-03 21:46:18 +01:00
Hugo Levy-Falk c76f32cf26 Fix #222 2019-11-03 19:55:37 +01:00
chirac c260d3889e Merge branch 'fix-edit-switch' into 'dev'
Fix typo in view edit_switch

See merge request federez/re2o!466
2019-11-03 19:54:58 +01:00
Hugo Levy-Falk 804d5a711b Fix typo in view edit_switch 2019-10-31 21:54:25 +01:00
klafyvel b5000ad367 Merge branch 'fix_date_summary' into 'dev'
Fix display affichage date summary

See merge request federez/re2o!465
2019-10-29 18:11:33 +01:00
Gabriel Detraz 9c28662058 Fix display affichage date summary 2019-10-29 17:49:23 +01:00
klafyvel ccab29ff9e Merge branch 'fix_ubuntu_tls' into 'dev'
Prevent crash with tls 1.3 and ubuntu (see...

See merge request federez/re2o!464
2019-10-21 16:59:34 +02:00
Gabriel Detraz 1385e8f458 Prevent crash with tls 1.3 and ubuntu (see https://github.com/FreeRADIUS/freeradius-server/issues/2385 ) 2019-10-21 16:36:49 +02:00
chirac 31fdb644a2 Merge branch 'fix-interface-edition' into 'dev'
Fix DomainForm usage.

See merge request federez/re2o!463
2019-10-17 20:25:00 +02:00
Hugo Levy-Falk 42f65bea6a Fix DomainForm usage. 2019-10-17 20:20:19 +02:00
klafyvel ef93bd7975 Merge branch 'fix_delete_set' into 'dev'
Fix delete_set form

See merge request federez/re2o!462
2019-10-16 12:26:26 +02:00
Gabriel Detraz 6a590570c5 Fix delete_set form 2019-10-16 12:23:01 +02:00
chirac 2c815ab98c Merge branch '212-feature-request-allow-to-define-ttl-for-dns-records' into 'dev'
Fix #212

See merge request federez/re2o!453
2019-10-16 12:18:53 +02:00
Hugo Levy-Falk 48ec3d353e default ttl to 0 2019-10-15 00:19:11 +02:00
Hugo Levy-Falk 13a06c1a67 TTL for DNAMEs 2019-10-15 00:19:11 +02:00
Hugo Levy-Falk aab6fa2ba0 Fix #212 2019-10-15 00:19:11 +02:00
klafyvel 0d8bc2c578 Merge branch 'fix_divers_autoregister' into 'dev'
Fix réponses multiples, ne crash pas

See merge request federez/re2o!461
2019-10-14 23:52:37 +02:00
Gabriel Detraz 47e67c3a40 Retourne au moins l'interface principale du switch 2019-10-14 23:47:52 +02:00
Gabriel Detraz d51f1e126d Fix réponses multiples, ne crash pas 2019-10-14 23:44:35 +02:00
klafyvel 5faf134690 Merge branch 'legal_notice' into 'dev'
Legal notice

See merge request federez/re2o!460
2019-10-12 17:07:05 +02:00
Gabriel Detraz aabacec83a Filter safe for info asso 2019-10-10 22:23:00 +02:00
Gabriel Detraz e38e304087 Display legal notice 2019-10-10 22:23:00 +02:00
klafyvel 59ce4829aa Merge branch 'multi_iptypes_switchs' into 'dev'
Multi iptypes switchs

See merge request federez/re2o!459
2019-10-10 19:25:42 +02:00
Gabriel Detraz 0b8cdb8e07 Fix : Permet d'avoir plusieurs blocs de switchs ordonnés sur le même sous-réseau (ex /24 dans /16) 2019-10-10 19:22:23 +02:00
klafyvel e98f3b2286 Merge branch 'fix_bugs_divers' into 'dev'
Fix bugs divers

See merge request federez/re2o!458
2019-10-10 19:19:03 +02:00
Gabriel Detraz 58c120410a Fix : affichage des tickets, évite un crash 2019-10-10 15:43:52 +02:00
Gabriel Detraz 144119c26a Fix : possibilité de mettre plusieurs clefs radius sans crash 2019-10-10 15:43:01 +02:00
Gabriel Detraz c5f96fee62 Fix : autorise blank pour message mail adhésion 2019-10-08 18:27:09 +02:00
klafyvel ff9f6e5cc2 Merge branch 'multi_op_app' into 'dev'
Multi op app

See merge request federez/re2o!451
2019-10-01 22:47:43 +02:00