Commit Graph

94 Commits

Author SHA1 Message Date
casnet1 62dceaf1aa solo el front, errores de data 2020-12-08 11:08:08 -06:00
casnet1 ba57e6d17f cambio de variables 2020-12-04 18:41:50 -06:00
casnet1 e1b12a1829 cambio de variables 2020-12-04 18:41:15 -06:00
Lemuel Marquez 639218c754 merge errors 2020-12-04 16:33:00 -06:00
Marcorv6 b268b78d00 vistaServicio final2 2020-12-04 16:31:25 -06:00
Marcorv6 b0574b397c vistaServicio final 2020-12-04 16:30:15 -06:00
Lemuel Marquez 1ff4f16bbf merge erros solved 2020-12-03 18:09:57 -06:00
Lemuel Marquez c7579488dc merge errors solved 2020-12-03 17:53:07 -06:00
Marcorv6 f3a3f32e25 revision dic 3 2020-12-03 17:47:48 -06:00
casnet1 eb65a43d0a cambios a las vistas de alumno 2020-12-03 17:17:21 -06:00
Marcorv6 073dfd95c8 mostrar confirmar 2020-12-03 15:34:28 -06:00
Marcorv6 b556ce6785 Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into marco 2020-12-02 15:52:08 -06:00
Marcorv6 b1135f7a9c chargeVistaServicio 2020-12-02 15:51:05 -06:00
casnet1 d942059977 fechas cambiadas 2020-12-02 00:02:19 -06:00
casnet1 9e098ab0a1 faltan las fechas 2020-12-01 22:49:52 -06:00
casnet1 905ae6c746 peticiones alumno put listas 2020-12-01 22:01:40 -06:00
Andres2908 517000ff86 V-2.1-2componentes 2020-12-01 17:23:49 -06:00
Andres2908 32839c9a17 Merge 2020-12-01 12:40:54 -06:00
Andres2908 032af2ab9b V-2.0-Servicios 2020-12-01 12:24:37 -06:00
Lemuel Marquez 9af125a1bf guardar usuario local sotrage 2020-11-30 21:13:21 -06:00
Lemuel Marquez 5e932ee216 correcion de agregar 0 2020-11-30 20:49:43 -06:00
casnet1 8c8fa6b8ac alumno aun no completado 2020-11-30 20:48:01 -06:00
casnet1 470278dd01 alumno aun no completado 2020-11-30 20:47:05 -06:00
Lemuel Marquez f727d0397a Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-11-30 20:05:23 -06:00
Lemuel Marquez f38cf4fda5 merge error solved 2020-11-30 20:05:17 -06:00
Marcorv6 5c73ff222a rechazar 2020-11-30 19:59:46 -06:00
Andres2908 93b49a1ace V-1.91 2020-11-30 19:57:08 -06:00
casnet1 65fb548580 login cool, cambios a responsable/nuevo (sin probar aun con api) 2020-11-30 14:55:46 -06:00
Andres2908 0d238306aa V-1.9-loading-colores 2020-11-29 19:41:17 -06:00
casnet1 5607d3adfb Merge remote-tracking branch 'origin/dev' into eithan 2020-11-29 15:41:21 -06:00
Andres2908 73854eb031 V-1.8-Paginacion 2020-11-27 19:49:26 -06:00
casnet1 23e7405861 Merge remote-tracking branch 'origin/dev' into eithan 2020-11-26 17:30:05 -06:00
casnet1 d74c6db0fd input profesor 2020-11-26 17:29:14 -06:00
Lemuel Marquez 17bcb1b1b0 Merge branch 'eithan' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-11-26 16:35:09 -06:00
casnet1 3420c8e116 cambios 2020-11-26 16:33:31 -06:00
Lemuel Marquez 39c7eedf34 merges problesm fix 2020-11-26 16:32:42 -06:00
Marcorv6 df193db2d6 servicio/cancelar 2020-11-26 16:29:33 -06:00
Andres2908 1da40f38f7 V-1.7-axios 2020-11-26 16:19:34 -06:00
Andres2908 08662abc38 V-1.6-Antes-del-cambio 2020-11-25 15:16:10 -06:00
casnet1 74204f380a cambio de variables local storage 2020-11-25 14:23:37 -06:00
casnet1 3e55633590 login, registro nuevo funcial pero falta limpiar 2020-11-24 20:30:11 -06:00
Andres2908 805b10755b Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into tomy 2020-11-23 18:59:02 -06:00
Andres2908 124d7e4b6a tablaIncompleta 2020-11-23 18:48:37 -06:00
Marcorv6 61f49c7ee6 chequeo 2020-11-23 16:31:18 -06:00
Andres2908 7b64ccd320 git checkout tomy 2020-11-23 15:35:03 -06:00
casnet1 fc76339391 nuxt.config api y vistas alumno 2020-11-23 15:03:03 -06:00
casnet1 b52a714a3f cambio de ruta del formulario y arreglo de conflictos merge 2020-11-20 14:43:58 -06:00
casnet1 b174d80b77 vistas de usuario y boton a responsable 2020-11-20 14:31:23 -06:00
Marcorv6 c897295b53 regresar/localstorage 2020-11-19 16:21:02 -06:00
Marcorv6 7576a5bbfe tabla responsables 2020-11-19 16:12:38 -06:00