ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity
2,005 Commits 20 Branches 4 Tags 27 MiB
Commit Graph

2005 Commits

Author SHA1 Message Date
korenstin 27b00ba4f0 Merge branch 'beta' into sortable_tables 2024-08-08 17:27:44 +02:00
korenstin 3fcbb4f310 Merge branch 'no-api-error' into 'beta' 
fix #113

See merge request bde/nk20!253
 2024-08-08 17:05:25 +02:00
korenstin d1c9a2a7f1 Merge branch 'beta' into no-api-error 2024-08-08 16:54:21 +02:00
korenstin a673fd6871 Merge branch 'ouvreureuse' into 'beta' 
Ouvreureuse

See merge request bde/nk20!256
 2024-08-08 16:41:06 +02:00
korenstin a324d3a892 Merge branch 'beta' into ouvreureuse 2024-08-08 16:28:22 +02:00
korenstin 951ba74f8f Merge branch 'bug_31_july' into 'beta' 
bug du jour 31 juillet (bissextile)

See merge request bde/nk20!254
 2024-08-08 16:23:21 +02:00
korenstin abc4f14bd1 Merge branch '404_or_403' into 'beta' 
fix #65 Returning 403 when you don't have enough permissions

See merge request bde/nk20!259
 2024-08-07 21:54:54 +02:00
korenstin 47138bafd4 Merge branch 'traduction_inclusive_fr' into 'beta' 
De l'inclusif, partout

See merge request bde/nk20!258
 2024-08-07 21:45:05 +02:00
korenstin a3920fcae3 Merge branch 'Fix_time_zone_calendar.ics' into 'beta' 
Update views.py - Fix calendar.ics

See merge request bde/nk20!237
 2024-08-07 21:26:32 +02:00
korenstin ae4213d087 Merge branch 'colored_linters' into 'beta' 
Colored linters

See merge request bde/nk20!255
 2024-08-07 21:25:22 +02:00
korenstin cbf92651f0 Returning 403 when you don't have enough permissions 2024-08-04 21:58:57 +02:00
korenstin 12c93ff9da bug du jour 31 juillet (bissextile) 2024-08-04 14:45:17 +02:00
korenstin 354c79bb82 Inclusif manquant 2024-08-04 13:32:33 +02:00
korenstin 1ea7b3dda1 documentation and modification of permissions 2024-08-02 15:21:34 +02:00
korenstin 35ffbfcf55 Colored linters 2024-08-01 17:29:24 +02:00
korenstin 162371042c Creation of "Opener", Fix #117 2024-08-01 14:49:52 +02:00
korenstin 581715d804 Fix #95 (calendar) 2024-07-31 23:18:41 +02:00
korenstin c7c6f0350f Looks unused 2024-07-31 22:19:16 +02:00
korenstin 9d1024024b Each table can be sorted (with a few exceptions) 2024-07-30 21:42:45 +02:00
Emmy D'ANELLO d595d908c6 Fix tests 
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
 2024-07-30 16:34:20 +02:00
Emmy D'ANELLO 734f5b242d C'est pas moi 
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
 2024-07-30 16:32:19 +02:00
Emmy D'ANELLO b0c7d43a50 De l'inclusif, partout 
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
 2024-07-30 16:28:47 +02:00
korenstin 7322d55789 Fix #113. Fix regex in views. 2024-07-19 20:00:33 +02:00
Yohann D'ANELLO 1a258dfe9e Parse input of search filters to prevent errors based on invalid regex, fixes #113 
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
 2024-07-19 19:59:30 +02:00
korenstin b8f81048a5 Merge branch 'fix_ActivityList' into 'main' 
Allow to order the 2 tables and to fix the bug of several activities

See merge request bde/nk20!252
 2024-07-18 18:17:06 +02:00
korenstin af819f45a1 Merge branch 'remove_picture' into 'main' 
Allow you to delete the profile picture

See merge request bde/nk20!250
 2024-07-18 18:02:43 +02:00
korenstin 076d065ffa Merge branch 'main' into 'remove_picture' 
# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
 2024-07-18 17:52:22 +02:00
korenstin 2da77d9c17 Merge branch 'fix_join_bda' into 'main' 
Fix #126 (join_bda)

Closes #126

See merge request bde/nk20!251
 2024-07-18 17:14:23 +02:00
korenstin 01584d6330 Merge branch 'modif_perm' into 'main' 
Modif perm

See merge request bde/nk20!249
 2024-07-18 16:54:23 +02:00
korenstin 4c0a5922c4 Allow to order the 2 tables and to fix the bug of several activities 2024-07-15 22:06:11 +02:00
korenstin f90b28fc7c Fix #126 (join_bda) 2024-07-15 14:30:46 +02:00
korenstin 925e0f26f5 Allow you to delete the profile picture 2024-07-13 17:37:19 +02:00
quark c912383f86 oups la virgule oublié 2024-06-24 22:36:22 +02:00
quark 32830e43fd Modify permission for negative 2024-06-24 21:21:22 +02:00
korenstin 11c6a6fa7a modifications permissions consommation pc kfet (Alcool) 2024-06-24 16:57:39 +02:00
korenstin 201d6b114a Merge branch 'new_logo' into 'main' 
New logo

See merge request bde/nk20!247
 2024-06-03 22:00:03 +02:00
korenstin 19e77df299 Merge branch 'main' into 'new_logo' 
# Conflicts:
#   .gitlab-ci.yml
 2024-06-03 21:59:44 +02:00
korenstin 5fd6ec5668 Merge branch 'charte_info' into 'main' 
Charte info

See merge request bde/nk20!248
 2024-06-03 21:53:01 +02:00
korenstin 10a01c5bc2 linters 2024-05-30 20:21:56 +02:00
korenstin 989905ea64 Update .gitlab-ci.yml 2024-05-26 18:41:49 +02:00
korenstin 0218d43a17 Update .gitlab-ci.yml 2024-05-26 16:00:26 +02:00
test 5d30b0e819 charte info 2024-05-26 15:46:50 +02:00
korenstin ec759dd3c0 error py37-django22 2024-05-23 22:38:09 +02:00
korenstin 2eb965291d new_logo 2024-05-23 21:46:01 +02:00
quark 7f182ee2ee Merge branch 'traduction_inclusive_fr' into 'main' 
Réécriture en inclusif de l'ensemble des textes français de la note

See merge request bde/nk20!246
 2024-03-30 13:24:06 +01:00
quark 3132aa4c38 Prise en compte des commentaires de Korenstin 2024-03-30 12:44:51 +01:00
quark c7eb774859 Prise en compte des commentaires 2024-03-30 11:20:23 +01:00
quark 32f8d285b3 Prise en compte des commentaires 2024-03-30 11:12:33 +01:00
quark 050256ea13 Réécriture en inclusif de l'ensemble des textes français de la note 2024-03-29 17:59:43 +01:00
quark 7afd15b1cc Merge branch 'invoice_modification' into 'main' 
changement template facture

Closes #128

See merge request bde/nk20!243
 2024-03-27 19:10:40 +01:00