Commits · 734f5b242db27f9e77234391caa8b4ae191765de · BDE / nk20

Jul 30, 2024
- C'est pas moi · 734f5b24
  ynerant authored 2 years ago and korenstin committed 7 months ago
```
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
```
  734f5b24
- De l'inclusif, partout · b0c7d43a
  ynerant authored 2 years ago and korenstin committed 7 months ago
```
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
```
  b0c7d43a
Jul 18, 2024
- Merge branch 'fix_ActivityList' into 'main' · b8f81048
  korenstin authored 8 months ago
```
Allow to order the 2 tables and to fix the bug of several activities

See merge request !252
```
  b8f81048
- Merge branch 'remove_picture' into 'main' · af819f45
  korenstin authored 8 months ago
```
Allow you to delete the profile picture

See merge request !250
```
  af819f45
- Merge branch 'main' into 'remove_picture' · 076d065f
  korenstin authored 8 months ago
```
# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
```
  076d065f
- Merge branch 'fix_join_bda' into 'main' · 2da77d9c
  korenstin authored 8 months ago
```
Fix #126 (join_bda)

Closes #126

See merge request !251
```
  2da77d9c
- Merge branch 'modif_perm' into 'main' · 01584d63
  korenstin authored 8 months ago
```
Modif perm

See merge request !249
```
  01584d63
Jul 15, 2024
- Allow to order the 2 tables and to fix the bug of several activities · 4c0a5922
  korenstin authored 8 months ago
  
  4c0a5922
- Fix #126 (join_bda) · f90b28fc
  korenstin authored 8 months ago
  
  f90b28fc
Jul 13, 2024
- Allow you to delete the profile picture · 925e0f26
  korenstin authored 8 months ago
  
  925e0f26
Jun 24, 2024
- oups la virgule oublié · c912383f
  quark authored 8 months ago
  
  c912383f
- Modify permission for negative · 32830e43
  quark authored 8 months ago
  
  32830e43
- modifications permissions consommation pc kfet (Alcool) · 11c6a6fa
  korenstin authored 8 months ago
  
  11c6a6fa
Jun 03, 2024
- Merge branch 'new_logo' into 'main' · 201d6b11
  korenstin authored 9 months ago
```
New logo

See merge request !247
```
  201d6b11
- Merge branch 'main' into 'new_logo' · 19e77df2
  korenstin authored 9 months ago
```
# Conflicts:
#   .gitlab-ci.yml
```
  19e77df2
- Merge branch 'charte_info' into 'main' · 5fd6ec56
  korenstin authored 9 months ago
```
Charte info

See merge request !248
```
  5fd6ec56
May 30, 2024
- linters · 10a01c5b
  korenstin authored 9 months ago
  
  10a01c5b
May 26, 2024
- Update .gitlab-ci.yml · 989905ea
  korenstin authored 9 months ago
  
  989905ea
- Update .gitlab-ci.yml · 0218d43a
  korenstin authored 9 months ago
  
  0218d43a
- charte info · 5d30b0e8
  korenstin authored 9 months ago
  
  5d30b0e8
May 23, 2024
- error py37-django22 · ec759dd3
  korenstin authored 9 months ago
  
  ec759dd3
- new_logo · 2eb96529
  korenstin authored 9 months ago
  
  2eb96529
Mar 30, 2024
- Merge branch 'traduction_inclusive_fr' into 'main' · 7f182ee2
  quark authored 11 months ago
```
Réécriture en inclusif de l'ensemble des textes français de la note

See merge request !246
```
  7f182ee2
- Prise en compte des commentaires de Korenstin · 3132aa4c
  quark authored 11 months ago
  
  3132aa4c
- Prise en compte des commentaires · c7eb7748
  quark authored 11 months ago
  
  c7eb7748
- Prise en compte des commentaires · 32f8d285
  quark authored 11 months ago
  
  32f8d285
Mar 29, 2024
- Réécriture en inclusif de l'ensemble des textes français de la note · 050256ea
  quark authored 11 months ago
  
  050256ea
Mar 27, 2024
- Merge branch 'invoice_modification' into 'main' · 7afd15b1
  quark authored 11 months ago
```
changement template facture

Closes #128

See merge request !243
```
  7afd15b1
- Update forms.py · 258361f1
  korenstin authored 11 months ago
  
  258361f1
- Merge branch 'change_date' into 'main' · a3075305
  korenstin authored 11 months ago
```
change date

See merge request !245
```
  a3075305
- Update forms.py · 5de930bf
  quark authored 11 months ago
  
  5de930bf
- Update forms.py · f7ebe0e9
  quark authored 11 months ago
  
  f7ebe0e9
- Update forms.py · 73de6e21
  quark authored 11 months ago
  
  73de6e21
Mar 26, 2024
- change date · 201611b1
  korenstin authored 11 months ago
  
  201611b1
Mar 24, 2024
- Update models.py · 40c239e9
  quark authored 11 months ago
  
  40c239e9
- Update test_treasury.py · 2aaab2b4
  quark authored 11 months ago
  
  2aaab2b4
- Update test_treasury.py · fc088dec
  quark authored 11 months ago
  
  fc088dec
Mar 23, 2024
- Merge branch 'patch_sort' into 'main' · 2d60f1fd
  korenstin authored 11 months ago
```
patch sort and optional description

See merge request !244
```
  2d60f1fd
- patch sort and optional description · 7b48b093
  korenstin authored 11 months ago
  
  7b48b093
Mar 22, 2024
- changement template facture · ffac9405
  quark authored 11 months ago
  
  ffac9405