rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-04 05:04:06 +00:00
Code Issues Releases Wiki Activity
3179 commits 211 branches 14 tags 12 MiB
Commit graph

761 commits

Author SHA1 Message Date
Jean-Romain Garnier 2a4bd6bd79 Move should_send_confirmation_email in EmailSettingsForm for consistency 2020-04-17 17:04:00 +00:00
Jean-Romain Garnier 2532f8a142 Send confirmation email if necessary after editing EmailSettingsForm 2020-04-17 18:59:21 +02:00
Jean-Romain Garnier 5feef8ae17 Also update email state in EmailSettingsForm 2020-04-17 18:53:49 +02:00
Jean-Romain Garnier a940f4f078 Fix marking email as verified 2020-04-17 18:32:38 +02:00
Jean-Romain Garnier 30667eb259 Set email_change_date on user creation 2020-04-17 18:29:22 +02:00
Jean-Romain Garnier 91c031f287 Make check of pending email confirmation cleaner in profile.html 2020-04-17 18:16:53 +02:00
Jean-Romain Garnier 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
Jean-Romain Garnier 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
Jean-Romain Garnier 1484b6ec1e Delete old migration 2020-04-17 17:37:47 +02:00
Jean-Romain Garnier 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
Jean-Romain Garnier 91c51c50df Allow suspended users to login 2020-04-17 16:57:29 +02:00
Jean-Romain Garnier 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
Jean-Romain Garnier f8dfb072eb Allow users in the STATE_EMAIL_NOT_YET_CONFIRMED to reset their password 2020-04-17 16:32:37 +02:00
Jean-Romain Garnier 52e1a77044 Add missing translations 2020-04-17 16:03:37 +02:00
Jean-Romain Garnier 4fc24fcf47 Use get_full_name to generate confirm_email.html 2020-04-17 15:22:53 +02:00
Jean-Romain Garnier d01fe8c163 Notify users of suspension when they failed to confirm their email 2020-04-17 15:16:26 +02:00
Jean-Romain Garnier 8c99f54145 Fix disable_emailnotyetconfirmed task 2020-04-17 13:14:32 +00:00
Jean-Romain Garnier 289f6caa88 Improve various templates related to email confirmation 2020-04-17 12:54:28 +00:00
Jean-Romain Garnier 148fa3ec98 Fix wrong email showing up when editing user 2020-04-17 12:53:51 +00:00
Jean-Romain Garnier 1d21364515 Show warning with delay before account suspension for users 2020-04-17 14:08:54 +02:00
Jean-Romain Garnier a88a2e4848 Delete disabled users who never created an invoice 2020-04-17 13:43:04 +02:00
Jean-Romain Garnier a91866e741 Require login on confirmation email resend 2020-04-17 11:39:11 +00:00
Jean-Romain Garnier 04969abed3 Require user_edit permission to resend confirmation email 2020-04-17 13:17:18 +02:00
Jean-Romain Garnier 67b03827df Always sync email_change_date on manual state change 2020-04-17 11:13:56 +00:00
Jean-Romain Garnier b171ac64bb Move user email_change_date update on manual state change to seperate method 2020-04-17 13:01:10 +02:00
Jean-Romain Garnier 97ce17792b Fix overlapping conditions in User.state_sync 2020-04-17 12:53:03 +02:00
Jean-Romain Garnier bd153d53b2 Automatically consider email valid when user is set to STATE_ACTIVE 2020-04-17 12:50:22 +02:00
Jean-Romain Garnier 32a7c80133 Handle manually switching user state to/from STATE_EMAIL_NOT_YET_CONFIRMED 2020-04-17 12:41:33 +02:00
Jean-Romain Garnier 781c459db3 Fix string formatting error during email confirmation 2020-04-17 10:30:44 +00:00
Jean-Romain Garnier dbefd3a0d7 Fix confirm email template 2020-04-17 10:28:04 +00:00
Jean-Romain Garnier c41c723b0c Replace ConfirmMailForm with an html template 2020-04-17 12:25:42 +02:00
Jean-Romain Garnier 608f77b013 Improve template of email confirmation view 2020-04-17 11:38:05 +02:00
Jean-Romain Garnier 4322540077 Fix user referenced before assignment 2020-04-17 11:34:54 +02:00
Jean-Romain Garnier fca81fe906 Fix template shown when confirming send an email 2020-04-17 11:30:17 +02:00
Jean-Romain Garnier c76d5c7102 Improve template for resending a confirmation email 2020-04-17 11:22:29 +02:00
Jean-Romain Garnier f171eeb607 Add missing migrations 2020-04-17 00:17:18 +00:00
Jean-Romain Garnier 5e2e609474 Fix handling of confirmation email for front facing elements 2020-04-17 00:16:56 +00:00
Jean-Romain Garnier b91efa3d29 Start implementing user-facing confirmation email mechanics 2020-04-17 00:24:35 +02:00
Jean-Romain Garnier d4380f866f Add option to select number of days before disabling users 2020-04-16 23:14:19 +02:00
Jean-Romain Garnier 91edc7ed31 Create disable_emailnotyetconfirmed.py 2020-04-16 22:24:34 +02:00
Jean-Romain Garnier 8728bc69f5 Create EMAIL_NOT_YET_CONFIRMED state 2020-04-16 22:07:25 +02:00
Jean-Romain Garnier e57ec2ccd1 Add help text for password checkbox in user creation 2020-04-16 17:59:53 +00:00
Jean-Romain Garnier dbe8223efc Add translations for initial password related strings 2020-04-16 17:41:37 +00:00
Jean-Romain Garnier 8c827cc845 Add option to enable the password field during account creation 2020-04-16 17:41:33 +00:00
Jean-Romain Garnier 653a059725 Add optional fields to select password during user creation 2020-04-16 17:41:18 +00:00
Jean-Romain Garnier 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
Gabriel Detraz bfd79d44eb Fix #192 : Gpgfp validation et formatage 2018-12-28 20:59:29 +01:00
Gabriel Detraz e0fc3d3846 Menage ordre des fonctions du forms de users 2018-12-28 20:33:07 +01:00
Gabriel Detraz e2845c4690 No more pseudo with uppercase 2018-12-27 21:43:46 +01:00
Gabriel Detraz bf4f46ef19 Fix initial password for serviceuser 2018-12-22 21:30:48 +01:00
Alexandre Iooss 29fb5dc848 Remove generated locales from git tree 
Now compiled locale files (.mo) are generated on the server side.
This cleans up the git tree and make translation contributions much
easier to merge.

