Commit Graph

96 Commits

Author SHA1 Message Date
Andres2908 bfad136d77 prueba2 2021-01-12 17:47:05 -06:00
Lemuel Marquez bb87355c88 merge marco eithan 2021-01-06 15:48:46 -06:00
Marcorv6 ea9ea756f3 Funcion error 2021-01-06 15:27:23 -06:00
eithan dee659a204 peticiones con tokens correctas, status de vistas de alumnos correctos 2021-01-06 06:33:28 -06:00
eithan 5a7ceaa213 Merge remote-tracking branch 'origin/dev' into eithan 2021-01-06 00:29:44 -06:00
Marcorv6 34773defe0 token 2021-01-06 00:10:12 -06:00
eithan a9fdd4b80d tokens, funcion error sin probar, cambiar los loading de js a html 2021-01-05 23:04:49 -06:00
Andres2908 015664574b Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into tomy 2021-01-05 16:44:20 -06:00
Andres2908 559a503c25 tokens-cuestionario 2021-01-05 16:43:09 -06:00
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
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
eithan 1a7c073eaf cuestionario completo, api en local 2021-01-02 17:06:57 -06:00
eithan b33e38de7a validar nav 2021-01-01 15:10:54 -06:00
Marcorv6 6570ecaa37 beforeCreates 2020-12-30 22:15:38 -06:00
Marcorv6 06d95295b3 pequeños cambios 2020-12-29 00:23:39 -06:00
Lemuel Marquez 065561783c merge error 2020-12-28 21:42:09 -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
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 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 7dcae9cbb2 liberacion corregida 2020-12-10 14:53:01 -06:00
casnet1 22ac2824d2 Merge remote-tracking branch 'origin/dev' into eithan 2020-12-10 09:18:16 -06:00
casnet1 a6b96a3aed ya casi, front funciona 2020-12-10 09:17:58 -06:00
Marcorv6 f72423d206 console log 2020-12-09 16:14:15 -06:00
Marcorv6 17f109900c infoResponsable 2020-12-09 16:13:26 -06:00
Marcorv6 ddaa721175 errores de merge 2020-12-09 15:32:07 -06:00
Marcorv6 47aecc729a 091220 2020-12-09 14:24:05 -06:00
Lemuel Marquez 7108013593 quitar archivos inutiles y formato 2020-12-08 21:50:16 -06:00
casnet1 d7f7901b5b tamaño archico, mas data, reload 2020-12-08 20:11:51 -06:00
casnet1 66dfae4dd8 tamaño archico, mas data, reload 2020-12-08 20:10:52 -06:00
Lemuel Marquez b3f0765d2b menu valida tener localstorage completo 2020-12-08 19:21:19 -06:00
casnet1 308b49d448 cambios rapidos 2020-12-08 19:05:04 -06:00
Lemuel Marquez eb36ac1bdf Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-12-08 18:45:48 -06:00
Andres2908 24a400dad3 V-2.4-ErroresCartas 2020-12-08 18:41:21 -06:00
Lemuel Marquez 4c42ab9c78 Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-12-08 14:26:07 -06:00
casnet1 e7b82c83d4 merge a dev 2020-12-08 13:08:42 -06:00
casnet1 33c1cb5c5e data model 2020-12-08 13:05:30 -06:00
casnet1 62dceaf1aa solo el front, errores de data 2020-12-08 11:08:08 -06:00
Andres2908 8b627da031 V-2.3-CorreccionCartas 2020-12-07 16:13:14 -06:00
Lemuel Marquez 6c5f931e68 Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-12-07 14:31:09 -06:00
Andres2908 81e14523f3 V-2.2-StatusTable 2020-12-07 14:11:29 -06:00
Lemuel Marquez f5562cd2e2 Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2020-12-07 14:03:27 -06:00
Andres2908 a2cc9cf713 cartaCuestionario 2020-12-04 17:55:45 -06:00
Andres2908 b6f0ce1ec1 faltanFormas 2020-12-04 17:22:54 -06:00
Lemuel Marquez c7579488dc merge errors solved 2020-12-03 17:53:07 -06:00