rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-04 05:04:06 +00:00
Code Issues Releases Wiki Activity
2661 commits 211 branches 14 tags 12 MiB
Commit graph

2661 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gabriel Detraz bed24b5c1c Unusefull stuff 2019-10-01 22:47:30 +02:00
Gabriel Detraz dfe15ec23d Button to remove port of a room 2019-10-01 22:47:30 +02:00
Gabriel Detraz 2df79830b6 An optional app can possibly not have a pannel pref 2019-10-01 22:47:30 +02:00
Gabriel Detraz 745a30280c Display connection state for luser 2019-10-01 22:47:30 +02:00
Gabriel Detraz 6617d6a000 Fix affichage dans le dropdown adapté 2019-10-01 22:47:30 +02:00
Gabriel Detraz 6d76d0a5f7 Contact view on optional app... is optionnal 2019-10-01 22:47:30 +02:00
Gabriel Detraz 8a41a1af60 Fix bug affichage 2019-10-01 22:47:30 +02:00
Gabriel Detraz 051ec84f6e Multi_opp app optional start 2019-10-01 22:47:30 +02:00
chirac 9434da63af Merge branch 'bootstrap-accordion-ios' into 'dev' 
Bootstrap accordion ios

See merge request federez/re2o!452
 2019-10-01 21:59:38 +02:00
Jean-Romain Garnier e7679193b2 Bootstrap accordion ios 2019-10-01 21:59:38 +02:00
chirac 80328199c8 Merge branch 'better-vouchers' into 'dev' 
Better vouchers

See merge request federez/re2o!444
 2019-10-01 19:35:16 +02:00
Hugo Levy-Falk 6171f42b66 Get the right mandate when creating voucher. 2019-10-01 19:30:35 +02:00
Hugo Levy-Falk 5c0a4ce748 Fix form validation 2019-10-01 19:30:35 +02:00
Gabriel Detraz b38521db69 For my klafy : return best mandate possible 2019-10-01 19:30:34 +02:00
chirac 21f95fbc9d Simplify models.py 2019-10-01 19:30:34 +02:00
Hugo Levy-Falk 7db8872bc8 Delete CotisationsOption.pres_name and better migration. 2019-10-01 19:30:34 +02:00
Hugo Levy-Falk 621cdc9659 Try to make mandate edition fool-proof 2019-10-01 19:30:34 +02:00
Hugo Levy-Falk 6dd4e776c1 Make use of mandates everywhere. 2019-10-01 19:30:34 +02:00
Hugo Levy-Falk 75bb3658ac Add Mandate model 2019-10-01 19:30:34 +02:00
chirac 9c82a84c5f Merge branch 'hello-lara' into 'dev' 
Hello lara

See merge request federez/re2o!447
 2019-10-01 13:40:54 +02:00
Hugo Levy-Falk a9194b405a Hello Lara :D 
Just ran `find /var/www/re2o \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/Goulven/Lara/g'`.
 2019-10-01 13:37:56 +02:00
chirac 6e0a99cd50 Merge branch '218-archive-command' into 'dev' 
Resolve "Add a command to archive users"

See merge request federez/re2o!448
 2019-10-01 13:36:05 +02:00
Hugo Levy-Falk 693c2b5676 Fix #218 2019-10-01 13:35:06 +02:00
Hugo Levy-Falk e1575c09d4 Fix mass_delete of machine so that AccessPoint deletion is possible. 2019-10-01 13:35:05 +02:00
chirac 1ec299037e Merge branch '233-group-members-display' into 'dev' 
233 group members display

See merge request federez/re2o!449
 2019-09-30 15:21:26 +02:00
Hugo Levy-Falk 3be0b48c1b Fix #223 2019-09-30 15:21:17 +02:00
chirac 1eed57cf8f Merge branch '191-auto-accept-free-invoice' into 'dev' 
Resolve "Faire qu'une facture de 0 euros ait un paiement automatiquement accepté"

See merge request federez/re2o!450
 2019-09-30 15:20:45 +02:00
Hugo Levy-Falk 0cb9388cde Fix #191 2019-09-30 15:20:20 +02:00
chirac b47f094479 Merge branch 'remove-useless-fields-preferences-template' into 'dev' 
Remove useless fields preferences template

See merge request federez/re2o!446
 2019-09-30 15:19:00 +02:00
Hugo Levy-Falk eae1d9385d Remove preferences menu related to radius in topologie options, as it is no longer used. 2019-09-30 15:18:51 +02:00
arcas 4dfc752313 Merge branch 'remove-contributor-levy-arcas' into 'dev' 
Remove contributor levy arcas

See merge request federez/re2o!445
 2019-09-24 00:44:16 +02:00
klafyvel 657ef77bfe Remove contributor levy arcas 2019-09-24 00:44:16 +02:00
klafyvel b3f08673d6 Merge branch '224-Fix-Changing-Domain' into 'dev' 
[machines/views] Domain MUST be saved to get the right extension

See merge request federez/re2o!443
 2019-09-23 21:49:46 +02:00
Maxime Bombar b648078b4e [machines/views] Domain MUST be saved to get the right extension 2019-09-22 00:34:10 +02:00