Commit Graph

64 Commits

Author SHA1 Message Date
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 73854eb031 V-1.8-Paginacion 2020-11-27 19:49:26 -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
Andres2908 398522eb46 V-1.5-AdminProvisional 2020-11-18 19:02:13 -06:00
puma99 287b90c757 Merge branch 'eithan' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-11-16 14:21:07 -06:00
casnet1 a15f520b20 container 2020-11-16 14:17:06 -06:00
puma99 2370ebe3c7 Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-11-16 13:52:01 -06:00
Andres2908 afaf0db004 V-1.4-boton 2020-11-16 13:48:12 -06:00
Marcorv6 661dfd37a1 Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into marco 2020-11-16 13:45:57 -06:00
Marcorv6 d4f44b3eaf cuarto commit 2020-11-16 13:45:00 -06:00
casnet1 8702aaef89 nuevos cambios 2020-11-15 03:44:43 -06:00
puma99 963a3f70a3 juntar todo 2020-11-13 20:03:38 -06:00
puma99 6db3c35eaf Merge branch 'eithan' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-11-13 19:57:53 -06:00
puma99 aa9430b5a9 Merge branch 'marco' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-11-13 19:47:47 -06:00
casnet1 ea735128cd codigo comentado 2020-11-13 19:46:17 -06:00
Marcorv6 5616d40c5c tercer commit 2020-11-13 19:36:52 -06:00
puma99 dd126e937d Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-11-13 19:32:05 -06:00
puma99 67befbc0a6 login a medias 2020-11-13 19:30:48 -06:00
Saavedra Trejo 646d891bc5 eliminandoComponente 2020-11-14 00:34:20 +00:00
Saavedra Trejo 9d0154d4ea eliminandoComponente 2020-11-14 00:33:15 +00:00
puma99 619371dc13 footer temporal 2020-11-13 18:30:17 -06:00
puma99 2bc31d390c header reactivo 2020-11-13 18:19:14 -06:00
casnet1 05061ccc89 primera parte 2020-11-13 17:58:45 -06:00
Marcorv6 246aaefac5 Segundo commit 2020-11-13 16:46:50 -06:00
Andres2908 76d9444dd4 V-1-3-index 2020-11-12 22:49:18 -06:00
Andres2908 6ca9d69cc9 V-1.2-tablaProvisional 2020-11-12 22:40:56 -06:00
Andres2908 2b97f4c6d0 Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into tomy 2020-11-11 18:19:01 -06:00
casnet1 e7ed8e667f Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into eithan 2020-11-11 18:17:29 -06:00
Andres2908 f6c0f860f2 V1.1 2020-11-11 18:17:04 -06:00
Marcorv6 caf4f56f90 Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into marco 2020-11-11 18:15:38 -06:00
casnet1 622e7e1ed6 nada aun 2020-11-11 18:15:32 -06:00
Marcorv6 fde1e0c5c9 Primer avance 2020-11-11 18:15:05 -06:00
puma99 26d9ed511b header temporal 2020-11-11 18:13:26 -06:00