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

3082 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
jr-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