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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						a7e87ea639
					 | 
					
						
						
							
							API Food
						
						
						
						
						
						
					 | 
					
						2024-08-04 23:38:21 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d595d908c6
					 | 
					
						
						
							
							Fix tests
						
						
						
						
						
						
						
						Signed-off-by: Emmy D'ANELLO <ynerant@crans.org> 
						
						
					 | 
					
						2024-07-30 16:34:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						734f5b242d
					 | 
					
						
						
							
							C'est pas moi
						
						
						
						
						
						
						
						Signed-off-by: Emmy D'ANELLO <ynerant@crans.org> 
						
						
					 | 
					
						2024-07-30 16:32:19 +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
							
						 
					 | 
					
						
						
							
						
						6f67d2c629
					 | 
					
						
						
							
							Documentation
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								korenstin
							
						 
					 | 
					
						
						
							
						
						4b97ab2e2a
					 | 
					
						
						
							
							linters
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								korenstin
							
						 
					 | 
					
						
						
							
						
						dcfd0167e7
					 | 
					
						
						
							
							Security against the cycles
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								korenstin
							
						 
					 | 
					
						
						
							
						
						50a680eed2
					 | 
					
						
						
							
							Open table and shelf life
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								korenstin
							
						 
					 | 
					
						
						
							
						
						226a2a6357
					 | 
					
						
						
							
							Automatic allergens and expiry_date update
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								korenstin
							
						 
					 | 
					
						
						
							
						
						48462f2ffc
					 | 
					
						
						
							
							Adding ingredients to a preparation
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								korenstin
							
						 
					 | 
					
						
						
							
						
						260513ae3b
					 | 
					
						
						
							
							Migration fixes
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								korenstin
							
						 
					 | 
					
						
						
							
						
						210a3cc93c
					 | 
					
						
						
							
							Implementing QRcode creation, modifying Allergen model and creating of few views
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						896095a44c
					 | 
					
						
						
							
							Un peu de nettoyage, rajout de commentaires
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						3f997f94fa
					 | 
					
						
						
							
							few changes in models, delete default label
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						0801ad64ae
					 | 
					
						
						
							
							création de forms fonctionnel (form + views + url + html), few changes in models.py
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						64bd5ed546
					 | 
					
						
						
							
							création d'un form pour l'ajout d'aliments basiques
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						4c390dce17
					 | 
					
						
						
							
							nom app
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						adacc293f5
					 | 
					
						
						
							
							First forms
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						968fa64d37
					 | 
					
						
						
							
							Réagencement des tables et de leurs attributs
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						a481adbae4
					 | 
					
						
						
							
							création de l'interface admin temporaire
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						4de2e987ef
					 | 
					
						
						
							
							Rajout de la pseudo-doc
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:52:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						9e6342c929
					 | 
					
						
						
							
							Création de l'apps et de la base de donnée
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:50:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quark
							
						 
					 | 
					
						
						
							
						
						74de358953
					 | 
					
						
						
							
							Update README.md
						
						
						
						
						
						
					 | 
					
						2024-07-22 15:50:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								korenstin
							
						 
					 | 
					
						
						
							
						
						7322d55789
					 | 
					
						
						
							
							Fix #113. Fix regex in views.
						
						
						
						
						
						
					 | 
					
						2024-07-19 20:00:33 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |