Commit Graph

2371 Commits

Author SHA1 Message Date
thomas girod
9188565a86
Merge pull request #501 from ae-utbm/ci-cl-edit
Ci cl edit
2022-12-01 11:14:56 +01:00
Thomas Girod
4d7d22c337 edit yml to avoid git conflict when deploying on test 2022-12-01 10:07:03 +01:00
thomas girod
b58116b023
Merge pull request #500 from ae-utbm/eboutic-3DSv2-patch
integration of 3D secure v2 for eboutic bank payment
2022-11-30 23:10:53 +01:00
Thomas Girod
fe9e5ce861 integration of 3D secure v2 for eboutic bank payment 2022-11-30 22:52:56 +01:00
thomas girod
e43d53e564
Merge pull request #497 from ae-utbm/eboutic-patch
Correct wrong et_autoanswer url
2022-11-16 23:47:24 +01:00
Thomas Girod
d4a5039efc correct wrong et_autoanswer url 2022-11-16 23:33:22 +01:00
Thomas Girod
35506e0175 Revert "Merge pull request #496 from ae-utbm/eboutic-patch"
This reverts commit 1c27831f92, reversing
changes made to b92580943a.
2022-11-16 23:31:34 +01:00
thomas girod
1c27831f92
Merge pull request #496 from ae-utbm/eboutic-patch
hide bank payment button during investigation for bug
2022-11-16 22:17:04 +01:00
Thomas Girod
cdbf07a835 hide bank payment button during investigation for bug 2022-11-16 22:14:16 +01:00
thomas girod
b92580943a
Merge pull request #495 from ae-utbm/eboutic-patch
Eboutic patch
2022-11-16 20:57:32 +01:00
Thomas Girod
60eff1000f second patch on eboutic 2022-11-16 20:41:24 +01:00
thomas girod
96510b270d
bux fixing on new eboutic (#493)
- les alt des images des produits n'étaient pas bonnes
- les noms de produits avec une apostrophe dedans n'étaient pas cliquables
2022-11-16 19:08:58 +01:00
thomas girod
1281104d96
Merge pull request #490 from ae-utbm/taiste
Eboutic
2022-11-16 17:04:13 +01:00
Thomas Girod
3c1724fa81 Add warning message when user has no birthdate 2022-11-15 21:07:50 +01:00
Julien Constant
1630af4fbd
Merge pull request #489 from TheRolfFR/remove-pinktober
Removing pinktober for AE
2022-11-14 21:04:58 +01:00
Yann LV
e76e2b1537 Removing pinktober for AE 2022-11-14 20:40:19 +01:00
Thomas Girod
6c276dc596 resolved crash when user has no birthdate 2022-11-12 13:59:58 +01:00
thomas girod
d3c115e3f9
Merge pull request #477 from imperosol/eboutic
Refonte de la boutique en ligne
2022-10-31 16:28:56 +01:00
Thomas Girod
c245ef7149 refonte de la boutique en ligne 2022-10-31 16:15:16 +01:00
Thomas Girod
8b09ba2924 refonte de la boutique en ligne 2022-10-30 12:33:21 +01:00
thomas girod
52eb310f95
Merge pull request #486 from ae-utbm/taiste-ci-cl
add yaml config files for test deployment
2022-10-30 11:04:38 +01:00
Thomas Girod
5bff38fc7b add yaml config files for test deployment 2022-10-28 01:41:53 +02:00
Thomas Girod
2813a59323 Revert "add yaml config files for taiste deployment"
This reverts commit 89d6db4208.
2022-10-28 01:35:46 +02:00
Thomas Girod
eef33fa263 Revert "revert push to wrong branch"
This reverts commit 241d3cea53.
2022-10-28 01:35:34 +02:00
Thomas Girod
241d3cea53 revert push to wrong branch 2022-10-28 01:10:00 +02:00
Thomas Girod
89d6db4208 add yaml config files for taiste deployment 2022-10-28 01:08:12 +02:00
thomas girod
e0ad288cf4
Suppression des appels à la db de l'ancien site (#483) 2022-10-19 16:26:30 +02:00
TheRolf
f4d7fae8ca
Merge pull request #482 from ae-utbm/pinktober-patch-patch
Patch to fix the pinktober patch
2022-10-13 20:56:00 +02:00
Yann LV
95a7493fc1 Patch to fix the pinktober patch 2022-10-13 20:50:18 +02:00
thomas girod
8243dbcbef
mend pinktober logo (#481)
* mend pinktober logo

* Increased contrast for links

Co-authored-by: Théo DURR <git@theodurr.fr>
2022-10-12 08:47:06 +02:00
Théo DURR
c3a4071627
Edited navbar for pinktober (#480)
Design by @TheRolfFR
2022-10-11 21:55:19 +02:00
Alexandre
cef3f22e0d
Merge pull request #476 from ae-utbm/lsacienne/change_banner_to_invitation
Return to classical weekmail banner
2022-09-26 08:18:15 +02:00
lsacienne
c206b965ad
Return to classical weekmail banner 2022-09-25 21:44:56 +02:00
Julien Constant
e868946fd7
Merge pull request #475 from imperosol/patch-1
update link for poetry install
2022-09-25 17:42:06 +02:00
Alexandre
254044c36b
Merge pull request #474 from ae-utbm/lsacienne/change_banner_to_invitation
💄 Modification of banner
2022-09-25 17:26:48 +02:00
thomas girod
c695d6f7a0
update link for poetry install 2022-09-25 12:06:29 +02:00
lsacienne
feef855f01
💄 Modification of banner 2022-09-21 22:12:35 +02:00
Julien Constant
b3a48ca5af
Merge pull request #471 from ae-utbm/remove-gitlab-files
Added back the **git** .mailmap file
2022-09-11 23:54:03 +02:00
Julien Constant
f3a52d094e
Merge pull request #472 from ae-utbm/lsacienne/change_banner
💄 Modification of banner
2022-09-11 23:37:43 +02:00
lsacienne
2901bd919f 💄 Modification of banner 2022-09-11 23:17:29 +02:00
Julien Constant
0396a5bf2b
Added back the **git** .mailmap file 2022-09-09 13:59:01 +02:00
Julien Constant
b48ad16f04
Merge pull request #470 from ae-utbm/remove-gitlab-files
Remove old GitLab files
2022-09-02 20:13:20 +02:00
Julien Constant
7cc6250860
Delete thank_you.md 2022-09-02 19:53:41 +02:00
Julien Constant
ae2e4b518d
Removed old GitLab files & may fix auto_assign for reviewers 2022-09-02 19:49:28 +02:00
Julien Constant
e9b9f3a62b
Merge pull request #469 from ae-utbm/remove-calendar-page
Switched Calendar link to Elections list link (as it was unused)
2022-09-02 19:43:47 +02:00
Julien Constant
3321669726
Switched Calendar link to Elections list link (as it was unused) 2022-09-02 19:34:16 +02:00
Théo DURR
21fc85670e
hot fix: Updated variable names & comments (#461)
- Fixed a wrong condition on the users subscribing history `read` permission.
- The comments are clearer and mentions how to specify clubs by their id.
2022-08-31 20:53:08 +02:00
Théo DURR
18a5ad6541
Merge pull request #460 from ae-utbm/integration-subscriptions 2022-08-31 18:51:40 +02:00
Théo DURR
71c5456225
Selected club members can now see subscriptions 2022-08-31 18:39:49 +02:00
Théo DURR
50e04164a2
Merge pull request #457 from ae-utbm/455-sentry-modal
Fixed some mess done on settings.py
2022-08-27 22:06:13 +02:00