klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-06-29 09:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,915 Commits 15 Branches 0 Tags 113 MiB
05b86e1f7a
Commit Graph

1915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lsacienne
c6caf5dbce
Add of restriction for refilling 2022-04-20 14:01:33 +02:00
Théo | Ailé
7acc59f2cd Merge branch 'lsacienne/refilling_date' into 'master' 
Add of date in the counter/refilling_list view

I only add a new field in the counter/refilling_list view which will *normally* display the date of each refilling.

See merge request ae/Sith!302
 2022-04-19 10:28:09 +00:00
lsacienne
757ff7ead7
Add of date in the counter/refilling_list view 2022-04-19 12:02:22 +02:00
Théo | Ailé
bc2fe16b74 Merge branch '117-django-2-2-not-compatible-with-psycopg-2-9' into 'master' 
Resolve "Django 2.2 not compatible with psycopg 2.9"
Closes #117

See merge request ae/Sith!299
 2022-04-18 20:21:19 +00:00
Théo | Ailé
35363d9ee7 Resolve "Django 2.2 not compatible with psycopg 2.9" 2022-04-18 20:21:18 +00:00
Théo | Ailé
52106db6fd Merge branch '118-black-pipeline-is-broken' into 'master' 
Resolve "Black pipeline is broken"

Closes #118

Closes #118

See merge request ae/Sith!300
 2022-04-18 18:33:39 +00:00
Théo | Ailé
c4b1829e78 Resolve "Black pipeline is broken" 2022-04-18 18:33:36 +00:00
Théo | Ailé
489a9378c5 Merge branch 'poetry' into 'master' 
Add missing dependencies and improve pipeline

* Use black version specified in requirements for checking with black
* Check if pyproject.toml file is valid at CI level
* Build documentation in CI
* Add missing postgres dependencie

See merge request ae/Sith!284
 2022-03-26 21:27:22 +00:00
Sli
28ae109b32 Add missing dependencies and improve pipeline 2022-03-26 21:27:20 +00:00
Alexandre | L'Sacienne
e7a6a94ff2 Merge branch 'doc-windows-install' into 'master' 
Added WSL Windows doc for the project install

Added steps to install the project on Windows using WSL :)

See merge request ae/Sith!291
 2022-03-03 18:18:55 +00:00
Skia
234556a172 Merge branch 'skia/fix_eboutic' into 'master' 
Multiple fixes

* Bump `black` and fix issues
* `club`: fix tests broken by inclusive translation
* `gitlab-ci`: use `poetry`, as `pip` was broken anyway
* `eboutic`: et_autoanswer: don't require 'Auto' to proceed checking the request: As described in the [doc](https://www.paybox.com/espace-integrateur-documentation/la-solution-paybox-system/gestion-de-la-reponse/), `Auto` may be missing if the payment failed. Thus, it's not required to proceed checking the bank's answer.

See merge request ae/Sith!296
 2022-03-02 16:21:10 +00:00
Skia
e4ddceabea club: fix tests with inclusive translation 2022-02-28 14:50:24 +01:00
Skia
05dd3ad642 gitlab-ci: use poetry 2022-02-28 10:34:15 +01:00
Skia
6c5db61a97 eboutic: et_autoanswer: don't require 'Auto' to proceed checking the request 2022-02-28 10:01:32 +01:00
Skia
a0e4e9e8e3 Update 'black' version 2022-02-28 10:01:32 +01:00
lsacienne
c66df77d4a Merge branch 'master' of https://ae-dev.utbm.fr/ae/Sith 2022-02-18 16:35:10 +01:00
lsacienne
cfb6b34630
Updated roles to be more inclusive 2022-02-18 16:30:45 +01:00
Skia
d8fd0adf47 Merge branch 'skia/et_autoanswer' into 'master' 
eboutic: change HTTP return code to avoid blaming the bank's service

See merge request ae/Sith!295
 2022-02-10 12:32:43 +00:00
Théo | Ailé
928ae13a8a Merge branch 'bugfix-113-error500' into 'master' 
#113: bug fixed

See merge request ae/Sith!294
 2022-02-10 12:30:55 +00:00
