| 
							
							
								 ehouarn | 7d359dec13 | Update django.po | 2025-08-29 14:12:25 +02:00 |  | 
			
				
					| 
							
							
								 ehouarn | 99a90867cc | Merge branch 'main' into 'family' # Conflicts:
#   locale/fr/LC_MESSAGES/django.po | 2025-08-28 11:23:22 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 1fdb30d7d2 | Some WEI translations | 2025-08-20 23:37:34 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 4d567cdcc7 | Achievement unicity && management pop-up behaviour | 2025-08-13 23:57:05 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 61057b71ba | Fuzzy translations | 2025-08-13 16:42:31 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 85b857976a | Merge branch 'main' into family | 2025-08-12 23:57:14 +02:00 |  | 
			
				
					| 
							
							
								 ikea | 0c259155a8 | Translation for family | 2025-08-12 23:01:06 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 0ac719b1f6 | French translations for WEI | 2025-08-03 12:47:22 +02:00 |  | 
			
				
					| 
							
							
								 ikea | 2af671d61a | Fix traduction .po – suppression doublons | 2025-07-20 23:27:53 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 61999a31a5 | Wei details | 2025-07-19 18:04:14 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 03c1bb41b6 | First of many | 2025-07-18 23:49:34 +02:00 |  | 
			
				
					| 
							
							
								 ehouarn | b1fa1c2cdd | Merge branch 'main' into 'wei' # Conflicts:
#   locale/fr/LC_MESSAGES/django.po | 2025-07-15 19:06:58 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | a273dc3eef | Translations | 2025-07-15 18:23:40 +02:00 |  | 
			
				
					| 
							
							
								 quark | b97b79e2ea | translation | 2025-07-12 14:05:53 +02:00 |  | 
			
				
					| 
							
							
								 ehouarn | 79f50c27f1 | Merge branch 'beta' into 'food_traceability' # Conflicts:
#   locale/fr/LC_MESSAGES/django.po | 2025-07-11 17:00:45 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 5989721bc9 | Easier access to food details | 2025-07-11 16:35:49 +02:00 |  | 
			
				
					| 
							
							
								 quark | bcc3e7cc53 | Merge branch 'food_traceability' into beta | 2025-07-11 12:26:55 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 608804db30 | Bugs fixed | 2025-07-10 20:05:27 +02:00 |  | 
			
				
					| 
							
							
								 quark | 883589e08c | django-constance and traduction | 2025-07-06 16:17:13 +02:00 |  | 
			
				
					| 
							
							
								 quark | 4cc43fe4b6 | traduction, resolve #133 | 2025-07-04 22:11:47 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | bc517f02e5 | Traduction | 2025-06-27 19:26:58 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 5c5f579729 | Traductions | 2025-06-20 14:24:03 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | e617048332 | Meilleure gestion des cautions | 2025-06-02 01:09:51 +02:00 |  | 
			
				
					| 
							
							
								 Ehouarn | 16cfaa809a | Fix de la plupart des bugs | 2025-05-27 18:56:49 +02:00 |  | 
			
				
					| 
							
							
								 quark | ad0a219ed3 | Add manage ingredient feature, fix some bug | 2025-04-30 12:06:37 +02:00 |  | 
			
				
					| 
							
							
								 quark | a2b42c5329 | permission, fixture, translation (fr), bug fixes | 2025-04-24 20:50:32 +02:00 |  | 
			
				
					| 
							
							
								 quark | 702ddb5679 | add school field to guest | 2025-03-25 17:39:31 +01:00 |  | 
			
				
					| 
							
							
								 quark | bd7e6b8ad4 | add table, add some translation | 2025-03-13 21:08:52 +01:00 |  | 
			
				
					| 
							
							
								 quark | cdeb76d9f8 | Merge branch 'main' into notekfet_wrapped | 2025-03-04 19:08:32 +01:00 |  | 
			
				
					| 
							
							
								 quark | b17d31e8ee | translation | 2025-02-25 14:11:53 +01:00 |  | 
			
				
					| 
							
							
								 thomasl | dc56deaf85 | Final modifications | 2025-02-13 21:17:57 +01:00 |  | 
			
				
					| 
							
							
								 korenstin | 09fb1d227e | Correction translation of sport events ml | 2024-09-18 08:54:04 +02:00 |  | 
			
				
					| 
							
							
								 mcngnt | dd675b3676 | Merge branch 'survey_wei_2024' into 'main' Survey wei 2024
See merge request bde/nk20!266 | 2024-08-29 14:45:28 +02:00 |  | 
			
				
					| 
							
							
								 korenstin | a5df98224f | Merge branch 'migration-django-4-2' into 'main' Migration django 4 2
See merge request bde/nk20!265 | 2024-08-29 10:49:44 +02:00 |  | 
			
				
					| 
							
							
								 korenstin | 2cb9ac8735 | replace "…" -> "..." (#130) and disable sorting on certain columns (#129) | 2024-08-29 10:19:06 +02:00 |  | 
			
				
					| 
							
							
								 korenstin | a21b9275ea | Add caution_check in the validation form, #96 | 2024-08-28 09:48:52 +02:00 |  | 
			
				
					| 
							
							
								 korenstin | 9ccac36831 | Copy constructor | 2024-08-27 18:01:13 +02:00 |  | 
			
				
					| 
							
							
								 quark | 2e71ce05a9 | Merge branch 'main' into food_traceability | 2024-08-27 17:11:32 +02:00 |  | 
			
				
					| 
							
							
								 korenstin | ff9c78ed4e | added opener in admin and fixed the guest view | 2024-08-25 14:29:06 +02:00 |  | 
			
				
					| 
							
							
								 quark | 549f56dc0b | Translation | 2024-08-17 11:58:33 +02:00 |  | 
			
				
					| 
							
							
								 korenstin | a324d3a892 | Merge branch 'beta' into ouvreureuse | 2024-08-08 16:28:22 +02:00 |  | 
			
				
					| 
							
							
								 quark | b2b1f03b46 | Edit food HTML template for translation, translations. Now the mandatory allergens are automatically created | 2024-08-06 15:20:22 +02:00 |  | 
			
				
					| 
							
							
								 quark | 1c5ed2bd3f | Edit base.html and few translations | 2024-08-06 13:59:30 +02:00 |  | 
			
				
					| 
							
							
								 korenstin | 354c79bb82 | Inclusif manquant | 2024-08-04 13:32:33 +02:00 |  | 
			
				
					| 
							
							
								 korenstin | 162371042c | Creation of "Opener", Fix #117 | 2024-08-01 14:49:52 +02:00 |  | 
			
				
					|  | b0c7d43a50 | De l'inclusif, partout Signed-off-by: Emmy D'ANELLO <ynerant@crans.org> | 2024-07-30 16:28:47 +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 | 076d065ffa | Merge branch 'main' into 'remove_picture' # Conflicts:
#   locale/fr/LC_MESSAGES/django.po | 2024-07-18 17:52:22 +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 |  |