1982 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
charliep	4e370fd78e	Merge branch 'Fix_time_zone_calendar.ics' into 'main' ... Update views.py - Fix calendar.ics See merge request bde/nk20!237	2024-07-18 18:25:56 +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
korenstin	258361f116	Update forms.py	2024-03-27 10:25:38 +01:00
korenstin	a307530579	Merge branch 'change_date' into 'main' ... change date See merge request bde/nk20!245	2024-03-27 10:19:37 +01:00
quark	5de930bf40	Update forms.py	2024-03-27 10:04:14 +01:00
quark	f7ebe0e99b	Update forms.py	2024-03-27 09:43:49 +01:00
quark	73de6e2176	Update forms.py	2024-03-27 09:20:32 +01:00
test	201611b105	change date	2024-03-26 08:33:34 +01:00
quark	40c239e9da	Update models.py	2024-03-24 16:41:18 +01:00
quark	2aaab2b454	Update test_treasury.py	2024-03-24 15:55:46 +01:00
quark	fc088dec86	Update test_treasury.py	2024-03-24 15:20:46 +01:00
korenstin	2d60f1fd7b	Merge branch 'patch_sort' into 'main' ... patch sort and optional description See merge request bde/nk20!244	2024-03-23 21:07:03 +01:00
test	7b48b09329	patch sort and optional description	2024-03-23 14:32:31 +01:00
quark	ffac940511	changement template facture	2024-03-22 18:22:08 +01:00
mcngnt	50f98fd5ad	Merge branch 'prez-perm' into 'main' ... changed permission for club president See merge request bde/nk20!242	2024-03-22 12:56:09 +01:00
mcngnt	402e19d1ce	changed permission for club president	2024-03-22 12:27:08 +01:00
korenstin	0b0394b61f	Merge branch 'image_fix' into 'main' ... réparation photo de profil See merge request bde/nk20!241	2024-03-21 20:57:56 +01:00
test	98422d8259	réparation photo de profil	2024-03-21 18:37:47 +01:00
quark	29509b5b26	Merge branch 'quark-main-patch-96792' into 'main' ... Changement couleur de la note See merge request bde/nk20!240	2024-03-14 17:38:29 +01:00
quark	0d64ad31e0	Update custom.css	2024-03-14 17:22:41 +01:00
quark	5781cbd6a5	Merge branch 'quark-main-patch-83351' into 'main' ... Changement couleur de la note See merge request bde/nk20!239	2024-03-14 16:16:37 +01:00
quark	5295e61a00	Changement couleur de la note	2024-03-14 15:59:53 +01:00
quark	e79ed6226a	Merge branch 'quark-main-patch-51348' into 'main' ... Upload New Migration (change bde) See merge request bde/nk20!238	2024-03-11 16:28:41 +01:00
quark	68152e6354	Upload New Migration (change bde)	2024-03-11 16:11:54 +01:00
charliep	6c61daf1c5	Update views.py ... Passage à la time zone Europe/Paris	2024-03-11 10:25:48 +01:00