8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 01:16:27 +00:00
Commit graph

2872 commits

Author SHA1 Message Date
ba05a682f4 Handle empty emails 2020-04-21 19:22:13 +02:00
99cd24cec0 Add required for email field when necessary 2020-04-21 19:21:43 +02:00
42c15c1f5d Leave user email blank / null for compatilibity 2020-04-21 19:21:43 +02:00
f875e317ef Handle empty emails 2020-04-21 19:21:43 +02:00
chirac
e94b619116 Merge branch 'fix-98-new-edit-listright' into 'dev'
Fix #98

See merge request re2o/re2o!507
2020-04-21 19:09:14 +02:00
Hugo Levy-Falk
5df604e792 Fix dead code. 2020-04-21 18:17:47 +02:00
Hugo Levy-Falk
0dd0c614a4 Merge branch 'fix-98-new-edit-listright' of https://gitlab.federez.net/re2o/re2o into fix-98-new-edit-listright 2020-04-21 18:09:40 +02:00
Hugo Levy-Falk
90dc125355 Production version of VueJS 2020-04-21 18:08:18 +02:00
Hugo Levy-Falk
da0b820006 Fix #98 2020-04-21 18:03:03 +02:00
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
Hugo Levy-Falk
a3b352b29d Fix #98 2020-04-21 17:37:17 +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