8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 11:23:10 +00:00
Commit graph

800 commits

Author SHA1 Message Date
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
4003856b47 Supprime l'avatar à la création (inutile/buggé) 2020-10-08 21:15:30 +02:00
Hugo Levy-Falk
2690a021d0 Fix can_view_app 2020-08-29 11:07:18 +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
Gabriel Detraz
e1f8254115 Translation of docstrings in user admin and forms 2020-06-01 18:21:21 +02:00
Gabriel Detraz
ee0fe7b24e Refactor serviceuser admin 2020-05-28 22:27:37 +02:00
Gabriel Detraz
eb5becb0db Fix user adherent/club creation form 2020-05-28 22:08:44 +02:00
chiahetcho
1ba03335e4 Correct django settings 2020-05-18 16:52:53 +02:00
Leila
a6e324bc60 Add migration file 2020-05-18 16:49:17 +02:00
Leila
c4fcf68077 Update image in filesystem when user changes image 2020-05-17 18:01: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
4190f4f39e Start implementing detailed history for event class 2020-04-25 12:31:18 +02:00
e537143efc Add missing translations 2020-04-25 01:43:25 +02:00
6371f11536 Add missing translations 2020-04-23 19:28:15 +00:00
4731e7da02 Add missing translations for detailed history 2020-04-23 18:13:37 +00:00
c4e034a5a6 Improve handling of detailed history button 2020-04-23 18:43:34 +02:00
Hugo Levy-Falk
6d3c86f99c Rebase dev 2020-04-23 17:01:07 +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
91cee11297 Add missing translations in logs 2020-04-22 23:25:19 +02:00
3fdcdd99b2 Fix CGU line formatting 2020-04-22 19:34:55 +00:00
5107a34a6e Add missing translations 2020-04-21 19:48:59 +00: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
24abff4106 Fix some email checks being bypassed for legacy users 2020-04-21 19:22:14 +02:00
b119bfeb65 Prevent user email from being null 2020-04-21 19:22:14 +02:00
eb4dd7ebe3 Make email check more pythonic 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
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
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
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
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
Gabriel Detraz
a1d1d04a23 Add help_text for password 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
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
739197d99f Add translations for advanced search email filter 2020-04-19 15:15:40 +00: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
Gabriel Detraz
288ca861b0 Fix #247 2020-04-18 01:55:45 +02:00
f3d8b70213 Add translations for statistics 2020-04-17 23:40:01 +00: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
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
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
01a52f88d3 Fix error in profil of users with an unverified email 2020-04-17 22:20:45 +02:00
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
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
00b62e1fdc Correctly send a confirmation email 2020-04-17 19:11:24 +00:00
10243e1e72 Save before checking if confirmation email should be sent 2020-04-17 20:53:10 +02: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
1ee4d91721 Make AdherentCreationForm code clearer 2020-04-17 20:41:02 +02:00
f790dca202 Move some code away from the forms 2020-04-17 20:23:28 +02:00
55cde72512 Confirm email after resetting password 2020-04-17 19:59:25 +02:00
e323972b96 Reset clean_notyetactive command to its correct state 2020-04-17 19:20:27 +02:00
Gabriel Detraz
bef496b3e2 Remove state_sync : est appellé en post-save de user 2020-04-17 19:18:35 +02:00
2a4bd6bd79 Move should_send_confirmation_email in EmailSettingsForm for consistency 2020-04-17 17:04:00 +00:00
2532f8a142 Send confirmation email if necessary after editing EmailSettingsForm 2020-04-17 18:59:21 +02:00
5feef8ae17 Also update email state in EmailSettingsForm 2020-04-17 18:53:49 +02:00
a940f4f078 Fix marking email as verified 2020-04-17 18:32:38 +02:00
30667eb259 Set email_change_date on user creation 2020-04-17 18:29:22 +02:00
91c031f287 Make check of pending email confirmation cleaner in profile.html 2020-04-17 18:16:53 +02:00
1e994cc1cc Automatically validate superuer's email address 2020-04-17 18:16:21 +02:00
Jean-Romain Garnier
fb191b4c8e Merge branch 'choose_password_during_user_creation' of gitlab.federez.net:re2o/re2o into choose_password_during_user_creation 2020-04-17 18:02:11 +02:00
3c5e538218 Fix error preventing migration 2020-04-17 18:01:35 +02:00
Gabriel Detraz
31c2255a3b Allow revert migrations 2020-04-17 17:42:23 +02:00
1484b6ec1e Delete old migration 2020-04-17 17:37:47 +02:00