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

1865 Commits

Author SHA1 Message Date
Antoine Bartuccio 7c4c1bc387 Fix permissions on download pictures feature 2022-08-09 18:11:20 +02:00
Julien Constant 6e77edcf67
Fix 'download all my picture button' being displayed in all albums sections 2022-08-09 17:57:02 +02:00
Antoine Bartuccio 0e5c8b53b0 Add missing translations and update doc 2022-08-07 16:45:18 +02:00
Antoine Bartuccio 47a332445c Add feature to download all of your pictures as a user 2022-08-07 16:08:56 +02:00
Antoine Bartuccio c904b2d827 Merge branch 'fix/broken-js' into 'master' 
Fix broken forms


See merge request ae-utbm/Sith!318
 2022-08-06 12:53:30 +00:00
Antoine Bartuccio f56263d6bd Fix broken forms 2022-08-06 14:28:35 +02:00
Théo | Ailé 0c2494cb34 Merge branch 'django-3.2' into 'master' 
Upgrade to django 3.2

* Upgrade dependencies
* Fix ugettext
* Fix bad urls

See merge request ae-utbm/Sith!316
 2022-08-05 18:46:24 +00:00
Théo | Ailé 9e5743a64c Merge branch 'defer-script-and-font-awesom' into 'master' 
Update de base.jinja

Defer des balises script. Ajout de preload sur l'import de fontawesome. Changement de certains commentaires html en commentaires jinja.

Le deux premiers points devraient permettre de gagner un temps non-négligeable au chargement de la page.

See merge request ae-utbm/Sith!317
 2022-08-05 18:12:29 +00:00
Maréchal | Thomas b5241ec75e Defer des balises script. Ajout de preload sur fa. 2022-08-05 13:22:09 +00:00
Antoine Bartuccio 4f00224f0d Update dependencies, apply black and fix wrong default SITH_COUNTER_OFFICES values 2022-08-04 18:42:29 +02:00
Antoine Bartuccio 320a896610 Fix tests and broken forms 2022-08-04 17:20:21 +02:00
Antoine Bartuccio 08924c5e05 Fix wrong url and set default auto field 2022-08-04 00:38:50 +02:00
Antoine Bartuccio 98bfc308a7 Minimal working version 
* Upgrade dependencies
* Fix ugettext
* Fix bad urls
 2022-08-04 00:28:09 +02:00
Antoine Bartuccio dee24fbc9c Fix deprecation warnings 2022-08-03 21:48:37 +02:00
Alexandre | L'Sacienne 2556427c7d Merge branch 'lsacienne/invitation_banner2' into 'master' 
💄 Change banner to invitation banner

We must set an invitation banner again. For the next one, we should create a new feature with a new button to avoid doing this switch every time.

See merge request ae-utbm/Sith!314
 2022-07-04 19:23:28 +00:00
lsacienne a2b35e5bba
💄 Change banner to invitation banner 2022-07-04 14:03:50 +02:00
Alexandre | L'Sacienne 3e8f1acb96 Merge branch 'election-css' into 'master' 
Improved Elections CSS for the table

- Everything can be seen without scrolling sideways (unless you're on a small screen)
- Each column makes the same size
- Candidate description/program is now below its profile picture
- If the candidate does not have any profile picture, the default one is shown
- The Edit/Delete message has been replaced with their corresponding emojis (they takes fewer spaces and doesn't need to be translated)
- Modified links at the bottom to look like buttons

<details><summary>Before</summary>
![image](/uploads/fd42e2fa027786612582d41c97090277/image.png)
</details>

<details><summary>This MR (root)</summary>
![image](/uploads/8350518422392f971d98f3c7ee48a558/image.png)
</details>

<details><summary>This MR (lambda user)</summary>
![image](/uploads/e6b66730e47556ea21230e89d2d06f83/image.png)
</details>

<details><summary>When a candidate is selected</summary>
![image](/uploads/adde527405fb321ba2023c36e06f4dc3/image.png)
</details>

See merge request ae-utbm/Sith!313
 2022-06-15 19:13:47 +00:00
Julien Constant 85788977fe
Moved file to correct place & improved CSS a bit 2022-06-15 15:32:16 +02:00
Julien Constant 066ca5bada
This shouldn't be unminified 2022-06-15 01:57:57 +02:00
Julien Constant 41369f738e
Improved Elections CSS for the table 2022-06-15 01:42:17 +02:00
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