gitLog

* commit 891e6c827a021dfa097878a62e06ced462a753bb (HEAD -> master, origin/master, origin/HEAD)
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Sat Mar 26 18:49:13 2016 -0600
|
|     cambio de base de datos
|
*   commit eb921c6f563b6c88c993e6d5d055b54734b902fe
|\  Merge: d5a8ff6 236807a
| | Author: SNL <sebastiannavalopez@gmail.com>
| | Date:   Sat Mar 26 18:45:28 2016 -0600
| |
| |     Merge branch 'dev-branch'
| |     API - login (/api/login[POST])
| |     	-recibe (String email, String pass (plain))
| |     	-entrega (String estado)
| |
| * commit 236807a40f919ce75f4a2e64a733ff98219b0332 (dev-branch)
| | Author: SNL <sebastiannavalopez@gmail.com>
| | Date:   Sat Mar 26 18:45:12 2016 -0600
| |
| |     api: login (api/login[POST])
| |
* | commit d5a8ff61438c9f216ae292569dedce95c50c27f8
| | Author: SNL <sebastiannavalopez@gmail.com>
| | Date:   Sat Mar 26 17:35:39 2016 -0600
| |
| |     correccion de url de la base
| |
* | commit 6f0e1270e2f10f8c0a055fcf99492b72ae1bfea7
| | Author: SNL <sebastiannavalopez@gmail.com>
| | Date:   Sat Mar 26 17:31:49 2016 -0600
| |
| |     cambio de url en el bean de la base
| |
* | commit f73b1774a7549c0dc43ff7d42d1c91b0bf253ad9
| | Author: SNL <sebastiannavalopez@gmail.com>
| | Date:   Sat Mar 26 17:26:54 2016 -0600
| |
| |     prueba : cambio de url de base de datos
| |
* | commit 2aa3d4c9bd3d6deb48ac902c4e0c4f5ee98f4bd6
| | Author: SNL <sebastiannavalopez@gmail.com>
| | Date:   Sat Mar 26 17:11:34 2016 -0600
| |
| |     cambio de usuario de bean de bd
| |
* | commit db2fb4f5e2b83fee9c097c12c9cc801715b3d936
| | Author: SNL <sebastiannavalopez@gmail.com>
| | Date:   Sat Mar 26 16:57:57 2016 -0600
| |
| |     correccion de bean de base de datos(cambio en string con variables de sistema
| |
* | commit 8a6dc5ff49e3b24be7e02faed5dc5ac6e5ba672e
| | Author: SNL <sebastiannavalopez@gmail.com>
| | Date:   Sat Mar 26 16:52:33 2016 -0600
| |
| |     cambios en bean de base de datos para autenticacion
| |
* | commit f774d52f1005ae09440ebb6c5c459fd59e470f36
|/  Author: SNL <sebastiannavalopez@gmail.com>
|   Date:   Sat Mar 26 16:20:13 2016 -0600
|
|       cambio de contraseña del servidor de correo
|
* commit 01cf7f16ebb99c90dddb465655a40a2139fe9181
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Sat Mar 26 16:01:20 2016 -0600
|
|     cambios en controlador de conexión estado:openshift -correciones en clase de conexion
|
* commit c366b75e4a00fdfacf2192f7197fface99b349d4
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Sat Mar 26 15:29:11 2016 -0600
|
|     nueva dependencia de jbcrypt (mindroot)
|
* commit 1c4c4cf4e4fd33d824277e8a1fc75ed687f4ba1f
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Sat Mar 26 14:57:07 2016 -0600
|
|     cambio de dependencia de jbcrypt
|
* commit f13ea2bf86d3e62287007371b84c3c7242e4b077
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Sat Mar 26 14:36:08 2016 -0600
|
|     cambio de base de datos local -> openshift
|
* commit 94181375ed6695b5acfd0fbef678e566c35f4fc7
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Sat Mar 26 14:32:38 2016 -0600
|
|     agrego dependencia maven-surfire -omitir test
|
* commit cf6af7061347c48d4dbc25005a8f4e6b74ca5176
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Sat Mar 26 14:27:21 2016 -0600
|
|     cambio de version en compilador de maven
|
* commit d6528586621b0b269d5d8409944bd5128f48ce78 (origin/adm-usuarios, adm-usuarios)
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Sat Mar 26 14:21:48 2016 -0600
|
|     registro: -rest de registro db: -cambio de metodos de la base de datos
|
* commit 0ff5620e9ec1d9bda44bd90af3130692e222e00e
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Thu Mar 24 23:41:43 2016 -0600
|
|     registro: -mecanismo de enviar correo al usuario y validar direccion email -objetos de prueba para pruebas de hash
|
* commit 513becc8aced2dfb4b663a577149102abb5deabf
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Thu Mar 24 20:09:24 2016 -0600
|
|     email: -implementacion de email, -controlador de prueba (/test/emailTest) -dependencias en pom
|
* commit 2fa0429fba89baf2b34f433efebd0f03c26d5616
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Thu Mar 24 19:36:17 2016 -0600
|
|     registro: cambios en pagina de registros (direcciones a librerias)
|
* commit f42be1e9fe1244977b8c2c658a028110d9fa1b05
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Thu Mar 24 02:32:04 2016 -0600
|
|     -validacion de datos en registro
|       -redireccion y muestra estado al registrar usuario
|
| *   commit 73efa0ca191082ba1b854c2557e5ab3eb109786e (refs/stash)
| |\  Merge: e1f2b9b cb76d51
|/ /  Author: SNL <sebastiannavalopez@gmail.com>
| |   Date:   Thu Mar 24 19:55:31 2016 -0600
| |
| |       WIP on master: e1f2b9b web.xml: redireccion desde ROOT del dominio a Home
| |
| * commit cb76d518c8583cd998297e2eb92c2177eae5c621
|/  Author: SNL <sebastiannavalopez@gmail.com>
|   Date:   Thu Mar 24 19:55:28 2016 -0600
|
|       index on master: e1f2b9b web.xml: redireccion desde ROOT del dominio a Home
|
* commit e1f2b9b37b6267c725c9db8e89d0bfbbdeea5fee
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Tue Mar 22 17:00:32 2016 -0600
|
|     web.xml: redireccion desde ROOT del dominio a Home
|
* commit e146f2fbc7c04f8ec6f43a61d0cd96b211346aeb
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Tue Mar 22 16:32:58 2016 -0600
|
|     agrego controlador de root de pagina
|
* commit 4f7fa630bbfc2c191b03d8a8cb01ae8c850a652c
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Tue Mar 22 02:22:38 2016 -0600
|
|     cambios en POM
|
* commit 6e001759e5c857325b598717624a5efc5129ee36
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Tue Mar 22 02:15:35 2016 -0600
|
|     cambios en POM
|
* commit 99b5936c840573f053b5308e758a017f8d0f80dc
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Mon Mar 21 20:02:03 2016 -0600
|
|     cambios borrados por error en equipo remoto
|
* commit e1ee8e0b8b167db5d06376af2b5a63fe928eb5d3
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Mon Mar 21 19:33:59 2016 -0600
|
|     regreso cambios borrados por error
|
* commit 1a5a4b9600413d0781c529e6a43b6f0a3849873d
| Author: Dessco <wearedessco@gmail.com>
| Date:   Thu Mar 10 10:16:57 2016 -0600
|
|     a
|
* commit e3e0202ce1f8090109590b130b9d3cec9a3eac00
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 21:40:44 2016 -0600
|
|     prueba connection query
|
* commit cb351a2a765066046a1c85da508bd42cd42f96dc
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 21:31:01 2016 -0600
|
|     cambios connection url descomposicion
|
* commit 11f7cea2a5d6a799cb41705db17dfabbd1a528a3
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 21:24:12 2016 -0600
|
|     cambios connection url number format
|
* commit 540660885da01d2b812707bbae80735b78ae48eb
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 21:19:26 2016 -0600
|
|     cambios connection url
|
* commit aabebee251347a84898e4bc13d38a0cef5eabce1
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 21:14:46 2016 -0600
|
|     prueba connection 2
|
* commit b1a3f672014ff3117ea3f2d9750e154bb1bee757
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 20:53:45 2016 -0600
|
|     prueba data source 2
|
* commit 6c7b7317bd8f89e27f0df83cc844cf2be242376e
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 20:41:39 2016 -0600
|
|     prueba con data source
|
* commit f0995455be73d07ea6f10238c9dc6b9a2c6ef181
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 19:59:53 2016 -0600
|
|     prueba conexion db nueva url
|
* commit 8cbc2939c45242a84593ff74c48feac144a6b5be
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 19:45:37 2016 -0600
|
|     prueba conexion db2 jsp
|
* commit 57fc3a49577e614d3679807fc31ffaa876832be8
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 19:39:22 2016 -0600
|
|     reparado(3) prueba conexion db
|
* commit 8d9c0705c9c951e6a9c67d608de9853d630a2a23
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 19:26:16 2016 -0600
|
|     reparado(2) prueba conexion db
|
* commit d54c152bcc4ab320008f2041096553a1eb737345
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 18:53:23 2016 -0600
|
|     reparado prueba conexion db
|
* commit c90d4ed674028a8f98fb905e272c2084a6998ebd
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 18:30:24 2016 -0600
|
|     prueba conexion db
|
* commit ea48dd9eff2baa945eed0b252d77f8589d616103
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Wed Mar 9 18:11:36 2016 -0600
|
|     librerias de js, pagina de prueba para db
|
* commit ce4c1fb9f2bf91dcef3271c2487441eeb272e08b
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Mon Mar 7 00:40:58 2016 -0600
|
|     implementacion básica de seguridad, registro de alumnos
|
* commit d8661d5c51b2922f2b4d930f529d1d367906ae32
| Author: SNL <sebastiannavalopez@gmail.com>
| Date:   Sat Mar 5 20:57:22 2016 -0600
|
|     spring servlet simple
|
* commit 19caa4a49bbe1d8bda9d5a9bbedab6f7eb8d7a12
  Author: Template builder <builder@example.com>
  Date:   Sat Feb 20 18:51:36 2016 -0500