|  | 80fbbd510d | Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 | 2023-09-09 13:33:12 -03:00 |  | 
				
					
						|  | c278e0a7a5 | Cambios de formato de numeros | 2023-09-09 13:32:49 -03:00 |  | 
				
					
						|  | f55ac3a4ff | Merge pull request 'Agregado versionado al build' (#23) from funcion/versionado into master Reviewed-on: #23 | 2023-09-05 19:00:33 -03:00 |  | 
				
					
						| 
								
								
									 Rodrigo | e1aa6e2f68 | Agregado versionado al build | 2023-09-05 18:47:09 -03:00 |  | 
				
					
						|  | 71b4c1c38d | Canasta 93: faltaban precios de copas solidarias | 2023-09-05 13:12:55 -03:00 |  | 
				
					
						|  | a7a1f69c5a | Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 | 2023-09-05 13:02:50 -03:00 |  | 
				
					
						|  | 3a894f2965 | Canasta 93 | 2023-09-05 13:02:27 -03:00 |  | 
				
					
						|  | 381909fb7e | Merge pull request 'Refactor del cartel pera que aparezca en todas las pantallas' (#22) from funcion/cartelito-pedido-aprobado into master Reviewed-on: #22 | 2023-09-05 12:35:55 -03:00 |  | 
				
					
						|  | 17cc127f2e | Refactor del cartel pera que aparezca en todas las pantallas | 2023-09-05 10:08:36 -03:00 |  | 
				
					
						|  | 9991337b87 | Merge pull request 'Modal de producto muestra cantidad pedida' (#19) from refactor/cantidades-producto into master Reviewed-on: #19 | 2023-09-04 21:22:25 -03:00 |  | 
				
					
						|  | b58261bbf0 | Merge pull request 'No sincronizar subpedidos aprobados' (#21) from funcion/congelar-pedidos-aprobados into master Reviewed-on: #21 | 2023-09-04 20:33:09 -03:00 |  | 
				
					
						| 
								
								
									 Rodrigo | b09d284a1d | Agregado notificación de pedido aprobado | 2023-09-04 20:32:16 -03:00 |  | 
				
					
						|  | 5a4a1ff391 | El toast ahora dura 2s | 2023-09-04 18:20:31 -03:00 |  | 
				
					
						|  | 72b3d1e4af | Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 | 2023-08-07 17:23:03 -03:00 |  | 
				
					
						|  | ca3af75b5a | Canasta 92 | 2023-08-07 17:22:38 -03:00 |  | 
				
					
						| 
								
								
									 Rodrigo | f50d4b975d | Agregado toast que avisa si el pedido fue aprobado | 2023-07-11 21:33:33 -03:00 |  | 
				
					
						| 
								
								
									 Rodrigo | bf3b888e71 | No sincronizar subpedidos aprobados | 2023-07-10 21:29:25 -03:00 |  | 
				
					
						|  | cadd9de7a0 | dependencia cross-env | 2023-07-06 23:25:05 -03:00 |  | 
				
					
						| 
								
								
									 Rodrigo | ccdba6efd4 | Merge branch 'master' of ssh://git.mps.org.uy:4422/nathalie/pedi2 | 2023-07-06 10:39:42 -03:00 |  | 
				
					
						|  | dc339fb025 | Merge branch 'master' into exportar-tabla-compras | 2023-07-06 10:35:30 -03:00 |  | 
				
					
						| 
								
								
									 Rodrigo | 962d6ec58a | Exportar pedido con nucleos a CSV | 2023-07-06 00:18:52 -03:00 |  | 
				
					
						| 
								
								
									 Rodrigo | 8d3f686fa1 | Crear view 'pedidos_aprobados' en migraciones | 2023-07-05 23:30:38 -03:00 |  | 
				
					
						| 
								
								
									 Rodrigo | 148f0e5244 | Crear view 'pedidos_aprobados' en migraciones | 2023-07-05 23:25:36 -03:00 |  | 
				
					
						|  | 129d52d6d6 | canasta 91 | 2023-07-04 20:12:36 -03:00 |  | 
				
					
						|  | 22e4253ea9 | Ahora si, cantidad en modal y en tarjeta | 2023-06-17 15:54:18 -03:00 |  | 
				
					
						|  | 121dfa4c49 | Modal de producto muestra cantidad pedida | 2023-06-10 19:20:25 -03:00 |  | 
				
					
						| 
								
								
									 nathalie | 9bf68050a7 | merged from server | 2023-06-07 22:21:21 -03:00 |  | 
				
					
						| 
								
								
									 nathalie | 615c9427b9 | merge from server | 2023-06-07 22:20:36 -03:00 |  | 
				
					
						|  | 023cef2bf3 | Merge pull request 'refactor/chismosa' (#18) from refactor/chismosa into master Reviewed-on: #18 | 2023-06-07 22:04:36 -03:00 |  | 
				
					
						|  | 2426638414 | Merge pull request 'funcion/buscar-productos' (#17) from funcion/buscar-productos into master Reviewed-on: #17 | 2023-06-07 22:03:48 -03:00 |  | 
				
					
						|  | d18de9e4c0 | Merge pull request 'Rework de la tabla de bonos y cambios en total de tabla de pedidos' (#16) from funcion/cambio-admin-bonos into master Reviewed-on: #16 | 2023-06-07 22:03:18 -03:00 |  | 
				
					
						|  | 6f2721a0f2 | canasta 90 | 2023-06-07 20:41:47 -03:00 |  | 
				
					
						|  | 70aaadd901 | refactor de chismosa | 2023-05-27 20:08:55 -03:00 |  | 
				
					
						|  | daa998c89e | cambio de nombre de evento | 2023-05-27 15:38:56 -03:00 |  | 
				
					
						|  | c2ce43d295 | buscar productos funcionando | 2023-05-27 15:33:08 -03:00 |  | 
				
					
						|  | d19c83289d | busqueda funcionando, migas rotas | 2023-05-27 14:23:52 -03:00 |  | 
				
					
						|  | 2eac2a9554 | refactors varios para sacar responsabilidades a la nav bar | 2023-05-27 11:20:38 -03:00 |  | 
				
					
						|  | 599d55b684 | cambios en la nav bar y barra de búsqueda | 2023-05-24 22:00:04 -03:00 |  | 
				
					
						|  | ea6596a5b4 | Rework de la tabla de bonos y cambios en total de tabla de pedidos | 2023-05-24 15:01:31 -03:00 |  | 
				
					
						| 
								
								
									 nathalie | 3203f48f76 | Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 | 2023-05-10 12:15:04 -03:00 |  | 
				
					
						|  | 4acc2b0605 | Canasta 89 | 2023-05-10 11:35:24 -03:00 |  | 
				
					
						| 
								
								
									 nathalie | 55a94cb05b | Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 | 2023-04-10 16:16:10 -03:00 |  | 
				
					
						|  | ddb09d56e7 | Arreglo de | que deberian ser , | 2023-04-10 16:13:29 -03:00 |  | 
				
					
						| 
								
								
									 nathalie | 835cb14042 | Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 | 2023-04-10 16:07:35 -03:00 |  | 
				
					
						|  | 474e6871e3 | Canasta 88 | 2023-04-10 15:53:42 -03:00 |  | 
				
					
						| 
								
								
									 nathalie | 13a445ef64 | Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 Arreglado bug de bonos de ollas | 2023-03-20 21:29:12 -03:00 |  | 
				
					
						| 
								
								
									 nathalie | ee7cdc8d10 | Config | 2023-03-20 21:27:25 -03:00 |  | 
				
					
						|  | e712d3265f | deshecho cambio en docker-compose.yml | 2023-03-20 21:11:13 -03:00 |  | 
				
					
						|  | 11ec71cd7e | Merge branch 'fix/csv-bonos-ollas' | 2023-03-20 21:06:42 -03:00 |  | 
				
					
						|  | 7b94e05d0a | Merge pull request 'Sacados bonos de pdfs por estar la tabla de bonos en admin' (#15) from adminUI into master Reviewed-on: #15 | 2023-03-20 21:06:15 -03:00 |  |