Please note that you will need to generate those files after each pull,
so remember to execute install_re2o.sh.
 2018-12-10 13:14:56 +01:00
Hugo LEVY-FALK 7a26aadaa9 fix migrations. 2018-12-09 00:10:59 +01:00
Grizzly c5b3f50955 Suppression de la ligne inutile 2018-12-08 23:56:59 +01:00
Grizzly ae5ef6a3c5 Utilise l'acl pour la vérification de la possibilité de création 2018-12-08 23:56:59 +01:00
Grizzly d17e71c53c machines prise en compte pour l'ajout automatique 2018-12-08 23:56:59 +01:00
Gabriel Detraz 6c6330dd4d Séparation entre utils et base (dossier re2o) 2018-11-15 18:59:06 +01:00
Gabriel Detraz 4317c39e0c Archive users have no longer services access and ldap sync 2018-11-15 17:15:45 +01:00
Gabriel Detraz caedb09d8f Fonction de check de l'alias via smtp 2018-11-15 17:15:19 +01:00
Gabriel Detraz bb952c0ba0 Email field pour clubs 2018-11-15 16:44:41 +01:00
Grizzly dd4143dbe2 Anonymisation des clubs 2018-11-09 20:05:21 +01:00
Grizzly 5bd3a929df Unification du mot de passe 2018-11-09 20:05:21 +01:00
Grizzly 0a4a0d5dd1 Anonymisation des donnée de l'utilisateur 2018-11-09 20:05:21 +01:00
Grizzly aff96b6541 Ajout du champ mail lors de la création d'un club 2018-11-08 19:56:38 +00:00
Gabriel Detraz d2f80bb39e Reparation ip search + formatage exact des macs 2018-11-03 19:27:54 +01:00
Fardale 386708c963 fix typo in users/locale/fr/LC_MESSAGES/django.po 2018-11-03 13:10:38 +01:00
Maxime Bombar b3dc063c20 Refactor welcome email : You're not a member if you didn't pay for membership 2018-11-01 23:40:11 +01:00
Maxime Bombar 94a30cd234 [Users] Archive an account disables email account and redirection 2018-10-31 16:30:56 +01:00
Maxime Bombar e4f877bbea [Users] Archived and Disabled accounts can't reset their passords 2018-10-31 16:17:51 +01:00
Gabriel Detraz f89d15abe0 Fix #183 : Display port of user 2018-10-27 15:26:50 +02:00
Gabriel Detraz 42d718ae8c Fix display facture + room + machine_name 2018-10-15 19:57:56 +02:00
detraz ae82289f6d Fix room display, possibilité de desactiver le champ room sur register 2018-10-15 19:20:23 +02:00
detraz 63734d4923 Fix bug dans le model mac, renvoie une liste de mac uniques 2018-10-14 22:52:48 +02:00
detraz 355e5d5a5e Fix suppression machines + factures 2018-10-13 15:32:27 +02:00
detraz 40eb6f146c Commande manage pour supprimer les users pas encore actifs 2018-10-11 15:15:00 +02:00
Fardale 52818dab63 Correct typo with get_port_profile 2018-10-05 21:48:06 +02:00
Gabriel Detraz a933cda18f Traductions, style et fixe de bugs sur la page d'enregistrement mac/room 2018-10-05 21:29:48 +02:00
Gabriel Detraz 7d6ab9f7e7 Fix edition des roles + kwargs edition user 2018-09-29 22:53:17 +02:00
edpibu 783c724f94 Fix affichage du solde 2018-09-26 15:29:56 +02:00
Alexandre Iooss 033c22bf1d Fix other font-awesome icons 2018-09-22 10:15:51 +02:00
Alexandre Iooss 4a4ba06112 Use debian font-awesome 
Rather than going online, use fonts-font-awesome debian package. Also
icons were updated to font-awesome 4.7.0 (in debian 9).
 2018-09-22 10:15:51 +02:00
Alexandre Iooss 9e578bf93d Fix merge request 294 2018-09-20 15:38:36 +02:00
edpibu 2db88d628a Added checkbox for GTU. 2018-09-20 14:35:01 +02:00