Commit Graph

288 Commits

Author SHA1 Message Date
Andres2908 c4973bc87f estableEspecial 2021-02-10 23:15:54 -06:00
Andres2908 1e857ac576 datosYFormulario 2021-02-10 23:09:13 -06:00
puma99 02ec9bd5e0 Merge branch 'marco' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2021-02-07 00:00:25 -06:00
Marcorv6 943dad3f96 tablas caso especial 2021-02-06 23:40:22 -06:00
Marcorv6 36016d4cfe carpetas caso especial 2021-02-05 19:26:01 -06:00
puma99 85142fbaca colores etiquetas 2021-02-04 19:37:06 -06:00
puma99 a48fd28466 Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front 2021-02-04 19:35:04 -06:00
Marcorv6 1948f46610 Merge branch 'bebe' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into marco 2021-02-03 16:05:49 -06:00
Marcorv6 581e33d75c rama bebe 2021-02-03 16:05:23 -06:00
Marcorv6 4ab26a0baa rama bebe 2021-02-03 16:02:55 -06:00
puma99 38b225edd1 Merge branch 'marco' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2021-02-02 14:31:11 -06:00
Marcorv6 eadd20afd8 carpeta programa 2021-02-02 14:28:15 -06:00
puma99 3d9b614317 profesor/responsable 2021-01-29 12:01:27 -06:00
Andres2908 ce4f250421 Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into tomy 2021-01-25 19:56:54 -06:00
Andres2908 6a8ecf8840 correccionColoresStatus 2021-01-25 19:56:31 -06:00
puma99 c7b68563d5 listo 2021-01-25 15:11:05 -06:00
puma99 ca947164f8 merge error 2021-01-25 15:09:45 -06:00
puma99 d7383921db botones cancelar no se muestran donde no 2021-01-25 15:07:49 -06:00
Marcorv6 50c090f9c1 status 6 y 10 2021-01-25 13:45:58 -06:00
puma99 7cbd43ce3b listo 2021-01-22 19:00:07 -06:00
puma99 b3dd57d9df listo 2021-01-22 18:55:24 -06:00
puma99 56db9d343d fehca viata alumno reparada 2021-01-22 18:50:32 -06:00
eithan e375b0ce3d Merge remote-tracking branch 'origin/dev' into eithan 2021-01-21 20:17:28 -06:00
eithan dff1573efb fecha cambio 2021-01-21 20:17:05 -06:00
puma99 dfffd15b57 1.0.0 pruebas 2021-01-21 19:43:10 -06:00
puma99 e8cba708ce cambios fecha 2021-01-21 19:40:29 -06:00
puma99 3f49a6535d Merge branch 'marco' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front 2021-01-21 19:38:09 -06:00
puma99 bfebdca4fd Merge branch 'tomy' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front 2021-01-21 19:38:02 -06:00
Andres2908 583883dbc0 Merge branch 'dev' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into tomy 2021-01-21 19:30:27 -06:00
Andres2908 d2041cea8e cambioFecha 2021-01-21 19:30:10 -06:00
Marcorv6 5af1f16f98 formato fechas 2021-01-21 19:23:26 -06:00
puma99 c2f546eaa5 1.0.0v 2021-01-19 20:29:09 -06:00
puma99 646a5d63c6 Merge branch 'eithan' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front 2021-01-19 20:26:19 -06:00
eithan df3590779c enter prueba 2021-01-19 19:17:25 -06:00
eithan f000b14187 Merge remote-tracking branch 'origin/dev' into eithan 2021-01-19 18:58:20 -06:00
eithan 11f4b1a5cd login cambios rapidos 2021-01-19 18:55:45 -06:00
puma99 a5e1ccc24f 1.0.0v 2021-01-19 15:39:23 -06:00
puma99 cfc70ab77e version pre final para pruebas 2021-01-19 15:34:51 -06:00
puma99 1e55884eea Merge branch 'marco' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2021-01-19 15:19:39 -06:00
Marcorv6 8abff29002 margin footer 2021-01-18 14:11:41 -06:00
Marcorv6 6207090f25 push carga masiva 2021-01-15 23:08:55 -06:00
Marcorv6 ac5880457c Select clave programa 2021-01-15 23:03:36 -06:00
Lemuel Marquez 0c3ac5b6ec casi listo para produccion 2021-01-15 13:37:25 -06:00
Andres2908 f96052ff0d erroresMerge 2021-01-14 17:09:56 -06:00
Andres2908 c84df95bf0 merge 2021-01-14 17:07:44 -06:00
Andres2908 3ebb8c6941 addDiaCreacion 2021-01-14 17:06:40 -06:00
Lemuel Marquez 076b926723 acatlan contigo 2021-01-13 23:51:06 -06:00
Lemuel Marquez acac1359c0 Merge branch 'marco' of https://repositorio.acatlan.unam.mx/CIDWA/servicio_social_front into dev 2021-01-13 20:38:01 -06:00
Marcorv6 35bdfc4d5f Acatlan contigo 2021-01-13 20:37:25 -06:00
Lemuel Marquez cb6d387978 holi jaz 2021-01-12 22:09:14 -06:00