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

2845 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Romain Garnier 1b64c8f95b Add translation for email error message 2020-04-19 18:21:38 +00:00
Jean-Romain Garnier 561315541e Move mail util function to seperate file 2020-04-19 20:15:23 +02:00
Jean-Romain Garnier 28c64c4eab Fix circular import of utils 2020-04-19 20:11:38 +02:00
Jean-Romain Garnier 7cb869809e Make emails throw timeout errors, and gracefully handle them 2020-04-19 20:06:34 +02:00
chirac 90dab4a380 Merge branch 'advanced_search_email_state' into 'dev' 
Add email state filter in advanced search

See merge request re2o/re2o!501
 2020-04-19 17:30:03 +02:00
Jean-Romain Garnier 739197d99f Add translations for advanced search email filter 2020-04-19 15:15:40 +00:00
Jean-Romain Garnier 0cddfd0da1 Show email state field in advanced search 2020-04-19 15:11:57 +00:00
Jean-Romain Garnier 1eec108db1 Add email state search filter 2020-04-19 17:07:29 +02:00
Jean-Romain Garnier 4d456c1d67 Merge branch 'fix_240' into 'dev' 
Fix #240

See merge request re2o/re2o!500
 2020-04-19 16:58:51 +02:00
Gabriel Detraz 6643feec6d Fix #240 2020-04-19 16:42:17 +02:00
Jean-Romain Garnier cdf93b0a2b Merge branch 'user_force_move_disabled_user_room' into 'dev' 
Add option to allow users to override another user's room, if that user is no longer active

See merge request re2o/re2o!495
 2020-04-19 15:21:16 +02:00
Gabriel Detraz cd9e13b195 Fix trads 2020-04-19 15:15:27 +02:00
Gabriel Detraz 41fb5e5c04 Simplify preferences, add all_room acl for users 2020-04-19 03:29:46 +02:00
Jean-Romain Garnier d1365e2c9e Make call to remove_user_room cleaner 2020-04-19 01:13:35 +02:00
Jean-Romain Garnier 86813b1a47 Forbid user from forcing out another user with a free access 2020-04-19 01:13:35 +02:00
Jean-Romain Garnier ae7f1aaf38 Add option enabling regular users to take a disabled user's room 2020-04-19 01:13:35 +02:00
chirac 4017850e7e Merge branch 'missing_invoice_template' into 'dev' 
Fix invoice template issues

See merge request re2o/re2o!499
 2020-04-18 22:53:32 +02:00
Jean-Romain Garnier adda6ec898 Copy default templates during install 2020-04-18 20:10:57 +00:00
Jean-Romain Garnier e1d6835f25 Fix wrong template used for invoices sent by email 2020-04-18 20:09:32 +00:00
Jean-Romain Garnier 94d9efcc0b Merge branch 'fix_#248' into 'dev' 
Fix #248

See merge request re2o/re2o!498
 2020-04-18 20:32:38 +02:00
Gabriel Detraz 79cfc6b6b7 Add logger message and rename var 2020-04-18 20:21:43 +02:00
Gabriel Detraz c8ede78c66 Fix doublons proprement en migration 2020-04-18 19:57:14 +02:00
Gabriel Detraz d1de4e365c Fix #248 2020-04-18 19:17:04 +02:00
Jean-Romain Garnier 614538eefe Merge branch 'fix_247' into 'dev' 
Fix 247

See merge request re2o/re2o!497
 2020-04-18 02:01:16 +02:00
Gabriel Detraz 288ca861b0 Fix #247 2020-04-18 01:55:45 +02:00
chirac f8b6044938 Merge branch 'choose_password_during_user_creation' into 'dev' 
Allow users to choose password during account creation

See merge request re2o/re2o!496
 2020-04-18 01:46:22 +02:00
Jean-Romain Garnier f3d8b70213 Add translations for statistics 2020-04-17 23:40:01 +00:00
Jean-Romain Garnier e339308318 Add email state statistics 2020-04-18 01:36:33 +02:00
Jean-Romain Garnier 309134286c Add missing migration 2020-04-17 23:13:36 +00:00
Jean-Romain Garnier cb1784142f Cleanup old Request objects in process_passwd and process_email 2020-04-18 01:03:41 +02:00
Jean-Romain Garnier 227511504e Fix translations 2020-04-17 22:52:30 +00:00
Jean-Romain Garnier 45637c8e26 Make email translations more consistent 2020-04-18 00:39:06 +02:00
Jean-Romain Garnier cb4ee419fc Remove duplicate translation 2020-04-18 00:33:18 +02:00
Jean-Romain Garnier 91b418e64f Add missing translations 2020-04-18 00:30:05 +02:00
Gabriel Detraz 9173f158a8 Don't forget to save 2020-04-18 00:16:27 +02:00
Gabriel Detraz c2f180896f Allow admin to modify email state 2020-04-18 00:12:22 +02:00
Jean-Romain Garnier 93dcc79cad Provide default value for email_change_date and don't allow it to be null 2020-04-17 21:13:16 +00:00
Jean-Romain Garnier 6620d14fc5 Make send_confirm_email_if_necessary clearer 2020-04-17 23:07:40 +02:00
Jean-Romain Garnier 1e2d8d44d1 Fix wrong state check in send_confirm_email_if_necessary 2020-04-17 22:57:41 +02:00
Jean-Romain Garnier 7eca43a0c5 Don't set User.email_change_date to None 2020-04-17 22:54:27 +02:00
Jean-Romain Garnier 1eeab86c84 Call user.confirm_mail in UserManager._create_user 2020-04-17 22:49:50 +02:00
Jean-Romain Garnier 01a52f88d3 Fix error in profil of users with an unverified email 2020-04-17 22:20:45 +02:00
Jean-Romain Garnier cb99843c2b Ensure confirmation email tokens are deleted if no longer valid 2020-04-17 20:12:30 +00:00
Gabriel Detraz 7c0e694f61 Test sur le mot primaire au lieu du mot de pass radius 2020-04-17 22:08:40 +02:00
Jean-Romain Garnier f7259ae69b Improve check did_set_initial_passwd in new_user 2020-04-17 21:18:13 +02:00
Gabriel Detraz e6680e0717 Remove code mort 2020-04-17 21:15:27 +02:00
Jean-Romain Garnier 00b62e1fdc Correctly send a confirmation email 2020-04-17 19:11:24 +00:00
Jean-Romain Garnier 10243e1e72 Save before checking if confirmation email should be sent 2020-04-17 20:53:10 +02:00
Jean-Romain Garnier be5226fcdd Add missing __original_email init 2020-04-17 20:50:47 +02:00
Jean-Romain Garnier e169b51759 Always send confirmation email, except for fully-archived users 2020-04-17 20:50:26 +02:00