Commit Graph

142 Commits

Author SHA1 Message Date
Lemuel Marquez 2f92ddea4a identacion 2021-01-05 15:14:10 -06:00
Lemuel Marquez 086da2a0c7 correciones de marco 2021-01-05 15:08:03 -06:00
Lemuel Marquez 2aebf2112c error merge 2021-01-05 14:47:03 -06:00
Lemuel Marquez 6245352d39 Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2021-01-05 14:45:54 -06:00
Lemuel Marquez 1b59e226a6 pequeño error 2021-01-05 14:45:49 -06:00
Marcorv6 d9563134b2 carga masiva 2 2021-01-05 02:26:47 -06:00
Marcorv6 279f75d6a9 componente regresar 2021-01-05 02:04:07 -06:00
eithan 4b836f6f5a merge a dev 2021-01-04 23:56:01 -06:00
eithan a66425b867 fechas max y min, programa acatlan,cambio status alumno, otros 2021-01-04 23:54:27 -06:00
Andres2908 cdea33953c arreglosEsteticos 2021-01-04 20:34:02 -06:00
Lemuel Marquez 72ed9239e8 Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2021-01-04 18:17:54 -06:00
Andres2908 7cdaad0805 botonesCuestionario 2021-01-04 18:02:57 -06:00
Andres2908 e80eabb4ec regresoAceptacion 2021-01-04 17:31:37 -06:00
Lemuel Marquez dc7cb569fd error merge 2021-01-04 17:10:45 -06:00
eithan 1a7c073eaf cuestionario completo, api en local 2021-01-02 17:06:57 -06:00
Marcorv6 6570ecaa37 beforeCreates 2020-12-30 22:15:38 -06:00
Lemuel Marquez 55564b8e8b error $ 2020-12-28 21:49:18 -06:00
Lemuel Marquez 065561783c merge error 2020-12-28 21:42:09 -06:00
Marcorv6 2fc904f95c Componente documento 2020-12-28 04:24:00 -06:00
Andres2908 2cc5c41000 paginacion 2020-12-27 23:55:48 -06:00
Andres2908 9968ba5912 corregirPaginacion 2020-12-27 23:55:00 -06:00
Marcorv6 78bfe93e34 carga masiva 2020-12-27 20:35:46 -06:00
eithan b7a81a79b3 Merge remote-tracking branch 'origin/dev' into eithan 2020-12-27 14:19:01 -06:00
Lemuel Marquez aff371aad0 rutas 2020-12-26 23:41:51 -06:00
Lemuel Marquez 32265f0526 Merge branch 'marco' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-12-26 22:58:21 -06:00
Marcorv6 1b061edfa9 estilos 2020-12-26 22:57:22 -06:00
Lemuel Marquez 89fc8ec112 Merge branch 'marco' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-12-26 22:42:08 -06:00
Marcorv6 ad371cf24e partiendo en componentes 2020-12-23 03:58:15 -06:00
Andres2908 a5cf4f9265 V-2.8-cartasCuestionario 2020-12-14 14:19:16 -06:00
casnet1 1b83056592 vista cuestionario con un if, fecha minima, datos dinamicos alumno, variable creditos a int 2020-12-11 19:16:47 -06:00
casnet1 bc96823a7f porcentaje creditos 2020-12-10 18:50:07 -06:00
casnet1 9e7c3ca610 Merge remote-tracking branch 'origin/dev' into eithan 2020-12-10 18:11:39 -06:00
casnet1 20f530af82 fechas alumno 2020-12-10 18:11:25 -06:00
Marcorv6 754ffec329 porcentaje 2020-12-10 17:56:38 -06:00
Andres2908 05308ad138 Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into tomy 2020-12-10 17:25:01 -06:00
Lemuel Marquez 47b02f26f1 Merge branch 'marco' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-12-10 15:09:25 -06:00
Lemuel Marquez eb4dcddb59 falta de ortografia 2020-12-10 15:09:21 -06:00
Marcorv6 7dcae9cbb2 liberacion corregida 2020-12-10 14:53:01 -06:00
Andres2908 c1f8a2ac6c errores2 2020-12-10 14:05:16 -06:00
Andres2908 6819a7b5dc Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into tomy 2020-12-10 14:02:22 -06:00
Andres2908 b2c063195b correccionErrores 2020-12-10 14:02:07 -06:00
Lemuel Marquez fa1c0dab13 correciones 2020-12-10 13:40:55 -06:00
Andres2908 c9d6bbd128 V-2.7-cartaTerminoCorregida 2020-12-10 13:06:44 -06:00
puma99 c28de3ebea carta termino 2020-12-10 10:41:59 -06:00
Andres2908 3c299fb80e Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into tomy 2020-12-09 20:22:52 -06:00
Andres2908 44881250c2 CartaTermino 2020-12-09 20:22:40 -06:00
Lemuel Marquez 136e0c1865 hola 2020-12-09 18:29:19 -06:00
Andres2908 7e248ec15e errorMerge 2020-12-09 18:24:08 -06:00
Marcorv6 95fee3520e mensaje cuestionarios 2020-12-09 18:14:13 -06:00
Lemuel Marquez 1ab86124a5 error eithan 2020-12-09 17:59:32 -06:00