8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-28 15:42:25 +00:00
Commit graph

331 commits

Author SHA1 Message Date
grisel-davy
98a5c01430 Remove profile_image 2020-10-22 15:39:30 +02:00
grisel-davy
3e3040550d Don't know why, but it solves issue #281 2020-10-17 01:06:24 +02:00
grisel-davy
89c805f61b Replace null by 0 in default value of duration_* 2020-10-17 00:34:56 +02:00
grisel-davy
bf298492f3 Merge branch 'fix_memb_adh' of https://gitlab.federez.net/federez/re2o into fix_memb_adh 2020-10-15 19:24:54 +02:00
grisel-davy
23698a1653 Fix the test for ventes in the set_active function. This function could be greatly improved if the duraction could not be null. 2020-10-15 19:21:16 +02:00
Gabriel Detraz
108154d6ce Fix query test for set_active function 2020-10-13 22:51:18 +02:00
grisel-davy
bb861eb089 split query into two filters 2020-10-08 23:24:37 +02:00
histausse
640499a9e2 Split the membership duration from the connection duration
changes:

Article:
remove COTISATION_TYPE, duration(_days), type_cotisation
add duration(_days)_connection, duration(_days)_membership

Vente:
remove COTISATION_TYPE, duration(_days), type_cotisation
add duration(_days)_connection, duration(_days)_membership
add method `test_membership_or_connection()` to replace
`bool(type_cotisation)`

Cotisation:
remove COTISATION_TYPE, date_start, date_end, type_cotisation
add date_start_con, date_end_con, date_start_memb, date_end_memb

create_cotis(date_start=False) -> create_cotis(date_start_con=False, date_start_memb=False)

+ migration
+ changes to use the new models in the remaining of the code
2020-10-08 22:22:48 +02:00
Gabriel Detraz
982200dc49 The reset_passw function should not set as not yet active users that have already been flaged active 2020-08-28 12:49:52 +02:00
Gabriel Detraz
69813bf38e Fix acl on check pseudo change by user 2020-08-07 19:05:37 +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
Leila
d94f7b44a3 Add thumbnail to user model 2020-05-17 12:51:05 +02:00
Gabriel Detraz
e82b170698 Rename rezo_rez_uid legacy and add some help text entries 2020-05-03 15:59:59 +02:00
Gabriel Detraz
60a55ea1e0 Fix permission check 2020-04-23 12:59:38 +02:00
Gabriel Detraz
24c000e743 Add self pseudo setting 2020-04-23 12:07:15 +02:00
91a4c35d3b Improve comments for User clean methods 2020-04-21 21:38:31 +02:00
Gabriel Detraz
e47b555343 Check email in user clean (factorise code) 2020-04-21 19:27:12 +02:00
b119bfeb65 Prevent user email from being null 2020-04-21 19:22:14 +02:00
51b3c52181 Leave user email blank / null for compatilibity 2020-04-21 19:22:14 +02:00
ba05a682f4 Handle empty emails 2020-04-21 19:22:13 +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
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
Gabriel Detraz
41fb5e5c04 Simplify preferences, add all_room acl for users 2020-04-19 03:29:46 +02:00
Gabriel Detraz
288ca861b0 Fix #247 2020-04-18 01:55:45 +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
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
93dcc79cad Provide default value for email_change_date and don't allow it to be null 2020-04-17 21:13:16 +00:00
6620d14fc5 Make send_confirm_email_if_necessary clearer 2020-04-17 23:07:40 +02:00
1e2d8d44d1 Fix wrong state check in send_confirm_email_if_necessary 2020-04-17 22:57:41 +02:00
7eca43a0c5 Don't set User.email_change_date to None 2020-04-17 22:54:27 +02:00
1eeab86c84 Call user.confirm_mail in UserManager._create_user 2020-04-17 22:49:50 +02:00
cb99843c2b Ensure confirmation email tokens are deleted if no longer valid 2020-04-17 20:12:30 +00:00
00b62e1fdc Correctly send a confirmation email 2020-04-17 19:11:24 +00:00
be5226fcdd Add missing __original_email init 2020-04-17 20:50:47 +02:00
e169b51759 Always send confirmation email, except for fully-archived users 2020-04-17 20:50:26 +02:00
f790dca202 Move some code away from the forms 2020-04-17 20:23:28 +02:00
a940f4f078 Fix marking email as verified 2020-04-17 18:32:38 +02:00
1e994cc1cc Automatically validate superuer's email address 2020-04-17 18:16:21 +02:00
43eadaa712 Replace STATE_EMAIL_NOT_YET_CONFIRMED with an email_state 2020-04-17 17:35:24 +02:00
Jean-Romain Garnier
60186071db Revert "Create STATE_SUSPENDED"
This reverts commit 2aef2ae3fa.
2020-04-17 17:03:54 +02:00
Jean-Romain Garnier
be7ffbcb90 Revert "Allow suspended users to login"
This reverts commit 91c51c50df.
2020-04-17 17:03:51 +02:00
91c51c50df Allow suspended users to login 2020-04-17 16:57:29 +02:00
2aef2ae3fa Create STATE_SUSPENDED 2020-04-17 16:53:46 +02:00
Gabriel Detraz
accd946edf Update headers 2020-04-17 16:48:27 +02:00