8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 23:43:47 +00:00
Commit graph

3283 commits

Author SHA1 Message Date
f5de596dff Fix of about page crash if no president or CGU file 2020-08-15 12:51:10 +02:00
Gabriel Detraz
7535050d4f Fix port edition crash with new convention for *_id 2020-08-08 23:56:32 +02:00
ee8948dfb6 Merge branch 'fix_register' into 'dev'
Replace full_clean with simple clean, fix interface registering on multi-database

See merge request re2o/re2o!551
2020-08-08 18:17:12 +02:00
Gabriel Detraz
ac28691065 Replace full_clean with simple clean, fix interface registering on multi-database 2020-08-08 14:54:30 +02:00
33e57839b8 Merge branch 'reply_to_on_comment' into 'dev'
Reply to on comment

See merge request re2o/re2o!550
2020-08-08 13:16:13 +02:00
Gabriel Detraz
7b89bf2e88 Add reply_to field on tickets comment 2020-08-07 19:51:55 +02:00
ed9c8fb333 Merge branch 'follow_up_ipv6_flag' into 'dev'
Don't use disabled ip for administration purpose

See merge request re2o/re2o!549
2020-08-07 19:32:43 +02:00
chirac
4333e5f804 Update comments models.py 2020-08-07 19:25:34 +02:00
Gabriel Detraz
ee3682087e Don't use disabled ip for administration purpose 2020-08-07 19:12:17 +02:00
3858571841 Merge branch 'fix_pseudo_creation_user' into 'dev'
Fix acl on check pseudo change by user

See merge request re2o/re2o!545
2020-08-07 19:09:25 +02:00
Gabriel Detraz
69813bf38e Fix acl on check pseudo change by user 2020-08-07 19:05:37 +02:00
Gabriel Detraz
13f759618f Update, need pil for radius 2020-08-05 22:52:16 +02:00
chirac
4fdeb81952 Merge branch 'dns_ipv6_disable' into 'dev'
add an 'active' field to ipv6 to signal the DNS to ignore them.

See merge request re2o/re2o!548
2020-08-04 22:56:31 +02:00
Jean-Marie Mineau
e8450f3f4c add an 'active' field to ipv6 to signal the DNS to ignore them. 2020-08-04 22:46:13 +02:00
Gabriel Detraz
1e6b12db6a Fix, can't serialize this var 2020-06-20 11:33:50 +02:00
klafyvel
4661511c87 Merge branch 'fix_install_script' into 'dev'
Fix sql command when using mysql on remote machine

See merge request re2o/re2o!547
2020-06-10 17:32:37 +02:00
af2b4d309c Fix sql command when using mysql on remote machine 2020-06-10 17:28:51 +02:00
chirac
755372b782 Merge branch 'extension_del_error_message' into 'dev'
Error messages when extension deletion are now more verbose

See merge request re2o/re2o!544
2020-06-09 23:48:59 +02:00
de4484625f rebase 2020-06-09 23:45:45 +02:00
chirac
01d9a1a596 Merge branch 'extension_domain_update' into 'dev'
Update domains when ip_type or machine_type are updated

See merge request re2o/re2o!543
2020-06-09 23:32:20 +02:00
chapeau
31c3441cfc Update models.py 2020-06-09 23:30:52 +02:00
f91dcf82c4 Refactoring 2020-06-09 23:24:32 +02:00
cb7acd2fc7 Translation 2020-06-09 23:24:32 +02:00
742f95f335 Add exception handling 2020-06-09 23:24:32 +02:00
ef33bc67c1 Optimisation of domains update 2020-06-09 23:24:32 +02:00
987ba3a33b Update domains when ip_type or machine_type are updated 2020-06-09 23:24:32 +02:00
klafyvel
ff180d7929 Update apt_requirements.txt 2020-06-07 19:11:34 +02:00
klafyvel
f55b84f767 Merge branch 'default_local_settings' into 'dev'
Add default values for local settings

See merge request re2o/re2o!542
2020-06-07 18:59:27 +02:00
788a1efee0 Suppression of ldap settings in default settings 2020-06-07 18:05:59 +02:00
5aa4c08a56 Add default values for local settings 2020-06-07 17:17:01 +02:00
klafyvel
d51da9ddfa Merge branch 'docstrings_in_english' into 'dev'
Docstring translation

See merge request re2o/re2o!520
2020-06-01 21:49:14 +02:00
Gabriel Detraz
b022c98a1c Translation of user app views + remove trailing spaces 2020-06-01 18:21:22 +02:00
Gabriel Detraz
c709a7e8b2 Final translation of users app 2020-06-01 18:21:22 +02:00
Laouen Fernet
9a3b395e6c Fix some translations in topologie/ 2020-06-01 18:21:22 +02:00
Laouen Fernet
9b39529fd2 Fix some translations in tickets/ 2020-06-01 18:21:21 +02:00
Laouen Fernet
dbf7485107 Fix some translations in preferences/ 2020-06-01 18:21:21 +02:00
Laouen Fernet
806a6a562e Fix some translations in logs/ 2020-06-01 18:21:21 +02:00
Laouen Fernet
99a3f7e9c5 Fix some translations in cotisations/ 2020-06-01 18:21:21 +02:00
Gabriel Detraz
e1f8254115 Translation of docstrings in user admin and forms 2020-06-01 18:21:21 +02:00
Laouen Fernet
fb9ae20f37 Add or translate some docstrings in machines/ 2020-06-01 18:21:21 +02:00
Laouen Fernet
3b697f9795 Add or translate some docstrings in topologie/ 2020-06-01 18:21:21 +02:00
Laouen Fernet
a4c3f77500 Add or translate some docstrings in preferences/ 2020-06-01 18:21:20 +02:00
Laouen Fernet
3ec05c68e5 Add some docstrings in search/ 2020-06-01 18:21:20 +02:00
Laouen Fernet
e52705edc3 Add some docstrings in multi_op/ 2020-06-01 18:21:20 +02:00
Laouen Fernet
b66a9230a0 Add some docstrings in tickets/ 2020-06-01 18:21:20 +02:00
Laouen Fernet
9f16601860 Add or translate some docstrings in logs/ 2020-06-01 18:21:20 +02:00
Gabriel Detraz
9fa2879d88 First step of docstring translation 2020-06-01 18:21:19 +02:00
chirac
023986f77e Merge branch 'fix-machine-display-name' into 'dev'
Let's have a useful displayed name for machines.

See merge request re2o/re2o!539
2020-06-01 14:00:50 +02:00
Hugo Levy-Falk
9f568d4fb9 Let's have a useful displayed name for machines. 2020-06-01 11:24:23 +02:00
chirac
98b2e132cc Merge branch 'feature-view-button' into 'dev'
I need a view button

See merge request re2o/re2o!538
2020-05-30 18:34:33 +02:00