klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-01 11:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,466 Commits 18 Branches 0 Tags 103 MiB
143713fac1
Commit Graph

2466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Théo DURR
c1e59a0676
Disabled galaxy feature (only visually) 2023-03-07 21:32:37 +01:00
Théo DURR
05febc60bd
Merge branch 'master' into taiste 2023-03-04 16:35:41 +01:00
thomas girod
a73fe598ef
repair user merging tool (#498) 2023-03-04 15:01:08 +01:00
Skia
b7f20fed6c
Galaxy (#575) 
Co-authored-by: Skia <florent.jacquet@eshard.com>
 2023-03-02 15:11:23 +01:00
Skia
585923c827
Add galaxy (#562) 
* style.scss: lint

* style.scss: add 'th' padding

* core: populate: add much more data for development

* Add galaxy
 2023-02-07 12:08:25 +01:00
thomas girod
394e17d599
resolved importError (#565) 2023-01-13 02:22:53 +01:00
thomas girod
59136850b8
Merge pull request #530 from ae-utbm/redirection_for_barmen 
redirect the user directly on counter when barman
 2023-01-11 23:24:45 +01:00
thomas girod
d726f4b1e8
Merge pull request #499 from ae-utbm/unify-account-creation 
Unify account id creation
 2023-01-11 13:26:00 +01:00
thomas girod
705b9b1e6a
Passage de vue à Alpine pour les comptoirs (#561) 
Vue, c'est cool, mais avec Django c'est un peu chiant à utiliser. Alpine a l'avantage d'être plus léger et d'avoir une syntaxe qui ne ressemble pas à celle de Jinja (ce qui évite d'avoir à mettre des {% raw %} partout).
 2023-01-10 22:26:46 +01:00
Thomas Girod
31e8ad8a3e redirect directly on counter if user is barman 2023-01-10 17:37:26 +01:00
thomas girod
99827e005b
upgrade re_path to path (#533) 2023-01-09 22:07:03 +01:00
Thomas Girod
751c8a8bc6 unify account_id creation 2023-01-09 21:40:38 +01:00
thomas girod
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
Théo DURR
37216cd16b
Updated lock file according to pyproject 2023-01-09 19:29:04 +01:00
Théo DURR
dae68638cf
Merge branch 'master' into taiste 2023-01-09 19:15:00 +01:00
Julien Constant
7cadc0bc28
Update doc/start/install.rst 2023-01-09 19:04:43 +01:00
Julien Constant
cce686f3a8
Update doc/about/tech.rst 2023-01-09 19:04:32 +01:00
Théo DURR
4fe46fbcef
[FIX] 3DSv2 - Echappement du XML et modif tables (#543) 
* Fixed wrong HMAC signature generation
* Updated migration files

Co-authored-by: Julien Constant <julienconstant190@gmail.com>
 2023-01-09 17:46:34 +01:00
Théo DURR
fe8b8f46aa
Fix 3DSv2 implementation (#542) 
* Fixed wrong HMAC signature generation

* Fix xml du panier

Co-authored-by: Julien Constant <julienconstant190@gmail.com>
 2023-01-06 20:02:45 +01:00
Julien Constant
310f1a2283
[FEATURE] Ajout du logo de la promo 23 & Amélioration des anciens logos (#541) 2023-01-05 18:37:13 +01:00
thomas girod
7079761ffe
Merge pull request #540 from ae-utbm/3dsv2-encore-un-patch 
remove csrf_token
 2022-12-26 18:55:41 +01:00
Thomas Girod
f681c981c6 remove csrf_token 2022-12-26 18:51:04 +01:00
thomas girod
5d97146d14
Merge pull request #531 from ae-utbm/remove_useless_tests 
remove useless tests
 2022-12-22 13:01:56 +01:00
thomas girod
7b56bd697d
Merge pull request #536 from ae-utbm/refactor_admin 
enhance admin pages
 2022-12-21 17:10:51 +01:00
thomas girod
14cd268d69
Merge pull request #532 from ae-utbm/update-doc 
update documentation
 2022-12-21 16:02:17 +01:00
thomas girod
754be1c9c9
Update doc/about/tech.rst 
Co-authored-by: Julien Constant <49886317+Juknum@users.noreply.github.com>
 2022-12-20 21:17:52 +01:00
Thomas Girod
da2c155254 update documentation 2022-12-20 17:26:28 +01:00
Thomas Girod
ceb2888f82 enhance admin pages 2022-12-19 20:55:33 +01:00
Théo DURR
ce3e2bb32b
Revert "Bump cryptography from 37.0.4 to 38.0.3 (#515)" (#529) 
This reverts commit 7b6eed9a47.
 2022-12-17 14:05:53 +01:00
Julien Constant
26c94c9ec6
[Eboutic] Fix double quote issue & improved user experience on small screen (#522) 
* Fix #511 Regex issue with escaped double quotes

* Fix basket being when reloading the page (when cookie != "")

+ Added JSDoc
+ Cleaned some code

* Fix #509 Improved user experience on small screens

* Fix css class not being added back when reloading page

* CSS Fixes (see description)

+ Fixed overlaping item title with the cart emoji on small screen
+ Fixed minimal size of the basket on small screen (full width)

* Added darkened background circle to items with no image

* Fix issue were the basket could be None


* Edited CSS to have bette img ratio & the 🛒 icon

Adapt, Improve, Overcome

* Moved basket down on small screen size
 2022-12-16 00:37:07 +01:00
dependabot[bot]
7b6eed9a47
Bump cryptography from 37.0.4 to 38.0.3 (#515) 
Bumps [cryptography](https://github.com/pyca/cryptography) from 37.0.4 to 38.0.3.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/37.0.4...38.0.3)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-16 00:35:46 +01:00
thomas girod
639197f4c8
update some dependencies (#523) 2022-12-15 23:57:31 +01:00
Théo DURR
13bae8d2fa
Update deploy.yml (#527) 2022-12-15 23:55:29 +01:00
Théo DURR
6b2027550c
Revert "Dépendance poetry manquante (setuptools)" (#526) 
This reverts commit 022b365bb2.
 2022-12-15 23:18:41 +01:00
Théo DURR
022b365bb2
Dépendance poetry manquante (setuptools) 2022-12-15 22:36:56 +01:00
Théo DURR
d8867fc9ea
Edited workflows (#521) 
Résoud le soucis lié à dependabot.

Le problème venait du fait que l'on faisait un poetry update et non un poetry Install. Un update écrit dans poetry.lock, alors qu'un Install lit ce fichier. C'est là toute la différence.

Cette PR change donc les workflows.

Laisser ce bot apporte beaucoup de sécurité, vu qu'il nous prévient des changement, et aussi des vulnérabilités au niveau des dépendances.
 2022-12-15 19:02:29 +01:00
dependabot[bot]
118c58b5fa
Bump django from 3.2.15 to 3.2.16 (#514) 
Bumps [django](https://github.com/django/django) from 3.2.15 to 3.2.16.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.15...3.2.16)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-14 14:11:58 +01:00
Julien Constant
faccc1367f
Fix le panier de l'Eboutic pour Safari (#518) 
Co-authored-by: Théo DURR <git@theodurr.fr>
Co-authored-by: thomas girod <56346771+imperosol@users.noreply.github.com>
 2022-12-14 08:38:41 +01:00
Thomas Girod
22b83b0814 remove useless tests 2022-12-12 22:56:06 +01:00
thomas girod
1d82e2a7d9
Change country id to ISO 3166 1 numeric for 3DSV2 (#510) 2022-12-12 22:54:31 +01:00
Julien Constant
823bd578f2
Fix election page css (#508) 
* Fix election candidate overflowing texte
* Fix "Show Less" invisible still occurring in production (wtf)
* Fix program text still overflowing still occurring in production (wtf)

Bonus:
* Fix miss-aligned links in navbar
 2022-12-12 21:22:18 +01:00
Julien Constant
3e5c36b39e
Fix election candidate overflowing texte (#506) 
Le texte affiché lorsqu'on appuyait sur "Show more" dépassait horizontalement (programme des candidats)
 2022-12-12 20:27:47 +01:00
thomas girod
8fb0897160
add a sentry capture for when eboutic basket regex validation fails. (#504) 
Co-authored-by: Théo DURR <git@theodurr.fr>
 2022-12-11 10:56:02 +01:00
thomas girod
b8a72c57e1
escape html characters on xml (#505) 2022-12-10 20:41:35 +01:00
Théo DURR
6a0a8e8ab4
Edited bar manager club to pdf (pdfesti) (#503) 
* Edited bar manager club to pdf (pdfesti)
* Fixed unit tests
 2022-12-08 18:26:41 +01:00
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