klmp200
/
Sith
mirror of https://github.com/ae-utbm/sith3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,828 Commits 20 Branches 0 Tags 110 MiB
Commit Graph

1828 Commits

Author SHA1 Message Date
Théo | Ailé 7241f3eb1d Ajout de pygraphviz en dépendance 2022-05-08 12:09:37 +00:00
Alexandre | L'Sacienne 2422f60898 Merge branch 'lsacienne/refilling_only_for_ae_member' into 'master' 
Adds a Restriction for refilling

As it was asked by many members of the AE. I added a restriction applied to the barmens.
In fact, we oftenly loose money due to the physic refilling.
The goal with this change is to only allow **the members of the AE** to refill with physic money.

See merge request ae-utbm/Sith!303
 2022-05-05 21:53:57 +00:00
lsacienne ba6599fa56
Add of tests 2022-05-05 23:24:08 +02:00
lsacienne f2666f6fb0
Replace the query by a function which already 
existed
 2022-05-02 00:04:00 +02:00
lsacienne b33839191d
Fix black pipeline 2022-04-28 13:16:03 +02:00
lsacienne ee3e375dde
Post request management 2022-04-28 11:13:07 +02:00
Théo | Ailé 5b0f7ca21b Merge branch 'skia/deploy_in_ci' into 'master' 
gitlab-ci: deploy with Gitlab CI/CD

This MR is a proof-of-concept for deploying the Sith using Gitlab CI/CD. It leverage the CI variable to use a private key that is deployed for the `sith` user of `ae-web`. The `prod.sh` script shall do the rest.

TODO before merge:
* [x] Ensure the private key variable is protected (currently done, but may change during development to be used on this branch)
* [x] Remove this branch from the `only:refs` list
* [x] Change `test_prod.sh` for the real script

See merge request ae/Sith!293
 2022-04-27 18:21:49 +00:00
Skia f581d91730 gitlab-ci: deploy with Gitlab CI/CD 2022-04-27 18:21:48 +00:00
lsacienne bbf362691b
Change to use settings instead of hardcoding 2022-04-27 15:38:55 +02:00
lsacienne 15e2c8c7b3
Fix the balck pipeline 2022-04-27 15:38:14 +02:00
Théo | Ailé f838127730 Merge branch 'aile-master-patch-00174' into 'master' 
Update badges and links on the readme


See merge request ae/Sith!305
 2022-04-27 13:13:08 +00:00
Théo DURR d4c0bb3b0e
Fix pipeline 
Signed-off-by: Théo DURR <03ht@theodurr.fr>
 2022-04-27 14:52:33 +02:00
Théo | Ailé b81aee3f1c Update badges and links 2022-04-27 09:50:38 +00:00
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
Antoine Bartuccio 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