0000000000000000000000000000000000000000 b734bd6146df82d57eb0056a5ca9ce1e7452dd3c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590062169 -0500	clone: from ssh://marcocantugea@git.code.sf.net/p/mcgcitasenlinea/code
b734bd6146df82d57eb0056a5ca9ce1e7452dd3c 4dda690beb0eb32c970f7b81ef23f6aa75ba058c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590065187 -0500	checkout: moving from master to version2
4dda690beb0eb32c970f7b81ef23f6aa75ba058c 4dda690beb0eb32c970f7b81ef23f6aa75ba058c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590065215 -0500	checkout: moving from version2 to v2-Dev
4dda690beb0eb32c970f7b81ef23f6aa75ba058c 5c6f00e14b2099be27c38a9d3dd41247c79b231c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590066363 -0500	commit: Change the TopInclude to avoid to configure manually the load of clasess
5c6f00e14b2099be27c38a9d3dd41247c79b231c 6104fcfe94e2e3e3d70f0b6a5e29a509fa4c69fe Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107065 -0500	commit: Optimize the class loader, remove injected js code
6104fcfe94e2e3e3d70f0b6a5e29a509fa4c69fe b734bd6146df82d57eb0056a5ca9ce1e7452dd3c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107239 -0500	checkout: moving from v2-Dev to master
b734bd6146df82d57eb0056a5ca9ce1e7452dd3c 03297bf467e77272802647b0b4a98b36b644342e Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107639 -0500	commit (merge): Merge branch 'v2-Dev'
03297bf467e77272802647b0b4a98b36b644342e 6104fcfe94e2e3e3d70f0b6a5e29a509fa4c69fe Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107660 -0500	checkout: moving from master to v2-Dev
6104fcfe94e2e3e3d70f0b6a5e29a509fa4c69fe 6bafed10b12a12f4ff976139e49689cd449719d4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107719 -0500	commit: Fix master conflict modifications
6bafed10b12a12f4ff976139e49689cd449719d4 03297bf467e77272802647b0b4a98b36b644342e Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107737 -0500	checkout: moving from v2-Dev to master
03297bf467e77272802647b0b4a98b36b644342e 6bafed10b12a12f4ff976139e49689cd449719d4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107801 -0500	checkout: moving from master to V2-Dev
6bafed10b12a12f4ff976139e49689cd449719d4 03297bf467e77272802647b0b4a98b36b644342e Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107810 -0500	checkout: moving from V2-Dev to master
03297bf467e77272802647b0b4a98b36b644342e 5bbe6f265587dbb1e6a41218d2d315e38262d1ab Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107819 -0500	merge v2-Dev: Merge made by the 'recursive' strategy.
5bbe6f265587dbb1e6a41218d2d315e38262d1ab 0daf55f9961aabf4f201f0dc432221c80d39ad05 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590107940 -0500	checkout: moving from master to nuevasfuncionalidades
0daf55f9961aabf4f201f0dc432221c80d39ad05 6bafed10b12a12f4ff976139e49689cd449719d4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590108042 -0500	checkout: moving from nuevasfuncionalidades to v2-Dev
6bafed10b12a12f4ff976139e49689cd449719d4 5bbe6f265587dbb1e6a41218d2d315e38262d1ab Marco Cantu Gea <marco.cantu.g@gmail.com> 1590108763 -0500	checkout: moving from v2-Dev to master
5bbe6f265587dbb1e6a41218d2d315e38262d1ab 0daf55f9961aabf4f201f0dc432221c80d39ad05 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590108847 -0500	checkout: moving from master to nuevasfuncionalidades
0daf55f9961aabf4f201f0dc432221c80d39ad05 0daf55f9961aabf4f201f0dc432221c80d39ad05 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590108850 -0500	checkout: moving from nuevasfuncionalidades to nuevasfuncionalidades
0daf55f9961aabf4f201f0dc432221c80d39ad05 5bbe6f265587dbb1e6a41218d2d315e38262d1ab Marco Cantu Gea <marco.cantu.g@gmail.com> 1590108907 -0500	checkout: moving from nuevasfuncionalidades to master
5bbe6f265587dbb1e6a41218d2d315e38262d1ab 6bafed10b12a12f4ff976139e49689cd449719d4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590108912 -0500	checkout: moving from master to v2-Dev
6bafed10b12a12f4ff976139e49689cd449719d4 0daf55f9961aabf4f201f0dc432221c80d39ad05 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590108939 -0500	checkout: moving from v2-Dev to nuevasfuncionalidades
0daf55f9961aabf4f201f0dc432221c80d39ad05 4dda690beb0eb32c970f7b81ef23f6aa75ba058c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590109000 -0500	checkout: moving from nuevasfuncionalidades to version2
4dda690beb0eb32c970f7b81ef23f6aa75ba058c 0daf55f9961aabf4f201f0dc432221c80d39ad05 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590109033 -0500	checkout: moving from version2 to nuevasfuncionalidades
0daf55f9961aabf4f201f0dc432221c80d39ad05 cf94bdfe5aadb34b8bbf86a4fa2440a1139435f1 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590109257 -0500	commit (merge): Merge branch 'V2-Dev' into nuevasfuncionalidades
cf94bdfe5aadb34b8bbf86a4fa2440a1139435f1 6bafed10b12a12f4ff976139e49689cd449719d4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590109280 -0500	checkout: moving from nuevasfuncionalidades to v2-Dev
6bafed10b12a12f4ff976139e49689cd449719d4 cf94bdfe5aadb34b8bbf86a4fa2440a1139435f1 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590109316 -0500	checkout: moving from v2-Dev to nuevasfuncionalidades
cf94bdfe5aadb34b8bbf86a4fa2440a1139435f1 6bafed10b12a12f4ff976139e49689cd449719d4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590109373 -0500	checkout: moving from nuevasfuncionalidades to V2-Dev
6bafed10b12a12f4ff976139e49689cd449719d4 cf94bdfe5aadb34b8bbf86a4fa2440a1139435f1 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590109402 -0500	merge nuevasfuncionalidades: Fast-forward
cf94bdfe5aadb34b8bbf86a4fa2440a1139435f1 0ffa96095b544145441c5352a2543970f6833d6b Marco Cantu Gea <marco.cantu.g@gmail.com> 1590150126 -0500	commit: Fix Error preventing to update administrator user
0ffa96095b544145441c5352a2543970f6833d6b 8331f2df203523889c394b0107d7279bfae6aa69 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590151356 -0500	commit: Fix Login Admin login
8331f2df203523889c394b0107d7279bfae6aa69 8331f2df203523889c394b0107d7279bfae6aa69 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590151454 -0500	checkout: moving from V2-Dev to V2-Dev-BootStrapImp
8331f2df203523889c394b0107d7279bfae6aa69 c172e1e918106fd6e8d9114c39a942e6ecc7d09c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590237229 -0500	commit: Implementacion de vistas html en paginas
c172e1e918106fd6e8d9114c39a942e6ecc7d09c a9408ea0dcfb06dcdb274591a2794255c79c7528 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590244505 -0500	commit: implementacion bootsratp en pagina de login y mejorar forma de login
a9408ea0dcfb06dcdb274591a2794255c79c7528 603c92af4d44dff56e6632605df868a273e4aea4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590260835 -0500	commit: Implementando bootstrap en paginas, paginas pendientes
603c92af4d44dff56e6632605df868a273e4aea4 1e9aca0be33efd5c70af192a6017f709c5034971 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590265371 -0500	commit: Renovacion de menu con bootstrap
1e9aca0be33efd5c70af192a6017f709c5034971 ca6acb0a4e97549daff3c41bc222d27406e18527 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590282264 -0500	commit: Arreglo de encabezado de pagina y pie de pagina
ca6acb0a4e97549daff3c41bc222d27406e18527 3b9255a598d623d3c0cdf1cf2c17523ddb445664 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590454053 -0500	commit: Act de panel principal de usuario y administrador
3b9255a598d623d3c0cdf1cf2c17523ddb445664 527c7c1e0176f2ab9f7eedaf3afbd99e4c27c29a Marco Cantu Gea <marco.cantu.g@gmail.com> 1590459118 -0500	commit: Actualizacion de pagina Registrar usuario
527c7c1e0176f2ab9f7eedaf3afbd99e4c27c29a 33e5d75178cd04c29276c1f1aa627b49df86f0cd Marco Cantu Gea <marco.cantu.g@gmail.com> 1590495390 -0500	commit: Actualizacion pagina messageboard
33e5d75178cd04c29276c1f1aa627b49df86f0cd 79f10c5681a8517f94ac26b3ee03e453cc0cfefc Marco Cantu Gea <marco.cantu.g@gmail.com> 1590495880 -0500	commit: Arreglar detalles de messageboard
79f10c5681a8517f94ac26b3ee03e453cc0cfefc 37ca754d39552d49f4ccbf1744659d21ea113c8d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590496378 -0500	commit: Arreglar campos de nombres en pagina
37ca754d39552d49f4ccbf1744659d21ea113c8d 211ef13800440ba8a6c590472d1fd3aee013f72d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590497562 -0500	commit: actualizar pagina de recuperar contraseña
211ef13800440ba8a6c590472d1fd3aee013f72d e2bd8d2138478090919b72851901a1b710e90389 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590498063 -0500	commit: Agrego menu de inicio sin iniciar sesion
e2bd8d2138478090919b72851901a1b710e90389 3a698f92a12c812c248e99bfd42797d340cbf87a Marco Cantu Gea <marco.cantu.g@gmail.com> 1590499225 -0500	commit: Actualizar pagina de agenda disponible
3a698f92a12c812c248e99bfd42797d340cbf87a 5a1b64b676d290485311a9c8e4051b46e54a9171 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590522465 -0500	commit: arreglar acento en pagina
5a1b64b676d290485311a9c8e4051b46e54a9171 8aac1dc853d4253f11d21d3b8eff3bfb6e61c5c7 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590523492 -0500	commit: Actualizacion de pagina de agendar cita
8aac1dc853d4253f11d21d3b8eff3bfb6e61c5c7 dc4251d416b65d2f439d73ec3b10cf9198e0c831 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590533953 -0500	commit: Actulizacion pagina ver cita
dc4251d416b65d2f439d73ec3b10cf9198e0c831 6dbfb7fdbf99873da4d9798face7ab051880e9e8 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590535230 -0500	commit: Actualizacion pagina de adminsitracion de modulos
6dbfb7fdbf99873da4d9798face7ab051880e9e8 79f22b223d1e47c59cbc07f81df6ab5340f9b88d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590538995 -0500	commit: HOTFIX arreglar variable sin declarar
79f22b223d1e47c59cbc07f81df6ab5340f9b88d b836f7ec7698418ac39937d651a4550590ad5ba2 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590539032 -0500	commit: Actualizacion pagina de adminsitracion de menus
b836f7ec7698418ac39937d651a4550590ad5ba2 82a84d017df1c4bb5e74e1201379c10c8365caec Marco Cantu Gea <marco.cantu.g@gmail.com> 1590585981 -0500	commit: Act de paginas de adminsitrador de menus y modulos
82a84d017df1c4bb5e74e1201379c10c8365caec c819bee177224e568b87fef00683328a604bc244 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590586431 -0500	commit: Actualizacion de mensajes de borrado
c819bee177224e568b87fef00683328a604bc244 a0b470ff551e805cb9b275f9ffd93c1f15d20e17 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590594019 -0500	commit: Actualizacion de modulo de perfiles
a0b470ff551e805cb9b275f9ffd93c1f15d20e17 eb057a88312a8fa773155345c6d09b724acbae45 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590596266 -0500	commit: HOTFIX - no mostrar el adminisrtador en registros
eb057a88312a8fa773155345c6d09b724acbae45 81043ffdecd7da52736159473c9aa1aa0645286d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590596325 -0500	commit: Actualizar usuarios registrados
81043ffdecd7da52736159473c9aa1aa0645286d a938ac137772c4e969b7011183095d9eb0d78418 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590615232 -0500	commit: HOTFIX arre error actualizar el perfil de usuario
a938ac137772c4e969b7011183095d9eb0d78418 4627ecb12b8acc303095424a34c4af610a99a572 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590630531 -0500	commit: Act adminstracion de formas
4627ecb12b8acc303095424a34c4af610a99a572 15e7fbd3765711b215992bf4753ec610bf70dea2 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590675460 -0500	commit: FIX modulo de agregar valores multiples
15e7fbd3765711b215992bf4753ec610bf70dea2 5be0a74b855ceb8b04bf2bdec1d1b65633364bb2 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590677293 -0500	commit: UPD pagina de configuracion de encabezado
5be0a74b855ceb8b04bf2bdec1d1b65633364bb2 ff2f8a978fb927b52c4dc7d21458fee7e0e60e08 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590677888 -0500	commit: UPD Administracion de Citas
ff2f8a978fb927b52c4dc7d21458fee7e0e60e08 91517b60cc8b767c5fd84d2eb11d17819adbe8f1 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590683859 -0500	commit: UPD Modulo de configuracion de agenda
91517b60cc8b767c5fd84d2eb11d17819adbe8f1 6887c87a32c823a6a004a8aaa0c5327d9e57faae Marco Cantu Gea <marco.cantu.g@gmail.com> 1590686053 -0500	commit: UPD modulo de perdiles de usuario
6887c87a32c823a6a004a8aaa0c5327d9e57faae 438910ec4f3e556a95d567f8ab284a997b4e2d42 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590686430 -0500	commit: ADD logotipo de pagina
438910ec4f3e556a95d567f8ab284a997b4e2d42 5bbe6f265587dbb1e6a41218d2d315e38262d1ab Marco Cantu Gea <marco.cantu.g@gmail.com> 1590686473 -0500	checkout: moving from V2-Dev-BootStrapImp to master
5bbe6f265587dbb1e6a41218d2d315e38262d1ab 5bbe6f265587dbb1e6a41218d2d315e38262d1ab Marco Cantu Gea <marco.cantu.g@gmail.com> 1590686909 -0500	reset: moving to HEAD
5bbe6f265587dbb1e6a41218d2d315e38262d1ab 5bbe6f265587dbb1e6a41218d2d315e38262d1ab Marco Cantu Gea <marco.cantu.g@gmail.com> 1590686978 -0500	reset: moving to HEAD
5bbe6f265587dbb1e6a41218d2d315e38262d1ab 438910ec4f3e556a95d567f8ab284a997b4e2d42 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590687019 -0500	checkout: moving from master to V2-Dev-BootstrapImp
438910ec4f3e556a95d567f8ab284a997b4e2d42 73447d22f15de9c0023e4e1632106c8004365188 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590687169 -0500	commit: Quitar google API
73447d22f15de9c0023e4e1632106c8004365188 5bbe6f265587dbb1e6a41218d2d315e38262d1ab Marco Cantu Gea <marco.cantu.g@gmail.com> 1590687217 -0500	checkout: moving from V2-Dev-BootstrapImp to master
5bbe6f265587dbb1e6a41218d2d315e38262d1ab 0a0d2624b3476c1aee55057a4794293c6d058a6c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590687334 -0500	commit (merge): Merge branch 'V2-Dev-BootstrapImp'
0a0d2624b3476c1aee55057a4794293c6d058a6c c35d3dc70e03d6341aa9c56206212424c53e415c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590687371 -0500	commit: MERGE cambios del merge
c35d3dc70e03d6341aa9c56206212424c53e415c c35d3dc70e03d6341aa9c56206212424c53e415c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590688101 -0500	checkout: moving from master to master
c35d3dc70e03d6341aa9c56206212424c53e415c 73447d22f15de9c0023e4e1632106c8004365188 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590690510 -0500	checkout: moving from master to V2-Dev-BootstrapImp
73447d22f15de9c0023e4e1632106c8004365188 db154ca6a67cb9d9cdbf2ae8b36970772c16cd64 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590692953 -0500	commit: HOTFIX quitar calendario de google
db154ca6a67cb9d9cdbf2ae8b36970772c16cd64 c35d3dc70e03d6341aa9c56206212424c53e415c Marco Cantu Gea <marco.cantu.g@gmail.com> 1590692969 -0500	checkout: moving from V2-Dev-BootstrapImp to master
c35d3dc70e03d6341aa9c56206212424c53e415c 69aa3a517cb0e2a056f034cf1cc8cbc437eaf90d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590692993 -0500	merge V2-Dev-BootstrapImp: Merge made by the 'recursive' strategy.
69aa3a517cb0e2a056f034cf1cc8cbc437eaf90d 69aa3a517cb0e2a056f034cf1cc8cbc437eaf90d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590694951 -0500	checkout: moving from master to V2-Dev-NewFunctions
69aa3a517cb0e2a056f034cf1cc8cbc437eaf90d 38d59282ca33da67f4ebb0233a6cf97af7c4f98d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590713307 -0500	commit: HOTFIX actualizar cancelar cita formato
38d59282ca33da67f4ebb0233a6cf97af7c4f98d 69aa3a517cb0e2a056f034cf1cc8cbc437eaf90d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590713346 -0500	checkout: moving from V2-Dev-NewFunctions to master
69aa3a517cb0e2a056f034cf1cc8cbc437eaf90d 38d59282ca33da67f4ebb0233a6cf97af7c4f98d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590713374 -0500	merge V2-Dev-NewFunctions: Fast-forward
38d59282ca33da67f4ebb0233a6cf97af7c4f98d db154ca6a67cb9d9cdbf2ae8b36970772c16cd64 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590713409 -0500	checkout: moving from master to V2-Dev-BootstrapImp
db154ca6a67cb9d9cdbf2ae8b36970772c16cd64 38d59282ca33da67f4ebb0233a6cf97af7c4f98d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590713427 -0500	merge V2-Dev-NewFunctions: Fast-forward
38d59282ca33da67f4ebb0233a6cf97af7c4f98d 38d59282ca33da67f4ebb0233a6cf97af7c4f98d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590713495 -0500	checkout: moving from V2-Dev-BootstrapImp to master
38d59282ca33da67f4ebb0233a6cf97af7c4f98d 5f8d622df74d1d20d6e92f2004e739a021e39eca Marco Cantu Gea <marco.cantu.g@gmail.com> 1590755359 -0500	commit: DELETE archivos ocultos de mac
5f8d622df74d1d20d6e92f2004e739a021e39eca 38d59282ca33da67f4ebb0233a6cf97af7c4f98d Marco Cantu Gea <marco.cantu.g@gmail.com> 1590755418 -0500	checkout: moving from master to V2-Dev-NewFunctions
38d59282ca33da67f4ebb0233a6cf97af7c4f98d 5f8d622df74d1d20d6e92f2004e739a021e39eca Marco Cantu Gea <marco.cantu.g@gmail.com> 1590755435 -0500	merge master: Fast-forward
5f8d622df74d1d20d6e92f2004e739a021e39eca 71c592c912db11ac1b565715783eaca4c42bbb75 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590756419 -0500	commit: HOTFIX quitar echo en pagina
71c592c912db11ac1b565715783eaca4c42bbb75 0d1c43bfa7464c1ece4ac29d5f103b0d0c98fdb4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590756547 -0500	commit: HOTFIX Arreglar botones magenes
0d1c43bfa7464c1ece4ac29d5f103b0d0c98fdb4 5f8d622df74d1d20d6e92f2004e739a021e39eca Marco Cantu Gea <marco.cantu.g@gmail.com> 1590757754 -0500	checkout: moving from V2-Dev-NewFunctions to master
5f8d622df74d1d20d6e92f2004e739a021e39eca 0d1c43bfa7464c1ece4ac29d5f103b0d0c98fdb4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590757771 -0500	merge V2-Dev-NewFunctions: Fast-forward
0d1c43bfa7464c1ece4ac29d5f103b0d0c98fdb4 0d1c43bfa7464c1ece4ac29d5f103b0d0c98fdb4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590757848 -0500	checkout: moving from master to V2-Dev-NewFunctions
0d1c43bfa7464c1ece4ac29d5f103b0d0c98fdb4 3a7746a149c0835375b5dc8d5996bb46f4e71212 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590779473 -0500	commit: NFUN: descarga cita en formato ical
3a7746a149c0835375b5dc8d5996bb46f4e71212 0d1c43bfa7464c1ece4ac29d5f103b0d0c98fdb4 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590779514 -0500	checkout: moving from V2-Dev-NewFunctions to master
0d1c43bfa7464c1ece4ac29d5f103b0d0c98fdb4 3a7746a149c0835375b5dc8d5996bb46f4e71212 Marco Cantu Gea <marco.cantu.g@gmail.com> 1590779537 -0500	merge V2-Dev-NewFunctions: Fast-forward
3a7746a149c0835375b5dc8d5996bb46f4e71212 3a7746a149c0835375b5dc8d5996bb46f4e71212 Marco Cantu Gea <marco.cantu.g@gmail.com> 1591231110 -0500	checkout: moving from master to V2-Dev-Installer
3a7746a149c0835375b5dc8d5996bb46f4e71212 435594e51871b9075255abb5c4b166ce542a05f8 Marco Cantu Gea <marco.cantu.g@gmail.com> 1591280745 -0500	commit: desarollo de instalador de applicacion
435594e51871b9075255abb5c4b166ce542a05f8 f01ccde52f839b6734c42a7660c9b4134012910d Marco Cantu Gea <marco.cantu.g@gmail.com> 1591411206 -0500	commit: Desarollo Installador
f01ccde52f839b6734c42a7660c9b4134012910d 8d9edf8742328b4ead386a1a0c03d026675792a6 Marco Cantu Gea <marco.cantu.g@gmail.com> 1591454464 -0500	commit: Desarrollo instalador adecuaciones a sistema
8d9edf8742328b4ead386a1a0c03d026675792a6 9fa79c1bc16bbbaa91169c8fbbcd826bee2dc124 Marco Cantu Gea <marco.cantu.g@gmail.com> 1591455443 -0500	commit: acomodar las configuraciones de tablas
9fa79c1bc16bbbaa91169c8fbbcd826bee2dc124 d1869771b529ad22c321a81eb4e20a91af7a1af5 Marco Cantu Gea <marco.cantu.g@gmail.com> 1591491477 -0500	commit: instalador terminado
d1869771b529ad22c321a81eb4e20a91af7a1af5 ec56aff94f7a761b3b3bc70122e55945606b47d8 Marco Cantu Gea <marco.cantu.g@gmail.com> 1591493479 -0500	commit: HOTFIX arreglar el dominio del config
ec56aff94f7a761b3b3bc70122e55945606b47d8 de2cc583752ed73cf9f4d13311cc0869683f8b76 Marco Cantu Gea <marco.cantu.g@gmail.com> 1591495927 -0500	commit: HOTFIX arreglar la creacion de configuracion
de2cc583752ed73cf9f4d13311cc0869683f8b76 aaa61eb10befde910183c90203b11875ef2274d9 Marco Cantu Gea <marco.cantu.g@gmail.com> 1591529883 -0500	commit: instalacion de config.php
aaa61eb10befde910183c90203b11875ef2274d9 614211e0c449f6ef5ff3b4a7d22e6c31258f3240 Marco Cantu Gea <marco.cantu.g@gmail.com> 1600694606 -0500	commit: Creacion de git ignore
614211e0c449f6ef5ff3b4a7d22e6c31258f3240 66d7b834262fe0510a879c25572aa86af4c37745 Marco Cantu Gea <marco.cantu.g@gmail.com> 1600694675 -0500	commit: Fix closing tag
66d7b834262fe0510a879c25572aa86af4c37745 39377fe966e3543064fc5e1f6e2b039839fdaf28 Marco Cantu Gea <marco.cantu.g@gmail.com> 1600694689 -0500	commit: Disable error reporting
39377fe966e3543064fc5e1f6e2b039839fdaf28 7bc7beeb95f4e33517c8b33499b38d204771f3c1 Marco Cantu Gea <marco.cantu.g@gmail.com> 1600694719 -0500	commit: mod add config php
7bc7beeb95f4e33517c8b33499b38d204771f3c1 793a72909e26e461c5f557ccdee9793d32b99e9e Marco Cantu Gea <marco.cantu.g@gmail.com> 1600694741 -0500	commit: FIX closing tags
793a72909e26e461c5f557ccdee9793d32b99e9e 7c7f7175e0f747d35942740010844c82072cd4d3 Marco Cantu Gea <marco.cantu.g@gmail.com> 1600694801 -0500	commit: Fix error reporting.
7c7f7175e0f747d35942740010844c82072cd4d3 b6230bcb5deeaa0de397250d1d6b080d809fa230 Marco Cantu Gea <marco.cantu.g@gmail.com> 1600697138 -0500	commit: Config Deploys
b6230bcb5deeaa0de397250d1d6b080d809fa230 3a7746a149c0835375b5dc8d5996bb46f4e71212 Marco Cantu Gea <marco.cantu.g@gmail.com> 1600697153 -0500	checkout: moving from V2-Dev-Installer to master
3a7746a149c0835375b5dc8d5996bb46f4e71212 b6230bcb5deeaa0de397250d1d6b080d809fa230 Marco Cantu Gea <marco.cantu.g@gmail.com> 1600697167 -0500	merge V2-Dev-Installer: Fast-forward
b6230bcb5deeaa0de397250d1d6b080d809fa230 b6230bcb5deeaa0de397250d1d6b080d809fa230 Marco Cantu Gea <marco.cantu.g@gmail.com> 1610858765 -0600	checkout: moving from master to V2-AddPHPMailer
b6230bcb5deeaa0de397250d1d6b080d809fa230 731cc2bb9c792cc64c7b2d32b14e94dc6158546b Marco Cantu Gea <marco.cantu.g@gmail.com> 1610894433 -0600	commit: implementacion de composer
731cc2bb9c792cc64c7b2d32b14e94dc6158546b a36fbcf86a749cc88f83f2598dd2885265b91d4e Marco Cantu Gea <marco.cantu.g@gmail.com> 1610894457 -0600	commit: agregar vendor autoload
a36fbcf86a749cc88f83f2598dd2885265b91d4e 2e8f5a22ca66fd985cf3314dea8d9ed9a81f85f5 Marco Cantu Gea <marco.cantu.g@gmail.com> 1610894471 -0600	commit: Clase para mandar emails
2e8f5a22ca66fd985cf3314dea8d9ed9a81f85f5 ae52332866b86da6f170bda7c14a6341d65c56bf Marco Cantu Gea <marco.cantu.g@gmail.com> 1610894504 -0600	commit: Actualizar cambio de contraseña
ae52332866b86da6f170bda7c14a6341d65c56bf 7cd0a4f90c4d599a6bd52e18abf2a893c6aea24e Marco Cantu Gea <marco.cantu.g@gmail.com> 1610894593 -0600	commit: eliminar debug comentarios
7cd0a4f90c4d599a6bd52e18abf2a893c6aea24e 9367d01fe3a94825d33a5cee04d507e0489a767c Marco Cantu Gea <marco.cantu.g@gmail.com> 1610895449 -0600	commit: implementar nueva forma de mandar email
9367d01fe3a94825d33a5cee04d507e0489a767c b18f67c9b9132feffea8bdd2670d0e7a3d7e9cf0 Marco Cantu Gea <marco.cantu.g@gmail.com> 1610895469 -0600	commit: arreglar enviar correo
b18f67c9b9132feffea8bdd2670d0e7a3d7e9cf0 ebf5c32583bc60c0dc04b48a89c884f069a0ab0f Marco Cantu Gea <marco.cantu.g@gmail.com> 1610895566 -0600	commit: modificacion to ignore
ebf5c32583bc60c0dc04b48a89c884f069a0ab0f 8e931346c696ddcac7942475c7821e25881f6283 Marco Cantu Gea <marco.cantu.g@gmail.com> 1610899124 -0600	commit: remove config for deploy
8e931346c696ddcac7942475c7821e25881f6283 2ed4f3615161f3ce0fd7e66708e6b34eecec08d6 Marco Cantu Gea <marco.cantu.g@gmail.com> 1610899140 -0600	commit: agregar setters
2ed4f3615161f3ce0fd7e66708e6b34eecec08d6 a66f5a0facbeb691749296c7c54240ad8d015324 Marco Cantu Gea <marco.cantu.g@gmail.com> 1610899201 -0600	commit: Agregar a configuracion el instalador de correo
a66f5a0facbeb691749296c7c54240ad8d015324 8ef89274cad2e9b58e60b3ab5760dc7599f79e85 Marco Cantu Gea <marco.cantu.g@gmail.com> 1610899321 -0600	commit: quitar errores
8ef89274cad2e9b58e60b3ab5760dc7599f79e85 b6230bcb5deeaa0de397250d1d6b080d809fa230 Marco Cantu Gea <marco.cantu.g@gmail.com> 1610899345 -0600	checkout: moving from V2-AddPHPMailer to master
b6230bcb5deeaa0de397250d1d6b080d809fa230 8ef89274cad2e9b58e60b3ab5760dc7599f79e85 Marco Cantu Gea <marco.cantu.g@gmail.com> 1610899370 -0600	merge V2-AddPHPMailer: Fast-forward