Skia
c2e0ea70e4 eboutic: change HTTP return code to avoid blaming the bank's service 2022-01-04 15:50:36 +01:00
Julien Constant
782ce24895 Changed python3 to python 2021-12-02 12:22:34 +01:00
Cyrille
b630742fd4 #113: bug fixed 2021-11-30 17:54:51 +01:00
Ailé
b20df930a2 Merge branch 'feature-111-fixture_documentation' into 'master' 
add fixture documentation

See merge request ae/Sith!292
 2021-11-25 22:06:41 +00:00
Cyrille
d60a96fc5c correct populate.rst 2021-11-23 23:44:34 +01:00
Julien Constant
05b0a0ab2f Adapted WSL doc to follow recommendation :) 2021-11-23 19:19:24 +01:00
Cyrille
9eb137e503 add fixture documentation 2021-11-22 21:37:10 +01:00
Julien Constant
7d797009bb Added WSL windows doc for project install 2021-11-19 13:10:18 +01:00
Ailé
3c1818f229 Merge branch 'family_rework' into 'master' 
Updated text and translations to be more inclusive

See merge request ae/Sith!290
 2021-11-18 15:38:13 +00:00
Ailé
d8b69e9b45
Updated text and translations to be more inclusive 2021-11-18 16:24:14 +01:00
Ailé
9177c9d4c2 Merge branch 'bugfix-110-ClubSellings' into 'master' 
Fix error 500 in club sellings

Closes #110

See merge request ae/Sith!289
 2021-11-18 14:32:11 +00:00
Cyrille Stroesser
5195352975 fixed black pipeline 2021-11-18 15:14:39 +01:00
Cyrille Stroesser
deb8f865df fix #110 2021-11-18 15:04:25 +01:00
Ailé
5b2c70e4fb Merge branch 'gender_options' into 'master' 
Fix pronouns field being mandatory

See merge request ae/Sith!288
 2021-11-18 09:07:21 +00:00
Cel
f66db0859e Fix pronouns field being mandatory 2021-11-18 09:07:19 +00:00
Ailé
b6488d1d00 Merge branch 'poor_logo_quality' into 'master' 
Updated somo logo size where they looked blurry (we love responsive)

See merge request ae/Sith!287
 2021-11-10 11:33:05 +00:00
Ailé
6a4ac336ad
Updated somo logo size where they looked blurry (we love responsive) 2021-11-10 12:11:07 +01:00
Ailé
7ac6dcf8a0 Merge branch 'family_rework' into 'master' 
Edited the word "GodFather" to "Family"

See merge request ae/Sith!286
 2021-11-10 10:35:40 +00:00
Ailé
c6a3677cc5
Fixed duplicated translation 2021-11-05 21:11:52 +01:00
Ailé
707459acd6
Changed word 'Godfather' to 'Family' 2021-11-05 21:01:19 +01:00
Ailé
6390c3320e
Applied black on migration 2021-11-05 20:40:20 +01:00
Ailé
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
Théo DURR
c66e4232b9
Merge branch 'master' into gender_options 
Signed-off-by: Théo DURR <03ht@theodurr.fr>
 2021-11-05 17:18:17 +01:00
Ailé
336450d43f Merge branch 'add-promo-logos' into 'master' 
Add missing promo logos

Closes #107

See merge request ae/Sith!285
 2021-10-27 10:22:07 +00:00
Julien
7e66aadd6f Add missing promo logos 2021-10-27 08:37:58 +02:00
Sli
bf2b796936 Merge branch 'poetry' into 'master' 
Using poetry as a dependency system for development

See merge request ae/Sith!281
 2021-10-15 16:12:59 +00:00
Sli
85623f48a9 Using poetry as a dependency system for development 2021-10-15 16:12:56 +00:00
Celeste
4fbee9c3de Make pronouns visible on profile and miniprofile 2021-10-13 08:59:40 +02:00
Skia
bfa3b45547 counter_click.jinja: fix error display with Vue 2021-10-11 22:09:45 +02:00
Celeste
677a9da469 Merge branch 'master' into gender_options 2021-10-11 17:13:06 +02:00
Céleste
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