Commits · 4b26ed3cfbde134156d89b6d7d5937a44db298bf · Mario Chirinos / GeoInt_SIDT · GitLab

26 Feb, 2019 5 commits
- Dashboard · 4b26ed3c
  Ulises Morales Ramírez authored Feb 26, 2019
  
  4b26ed3c
- Dashboard · 58297e12
  Ulises Morales Ramírez authored Feb 26, 2019
  
  58297e12
- Dashboard · 7a70a5ec
  Ulises Morales Ramírez authored Feb 26, 2019
  
  7a70a5ec
- fix bugs en reports · 0081f439
  Ulises Morales Ramírez authored Feb 26, 2019
  
  0081f439
- parchado de errores · cc96be5e
  Ulises Morales Ramírez authored Feb 26, 2019
  
  cc96be5e
22 Feb, 2019 1 commit
- parchado de errores · 91b71418
  Ulises Morales Ramírez authored Feb 22, 2019
  
  91b71418
21 Feb, 2019 10 commits
- panel de administracion · ac0a5e60
  Ulises Morales Ramírez authored Feb 21, 2019
  
  ac0a5e60
- parchado de errores · 9582b653
  Ulises Morales Ramírez authored Feb 21, 2019
  
  9582b653
- parchado de errores · 33097eed
  Ulises Morales Ramírez authored Feb 21, 2019
  
  33097eed
- Merge remote-tracking branch 'origin/dev' into dev · cb184636
  Ulises Morales Ramírez authored Feb 21, 2019
  
  cb184636
- parchado de errores · 3333df0e
  Ulises Morales Ramírez authored Feb 21, 2019
  
  3333df0e
- loading agregado al boton de add-to-cart · 4e692a1c
  Sergio Adrian Gongora Euan authored Feb 21, 2019
  
  4e692a1c
- parchado de errores · 415d4503
  Ulises Morales Ramírez authored Feb 21, 2019
  
  415d4503
- listar directorios · 7e5946ec
  Ulises Morales Ramírez authored Feb 21, 2019
  
  7e5946ec
- modificacion de vista de menu y title en reporte · 5d76cc2c
  Sergio Adrian Gongora Euan authored Feb 21, 2019
  
  5d76cc2c
- Añadida información de la búsqueda en la vista del reporte. Añadido path de thumbnails · 8b6ab504
  Irving Sánchez authored Feb 21, 2019
  
  8b6ab504
20 Feb, 2019 8 commits
- listar directorios · 3c06f7fb
  Ulises Morales Ramírez authored Feb 20, 2019
  
  3c06f7fb
- Merge remote-tracking branch 'origin/dev' into dev · 550e1b3f
  Ulises Morales Ramírez authored Feb 20, 2019
```
# Conflicts:
#	reports/views.py
```
  550e1b3f
- listar directorios · 5245fc8e
  Ulises Morales Ramírez authored Feb 20, 2019
  
  5245fc8e
- play images · 43dd87b3
  Sergio Adrian Gongora Euan authored Feb 20, 2019
  
  43dd87b3
- Merge branch 'administration' into 'dev' · 6f45d711
  Ulises Morales Ramírez authored Feb 20, 2019
```
formulario de registro

See merge request !14
```
  6f45d711
- formulario de registro · a195c5f9
  Ulises Morales Ramírez authored Feb 20, 2019
  
  a195c5f9
- Agrego boton de play y stop · de0c463e
  Sergio Adrian Gongora Euan authored Feb 20, 2019
  
  de0c463e
- Reparado bug en el menu de show_cart.html y agregado cambios en este · ea1158dd
  Sergio Adrian Gongora Euan authored Feb 20, 2019
  
  ea1158dd
19 Feb, 2019 9 commits
- formulario de registro · 69351823
  Ulises Morales Ramírez authored Feb 19, 2019
  
  69351823
- formulario de registro · 03f19682
  Ulises Morales Ramírez authored Feb 19, 2019
  
  03f19682
- Merge remote-tracking branch 'origin/dev' into dev · dd5d09e2
  Ulises Morales Ramírez authored Feb 19, 2019
  
  dd5d09e2
- formulario de registro · 9fcf4fd8
  Ulises Morales Ramírez authored Feb 19, 2019
  
  9fcf4fd8
- Pequeño cambio. Cambiado el footer 2018 a 2019 · 1ce28004
  Irving David authored Feb 19, 2019
  
  1ce28004
- Merge branch 'admin' into 'dev' · e65877fe
  Ulises Morales Ramírez authored Feb 19, 2019
```
Admin

See merge request !13
```
  e65877fe
- Admin · 242257f4
  Ulises Morales Ramírez authored Feb 19, 2019
  
  242257f4
- Merge branch 'dev' of gitlab.geoint.mx:mario.chirinos/GeoInt_SIDT into dev · 9b18475d
  Emmanuel René Huchim Puc authored Feb 19, 2019
  
  9b18475d
- wkt script with shapely · eef3c6f3
  Emmanuel René Huchim Puc authored Feb 19, 2019
  
  eef3c6f3
18 Feb, 2019 3 commits
- se agregó una validación al middleware · ae21d2b0
  Ulises Morales Ramírez authored Feb 18, 2019
```
se agrego la app para enviar correos
```
  ae21d2b0
- se agregó una columna a la tabla purchase · 9cb22c50
  Ulises Morales Ramírez authored Feb 18, 2019
  
  9cb22c50
- se agregó una columna a la tabla purchase · dddcb07f
  Ulises Morales Ramírez authored Feb 18, 2019
  
  dddcb07f
15 Feb, 2019 4 commits
- se agregó una columna a la tabla purchase · 92dffae3
  Ulises Morales Ramírez authored Feb 15, 2019
  
  92dffae3
- se agregó una columna a la tabla purchase · fc87976f
  Ulises Morales Ramírez authored Feb 15, 2019
  
  fc87976f
- cambio de tipo de tabla, filtro de busqueda, paginación · 01b40c8e
  Ulises Morales Ramírez authored Feb 15, 2019
  
  01b40c8e
- cambio de tipo de tabla, filtro de busqueda, paginación · c70b1b38
  Ulises Morales Ramírez authored Feb 15, 2019
  
  c70b1b38