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

1995 Commits

Author SHA1 Message Date
Alexandre | L'Sacienne 67377b3cbf Merge branch 'lsacienne/change_weekmail_banner_P22_08_06_2022' into 'master' 
Change the invitation banner in weekmail to regular weekmail banner

We now have the weekmail banner and not the invitation banner

See merge request ae-utbm/Sith!312
 2022-06-14 09:18:26 +00:00
lsacienne ac3d668655
💄 CHange the invitation banner in weekmail 
We now have the weekmail banner and not the invitation banner
 2022-06-08 22:05:24 +02:00
Alexandre | L'Sacienne c57b15e159 Merge branch 'lsacienne/change_weekmail_banner_P22' into 'master' 
Modification of the banner and footer for the Special General Meeting

There will be a special general meeting next week so we modify the banner to fit with this event.

See merge request ae-utbm/Sith!311
 2022-06-01 21:14:38 +00:00
lsacienne 66efb8012e
♻️ Fix black pipeline 2022-06-01 22:46:12 +02:00
lsacienne cad0c0dadb
💄 Modification of the banner and footer 
for the special invitation
 2022-06-01 22:40:52 +02:00
lsacienne b32c90ed5d
✨ Add of weekmail footer 2022-06-01 22:39:44 +02:00
lsacienne 4d361dc67b
✨ Add of weekmail banner in 2 versions 2022-06-01 22:39:17 +02:00
lsacienne 2b170d91f7
✨ Add of Invitation banner 2022-06-01 22:38:44 +02:00
Théo | Ailé 9e074d6ca6 Merge branch 'service_desk_reply' into 'master' 
Update .gitlab/service_desk_templates/thank_you.md


See merge request ae-utbm/Sith!310
 2022-05-26 13:46:54 +00:00
Théo | Ailé b655b2695b Update .gitlab/service_desk_templates/thank_you.md 2022-05-26 08:41:37 +00:00
Théo | Ailé 366aeed2ba Merge branch 'lsacienne/refilling_authorized_for_Bdf_ae' into 'master' 
Add authorization to refill to the counters AE & BdF

Since the FIMU is coming, there is a necessity to allow access to physical refilling to the people who will manage the stands.

Therefore, We should authorize the refilling on the BdF and AE counter.

See merge request ae-utbm/Sith!309
 2022-05-22 09:56:56 +00:00
Alexandre | L'Sacienne 454ae5f9e3 Add authorization to refill to the counters AE & BdF 2022-05-22 09:56:53 +00:00
lsacienne b811114425
fix black pipeline 2022-05-21 21:53:25 +02:00
lsacienne 712e7c8939
Add of verification on the counter 2022-05-21 12:23:34 +02:00
lsacienne 713cd92141
Modification of the settings to fit better with the code 2022-05-21 12:23:23 +02:00
lsacienne 4154b499b1
Add of a new settings for the counters AE & BdF 2022-05-21 09:45:28 +02:00
Théo | Ailé 253f204225 Merge branch '125-fix-family-tree' into 'master' 
Ajout de pygraphviz en dépendance

Closes #125

On change également la version minimale de python (`3.7` -> `3.8`)

Closes #125

See merge request ae-utbm/Sith!306
 2022-05-08 12:09:38 +00:00
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