Commits · 467b57b4dbeddfa01a9c51a15cb9df686863f423 · inutralia / 2018_web_app · GitLab

12 Dec, 2018 2 commits
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app · 467b57b4
```
# Conflicts:
#	fuel/app/classes/controller/listacompra/index.php
#	fuel/app/views/listacompra/index.twig
```
  Luis Perez authored Dec 12, 2018
  467b57b4 Browse Files
- Terminado modulo ingredientes · d97732a8
  Luis Perez authored Dec 12, 2018
  
  d97732a8 Browse Files
11 Dec, 2018 26 commits
- añadida imagen para modal notificacion en caso de not save y añadida ruta en main.js · 72f658ad
  gema authored Dec 11, 2018
  
  72f658ad Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app into gemis_dev · 48265584
  gema authored Dec 11, 2018
  
  48265584 Browse Files
- ajustes responsive · 8ecfb025
  gema authored Dec 11, 2018
  
  8ecfb025 Browse Files
- Merge branch 'master' into dev_villa · 0d6e04c5
  David Villalba authored Dec 11, 2018
  
  0d6e04c5 Browse Files
- Metodo para notificar desde el controllador mediante el modal de notificaiones. · 846b36c6
  David Villalba authored Dec 11, 2018
  
  846b36c6 Browse Files
- ajusters loading page · 9fda1425
  gema authored Dec 11, 2018
  
  9fda1425 Browse Files
- ajustes en lista de la compra · 16d7683e
  gema authored Dec 11, 2018
  
  16d7683e Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app · 7106746f
  Luis Perez authored Dec 11, 2018
  
  7106746f Browse Files
- Actualizaciones listra de la compra · 290718c3
  Luis Perez authored Dec 11, 2018
  
  290718c3 Browse Files
- ajustes responsive · 0d6d3cd9
  gema authored Dec 11, 2018
  
  0d6d3cd9 Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app into gemis_dev · a9292f32
  gema authored Dec 11, 2018
  
  a9292f32 Browse Files
- ajustes responsive · 66f85bb6
  gema authored Dec 11, 2018
  
  66f85bb6 Browse Files
- Modificar menus personalizados. · e141011e
  David Villalba authored Dec 11, 2018
  
  e141011e Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app into gemis_dev · 600db0b4
  gema authored Dec 11, 2018
  
  600db0b4 Browse Files
- Merge branch 'master' into dev_villa · bfbb32b7
  David Villalba authored Dec 11, 2018
  
  bfbb32b7 Browse Files
- Guardamos recetas en menu personalizado. · dfed8d4d
  David Villalba authored Dec 11, 2018
  
  dfed8d4d Browse Files
- Funcion que busca los inputs seleccionados y los pinta. · b7e3a3a1
  David Villalba authored Dec 11, 2018
  
  b7e3a3a1 Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app into gemis_dev · 627a029b
  gema authored Dec 11, 2018
  
  627a029b Browse Files
- ajustes responsive · 820ed667
  gema authored Dec 11, 2018
  
  820ed667 Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app · 6eea228d
  Luis Perez authored Dec 11, 2018
  
  6eea228d Browse Files
- corregido error en lista de la compra cuando no se han guardado ninguna receta · 3747d4d1
  Luis Perez authored Dec 11, 2018
  
  3747d4d1 Browse Files
- ajustes responsive · 81267061
  gema authored Dec 11, 2018
  
  81267061 Browse Files
- Lista de la compra con borrado de datos. · 246daf5a
  Luis Perez authored Dec 11, 2018
  
  246daf5a Browse Files
- sql movido de directorio · 5388e281
  Luis Perez authored Dec 11, 2018
  
  5388e281 Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app · 3a7dc215
  Luis Perez authored Dec 11, 2018
  
  3a7dc215 Browse Files
- ingredientes en lista de la compra · 41b62a1d
  Luis Perez authored Dec 11, 2018
  
  41b62a1d Browse Files
10 Dec, 2018 12 commits
- Merge branch 'master' into dev_villa · 75ee7094
  David Villalba authored Dec 10, 2018
  
  75ee7094 Browse Files
- Guardamos menus personalizados. · 979ffd27
  David Villalba authored Dec 10, 2018
  
  979ffd27 Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app · 466caa69
  Luis Perez authored Dec 10, 2018
  
  466caa69 Browse Files
- Añadido nuevo metodo al modelo que devuelve las recetas de la semana. · f6ab012c
```
Nuevo elemento SQL para cargar
```
  Luis Perez authored Dec 10, 2018
  f6ab012c Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app into gemis_dev · 89679d00
  gema authored Dec 10, 2018
  
  89679d00 Browse Files
- añadido nombre tipo de menu saludable a la vista menu saludable semanal. ajustes responsive · 61b5a199
  gema authored Dec 10, 2018
  
  61b5a199 Browse Files
- Merge branch 'master' of http://git.setisl.com/inutraliaapp/2018_web_app · 5f2942dc
```
# Conflicts:
#	fuel/app/classes/controller/listacompra/index.php
```
  Luis Perez authored Dec 10, 2018
  5f2942dc Browse Files
- Inciado controller lista de la compra · ca9703ec
  Luis Perez authored Dec 10, 2018
  
  ca9703ec Browse Files
- Diseñada e implementada estructura de la base de datos · c9b94d13
```
Añadidos nuevos modelos y eliminados antiguos
```
  Luis Perez authored Dec 10, 2018
  c9b94d13 Browse Files
- Merge branch 'master' into dev_villa · ac465afe
```
# Conflicts:
#	fuel/app/classes/controller/menupersonalizado/index.php
```
  David Villalba authored Dec 10, 2018
  ac465afe Browse Files
- Menu personalizado -.-> Post update. · 928b2bca
  David Villalba authored Dec 10, 2018
  
  928b2bca Browse Files
- menu vertical ajustes responsive ipads · b680770e
  gema authored Dec 10, 2018
  
  b680770e Browse Files