chirac
|
f390fca561
|
Merge branch 'split_api' into 'dev'
Split api
See merge request re2o/re2o!505
|
2020-04-21 18:02:06 +02:00 |
|
Gabriel Detraz
|
c02938b133
|
Remove useless imports
|
2020-04-21 17:48:42 +02:00 |
|
chapeau
|
72984c12e3
|
Fix of copy/paste errors
|
2020-04-21 17:19:16 +02:00 |
|
chapeau
|
035f447fdd
|
Clear api generation
|
2020-04-21 16:00:08 +02:00 |
|
chapeau
|
bdfd15b853
|
First draft of moving api functions into each apps
|
2020-04-21 16:00:08 +02:00 |
|
Gabriel Detraz
|
49eb837fc3
|
Remove old api
|
2020-04-21 16:00:08 +02:00 |
|
|
5d5c6bd17c
|
Merge branch 'fix_246' into 'dev'
Fix 246
See merge request re2o/re2o!504
|
2020-04-19 23:13:28 +02:00 |
|
Gabriel Detraz
|
436640d205
|
Give to django main user personnal fields
|
2020-04-19 23:07:32 +02:00 |
|
Gabriel Detraz
|
a1d1d04a23
|
Add help_text for password
|
2020-04-19 23:07:32 +02:00 |
|
Gabriel Detraz
|
96d5b05c84
|
Enforce password policy example file
|
2020-04-19 23:07:32 +02:00 |
|
Gabriel Detraz
|
6e7b2d75ed
|
Validate password using django settings password validator
|
2020-04-19 23:07:32 +02:00 |
|
Gabriel Detraz
|
06918e160c
|
Regression fix, display email local state
|
2020-04-19 23:07:32 +02:00 |
|
chirac
|
c2f3c17ab6
|
Merge branch 'handle_email_errors' into 'dev'
Handle email-related errors
See merge request re2o/re2o!503
|
2020-04-19 23:03:52 +02:00 |
|
|
f3ae1973a1
|
Catch socket exceptions in mail_send
|
2020-04-19 20:06:33 +00:00 |
|
|
528bfcdef3
|
Fix calls to invoice.save
|
2020-04-19 19:19:06 +00:00 |
|
|
d0777187f7
|
Move both send_mail utils to same file
|
2020-04-19 21:15:07 +02:00 |
|
|
c0ae68490c
|
Also catch ConnectionError when sending mails
|
2020-04-19 21:13:31 +02:00 |
|
|
1b64c8f95b
|
Add translation for email error message
|
2020-04-19 18:21:38 +00:00 |
|
|
561315541e
|
Move mail util function to seperate file
|
2020-04-19 20:15:23 +02:00 |
|
|
28c64c4eab
|
Fix circular import of utils
|
2020-04-19 20:11:38 +02:00 |
|
|
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 |
|
|
739197d99f
|
Add translations for advanced search email filter
|
2020-04-19 15:15:40 +00:00 |
|
|
0cddfd0da1
|
Show email state field in advanced search
|
2020-04-19 15:11:57 +00:00 |
|
|
1eec108db1
|
Add email state search filter
|
2020-04-19 17:07:29 +02:00 |
|
|
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 |
|
|
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 |
|
|
d1365e2c9e
|
Make call to remove_user_room cleaner
|
2020-04-19 01:13:35 +02:00 |
|
|
86813b1a47
|
Forbid user from forcing out another user with a free access
|
2020-04-19 01:13:35 +02:00 |
|
|
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 |
|
|
adda6ec898
|
Copy default templates during install
|
2020-04-18 20:10:57 +00:00 |
|
|
e1d6835f25
|
Fix wrong template used for invoices sent by email
|
2020-04-18 20:09:32 +00:00 |
|
|
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 |
|
|
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 |
|
|
f3d8b70213
|
Add translations for statistics
|
2020-04-17 23:40:01 +00:00 |
|
|
e339308318
|
Add email state statistics
|
2020-04-18 01:36:33 +02:00 |
|
|
309134286c
|
Add missing migration
|
2020-04-17 23:13:36 +00:00 |
|
|
cb1784142f
|
Cleanup old Request objects in process_passwd and process_email
|
2020-04-18 01:03:41 +02:00 |
|
|
227511504e
|
Fix translations
|
2020-04-17 22:52:30 +00:00 |
|
|
45637c8e26
|
Make email translations more consistent
|
2020-04-18 00:39:06 +02:00 |
|
|
cb4ee419fc
|
Remove duplicate translation
|
2020-04-18 00:33:18 +02:00 |
|