Commit Graph

259 Commits

Author SHA1 Message Date
1a9d495ca7 Merge branch 'taiste' into tinople/css-rewrite-taiste 2023-03-14 12:27:41 +01:00
87b5ff12c5 Implements #520 2023-03-14 12:15:35 +01:00
6f6d65b663 Fix notification (details in description)
- Fix the dot being displayed when the user has 0 notifications.
- Added a message when there is no unread notification to be displayed.
2023-03-14 11:54:30 +01:00
02eb768033 Swapped bottom message for discord link of the IT dep 2023-03-12 15:04:18 +01:00
fe31d8cfda Fix SAS being accessible for non-connected users (wtf) 2023-03-12 14:06:42 +01:00
550fac7752 Rework of the register page CSS & tweaked the login page 2023-03-12 13:54:46 +01:00
0167afe38f See description
- Reworked CSS of user photos tab
- Reworked Picture page CSS
- A message is now displayed on the user page when he's tagged on a picture in can't access (picture unavailable)
2023-03-10 11:05:09 +01:00
9e0b5b0b82 Merge branch 'partenariat-eurocks' into taiste 2023-03-09 17:14:34 +01:00
0cf203669f fix wording
Co-authored-by: Théo DURR <git@theodurr.fr>
2023-03-08 20:35:24 +01:00
559bfcac60 fix typo 2023-03-08 20:13:12 +01:00
db8a1ed0ab Added eurocks links to eboutic 2023-03-08 20:10:54 +01:00
b7da4c5727 Added text to moderated picture 2023-03-08 13:31:07 +01:00
238d41b84c See description
From the previous commit :
- Fixed permissions
- Fixed missing overlay when hovering a picture
- Added special overlay for picture to be moderated
- Removed JS to calculate how many columns are used
2023-03-08 00:58:44 +01:00
05febc60bd Merge branch 'master' into taiste 2023-03-04 16:35:41 +01:00
1ffa65b3a4 Import of #576 2023-03-03 12:24:38 +01:00
b7f20fed6c Galaxy (#575)
Co-authored-by: Skia <florent.jacquet@eshard.com>
2023-03-02 15:11:23 +01:00
73305c0b28 Implémentation 3DSv2 + résolution bugs eboutic + amélioration pages admin (#558)
Eboutic :
- Implémentation de la norme 3DSecure v2 pour les paiement par carte bancaire
- Amélioration générale de l'interface utilisateur
- Résolution du problème avec les caractères spéciaux dans le panier sur Safari
- Réparation du cookie du panier de l'eboutic qui n'était pas fonctionnel

Autre :
- Mise à jour de la documentation
- Mise à jour des dépendances Javascript
- Suppression du code inutilisé dans `subscription/models.py`
- Amélioration des pages administrateur (back-office Django)

Co-authored-by: thomas girod <56346771+imperosol@users.noreply.github.com>
Co-authored-by: Théo DURR <git@theodurr.fr>
Co-authored-by: Julien Constant <julienconstant190@gmail.com>
2023-01-09 20:53:12 +01:00
fe9e5ce861 integration of 3D secure v2 for eboutic bank payment 2022-11-30 22:52:56 +01:00
3c1724fa81 Add warning message when user has no birthdate 2022-11-15 21:07:50 +01:00
8b09ba2924 refonte de la boutique en ligne 2022-10-30 12:33:21 +01:00
Sli
0e5c8b53b0 Add missing translations and update doc 2022-08-07 16:45:18 +02:00
cfb6b34630 Updated roles to be more inclusive 2022-02-18 16:30:45 +01:00
d8b69e9b45 Updated text and translations to be more inclusive 2021-11-18 16:24:14 +01:00
c6a3677cc5 Fixed duplicated translation 2021-11-05 21:11:52 +01:00
707459acd6 Changed word 'Godfather' to 'Family' 2021-11-05 21:01:19 +01:00
b8aabc466c Fixed locales
+Pronoun description on the user's profile

Signed-off-by: Ailé <03ht@theodurr.fr>
2021-11-05 20:28:37 +01:00
677a9da469 Merge branch 'master' into gender_options 2021-10-11 17:13:06 +02:00
1f7752d457 Add pronouns to profile ; Update gender settings
Add pronouns to option list in profile
Modify "Sex" translation to "Genre"
Added "Other" to sex option list (alongside Man and Woman)

update DB,add default value to Pronouns field

Update views.py
2021-10-06 14:12:34 +02:00
Cyl
61a40c47d2 [com]: add helper_text for resolution and format of poster 2021-09-29 16:09:05 +02:00
1a091951e8 Added new subscription for the new CA offer 2021-09-28 01:11:23 +02:00
24c0a21cc1 locale: update with latest code version 2021-04-23 12:02:03 +02:00
aaf1adaaa1 sith: Added a new subscription 2020-08-30 23:53:19 +02:00
Och
797ca0f926 settings: Added a new subscription 2020-06-18 00:23:51 +02:00
fb8faacddc trombi: raw tool for trombi admins to add a club membership to a trombi member 2020-03-22 16:14:37 +01:00
e634cda318 core/counter: add generic operation logs and implements it for Sellings and Refilling deletions 2019-11-14 01:14:44 +01:00
29ee1b05af Merge branch 'master' into 'add-account-amount'
# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
2019-10-28 15:48:54 +01:00
413c613c9f Fix translation for basket account amount 2019-10-21 22:06:56 +02:00
53a7633700 uv: Add error handler to uv autofill 2019-10-21 10:34:46 +02:00
4759551c16 Autofull UV small changes 2019-10-20 17:09:36 +02:00
b057dbfd60 Initial add account amount in eboutic 2019-10-18 21:41:39 +02:00
bddb88d97f Comment UV API and fix little bugs 2019-10-18 18:13:53 +02:00
Cyl
aac4e3b99c Minor fix for requestGala 2019-10-14 00:32:11 +02:00
5a55a6c642 E-ticket link is sent in the email 2019-10-13 19:02:25 +02:00
65c3483c1f core:login allow the user to create an account when not logged 2019-10-13 18:43:30 +02:00
5a3f90fd28 core: fix error 500 with expired reset password links 2019-09-10 16:56:58 +02:00
a69f7b12b1 pedagogy: add script to remove all previous doubled comments 2019-09-04 20:49:17 +02:00
Zar
dc9111dbcd SUBSCRIPTIONS: 5 new discounted subscriptions for integration 2019-08-29 19:06:58 +02:00
Cyl
9e0c4e70d4 [COM] Make the news visible for non-authenticated user and birthday visible for subriber only 2019-08-28 20:40:31 +02:00
f052d307d7 pedagogy: make report button less visible and author more important 2019-07-08 23:16:53 +02:00
f15971cecf pedagogy: simplify moderation form for user 2019-07-08 17:34:23 +02:00