8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-04 18:42:25 +00:00
Commit graph

797 commits

Author SHA1 Message Date
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
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
chirac
d88a2b7b8e Update resend_confirmation_email.html 2020-04-17 16:40:09 +02:00
f8dfb072eb Allow users in the STATE_EMAIL_NOT_YET_CONFIRMED to reset their password 2020-04-17 16:32:37 +02:00
52e1a77044 Add missing translations 2020-04-17 16:03:37 +02:00
4fc24fcf47 Use get_full_name to generate confirm_email.html 2020-04-17 15:22:53 +02:00
d01fe8c163 Notify users of suspension when they failed to confirm their email 2020-04-17 15:16:26 +02:00
8c99f54145 Fix disable_emailnotyetconfirmed task 2020-04-17 13:14:32 +00:00
289f6caa88 Improve various templates related to email confirmation 2020-04-17 12:54:28 +00:00
148fa3ec98 Fix wrong email showing up when editing user 2020-04-17 12:53:51 +00:00
1d21364515 Show warning with delay before account suspension for users 2020-04-17 14:08:54 +02:00
a88a2e4848 Delete disabled users who never created an invoice 2020-04-17 13:43:04 +02:00
a91866e741 Require login on confirmation email resend 2020-04-17 11:39:11 +00:00
04969abed3 Require user_edit permission to resend confirmation email 2020-04-17 13:17:18 +02:00
67b03827df Always sync email_change_date on manual state change 2020-04-17 11:13:56 +00:00
b171ac64bb Move user email_change_date update on manual state change to seperate method 2020-04-17 13:01:10 +02:00
97ce17792b Fix overlapping conditions in User.state_sync 2020-04-17 12:53:03 +02:00
bd153d53b2 Automatically consider email valid when user is set to STATE_ACTIVE 2020-04-17 12:50:22 +02:00
32a7c80133 Handle manually switching user state to/from STATE_EMAIL_NOT_YET_CONFIRMED 2020-04-17 12:41:33 +02:00
781c459db3 Fix string formatting error during email confirmation 2020-04-17 10:30:44 +00:00
dbefd3a0d7 Fix confirm email template 2020-04-17 10:28:04 +00:00
c41c723b0c Replace ConfirmMailForm with an html template 2020-04-17 12:25:42 +02:00
608f77b013 Improve template of email confirmation view 2020-04-17 11:38:05 +02:00
4322540077 Fix user referenced before assignment 2020-04-17 11:34:54 +02:00
fca81fe906 Fix template shown when confirming send an email 2020-04-17 11:30:17 +02:00
c76d5c7102 Improve template for resending a confirmation email 2020-04-17 11:22:29 +02:00
f171eeb607 Add missing migrations 2020-04-17 00:17:18 +00:00
5e2e609474 Fix handling of confirmation email for front facing elements 2020-04-17 00:16:56 +00:00
b91efa3d29 Start implementing user-facing confirmation email mechanics 2020-04-17 00:24:35 +02:00
d4380f866f Add option to select number of days before disabling users 2020-04-16 23:14:19 +02:00
91edc7ed31 Create disable_emailnotyetconfirmed.py 2020-04-16 22:24:34 +02:00
8728bc69f5 Create EMAIL_NOT_YET_CONFIRMED state 2020-04-16 22:07:25 +02:00
e57ec2ccd1 Add help text for password checkbox in user creation 2020-04-16 17:59:53 +00:00
dbe8223efc Add translations for initial password related strings 2020-04-16 17:41:37 +00:00
8c827cc845 Add option to enable the password field during account creation 2020-04-16 17:41:33 +00:00
653a059725 Add optional fields to select password during user creation 2020-04-16 17:41:18 +00:00
97151cd656 Fix permission allowing user to change groups 2020-02-20 09:30:41 +01:00
Jean-Romain Garnier
27b4bee02c Remove duplicate translation 2020-02-18 23:43:35 +01:00
Jean-Romain Garnier
a6be269eec Fix some translations 2020-02-18 23:04:38 +01:00
Gabriel Detraz
f91f284ed1 Fix js calculation of price - NaN bug 2019-12-27 17:00:41 +01:00
Laouen Fernet
c8ed48145c Add migrations for improved translations 2019-11-24 23:27:57 +01:00
Laouen Fernet
e26d21064e Improve internationalisation for email templates, scripts, commands and error messages 2019-11-24 23:27:57 +01:00
Laouen Fernet
7894e3267a Edit translations in users 2019-11-24 23:27:57 +01:00
Laouen Fernet
679e81ac7d Mark strings for translation in users 2019-11-24 23:27:56 +01:00
Hugo Levy-Falk
c4a104b3b6 I like my black.
Just ran black on the whoe repository. Fix #210.
2019-11-04 22:47:24 +01:00
Hugo Levy-Falk
ce862a3bde What Is Dead May Never Die 🧟 2019-11-04 17:49:17 +01:00
Hugo Levy-Falk
034b50bc58 Fix #189 2019-11-04 00:25:29 +01:00
Gabriel Detraz
d51f1e126d Fix réponses multiples, ne crash pas 2019-10-14 23:44:35 +02:00
Gabriel Detraz
745a30280c Display connection state for luser 2019-10-01 22:47:30 +02:00
Gabriel Detraz
051ec84f6e Multi_opp app optional start 2019-10-01 22:47:30 +02:00
Hugo Levy-Falk
a9194b405a Hello Lara :D
Just ran `find /var/www/re2o \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/Goulven/Lara/g'`.
2019-10-01 13:37:56 +02:00
Hugo Levy-Falk
693c2b5676 Fix #218 2019-10-01 13:35:06 +02:00
Hugo Levy-Falk
3be0b48c1b Fix #223 2019-09-30 15:21:17 +02:00
Hugo Levy-Falk
e404fa36ec Fix typo in User.can_view_all 2019-09-20 15:09:57 +02:00
Hugo Levy-Falk
b8d8c11cb0 Fix #151 2019-09-20 14:48:37 +02:00
Hugo Levy-Falk
d9f5514b58 Llamas are being oppressed. 2019-09-20 14:20:42 +02:00
Hugo Levy-Falk
b674025259 Fix #220 2019-09-20 14:13:35 +02:00
Hugo Levy-Falk
8df5a05d89 Do not display unnecessary warnings. 2019-09-19 22:55:16 +02:00
Hugo Levy-Falk
a9ebe331dd Fix #54 2019-09-19 22:55:16 +02:00
Hugo Levy-Falk
3f9d613c3d Fix #217 2019-09-19 22:55:16 +02:00
Gabriel Detraz
55b2ff076a NEVER user _ for var; conflicts with _( from trad + remove return True 2019-09-17 02:09:19 +02:00
Maxime Bombar
07071c7cf9 Fixes Issue 221 2019-09-10 17:09:26 +02:00
Hugo Levy-Falk
5e21a0c494 Fix check_selfpasswd 2019-09-08 15:17:17 +02:00
Hugo Levy-Falk
9b3bc1d053 ACL for applications. 2019-09-08 15:17:17 +02:00
Hugo Levy-Falk
90defb5fcc helpful acl messages for users.models 2019-09-08 15:17:17 +02:00
Hugo Levy-Falk
8ceb9ccc0c Fix migrations for MySQL 2019-09-08 14:59:00 +02:00
Hugo Levy-Falk
61ac9c558c Fix SQL commands for Postgres 2019-09-08 14:37:05 +02:00
Hugo Levy-Falk
cc6e1729dc Use django-ldapdb 1.3.0 2019-09-08 13:41:00 +02:00
Hugo Levy-Falk
8f5b302cbf Translation for GTU check. 2019-09-05 22:03:45 +02:00
Hugo Levy-Falk
d2d39f77de Fix #216 2019-09-05 22:03:45 +02:00
Hugo Levy-Falk
32aa2780ed Context is deprecated for rendering in Django1.11 2019-09-04 22:01:02 +02:00
Hugo Levy-Falk
20de9a45d9 fix buggy import which triggers AUTH_USER_MODEL refers to model 'users.User' that has not been installed 2019-09-04 22:00:08 +02:00
Grizzly
3a5fad0287 Separation des lists d'apps optionnelles pour eviter les erreurs d'import d'urls non présents 2019-08-11 20:30:54 +00:00
Grizzly
575e570d16 Cannonisation de l'affichage des apps optionnels sur le profil et imports conditionnels dans les urls 2019-08-11 19:24:40 +02:00
Grizzly
13afc5aaeb Dummy bouton, order des date, et affichage dans l'admin 2019-08-11 19:24:40 +02:00
Grizzly
609904c279 Ordonancement des tickets par date 2019-08-11 19:24:40 +02:00
Grizzly
a0293a11b3 Affichage des tickets sur le profil 2019-08-11 19:24:40 +02:00
Grizzly
c4259658eb Formulaire de creation de ticket 2019-08-11 19:24:40 +02:00
klafyvel
f69c88d8fe Fix LDAP deletion on single user full archiving. 2019-03-17 19:36:44 +01:00
klafyvel
2e2c72a9c3 Delete LDAPUser when full archiving a single user. 2019-03-17 19:30:30 +01:00
detraz
986cdcd90a Mass delete machine intelligent function 2019-03-17 17:56:46 +01:00
detraz
6e569566ed Avoid lazy eval problems with django queryset 2019-03-17 17:20:11 +01:00
Gabriel Detraz
e0194ba4e3 Fonctions mass_achivage pour objects multiples 2019-03-17 05:45:34 +01:00
Gabriel Detraz
706903f8c9 Add new full_archive state for user 2019-03-17 03:24:20 +01:00
detraz
c9b84047d2 Change les variables type en name ou machine_type pour éviter les confusions 2019-03-03 17:28:33 +01:00
Alexandre Iooss
56ec7a2df5 Update translation files 2019-02-12 09:12:45 +01:00
Alexandre Iooss
6780b91fe2 Make 'Manage the club' panel hover like other panels 2019-01-28 11:12:05 +01:00
Laouen Fernet
1c28c2d1bc add translations for users/ 2019-01-12 16:56:18 +01:00
Grizzly
cbd85ff0eb Suppression de l'historique 2019-01-09 18:14:06 +00:00
Grizzly
2524c09e8e Exclusion d'users, anonymisation machine et domaines 2019-01-09 17:46:21 +00:00
Gabriel Detraz
84889388c9 Avoid crash when 'email' field is not here 2019-01-05 23:13:28 +01:00
Gabriel Detraz
0b1c35900f Ajoute un reglage pour set tous les comptes actifs à l'initialisation 2019-01-05 18:33:26 +01:00
Gabriel Detraz
20e1ee3bb4 A granted user can set active at creation 2019-01-05 16:20:15 +01:00
Alexandre Iooss
45cda20c71 Rename user profile collapses 2019-01-01 18:53:11 +01:00
detraz
58ede00696 Hotfix autocreate 2018-12-31 00:13:01 +01:00
Alexandre Iooss
5ae1a53172 Add lines to split profile information 2018-12-30 12:35:41 +01:00
Alexandre Iooss
573e6c2ad2 Use a detailed list rather than a table on profile 2018-12-30 12:06:20 +01:00
Gabriel Detraz
97593920e5 Fix #150 : l'utilisateur asso et ses machines ont toujours accès à internet 2018-12-29 20:36:08 +01:00
Gabriel Detraz
e076c1da33 Re match direct 2018-12-28 23:23:22 +01:00