Commit Graph

74 Commits

Author SHA1 Message Date
Eduardo Quiros 7fb9b9b88b
Merge pull request #16 from Quantum-P3/feature/US-01-fix
Inicio de sesion con google
2021-07-11 04:13:46 +00:00
Eduardo Quiros fce8b45199
Merge branch 'dev' into feature/US-01-fix 2021-07-10 21:47:20 -06:00
Eduardo Quiros a298acc976
Merge pull request #15 from Quantum-P3/feature/US-18
Feature/us 18
2021-07-11 02:37:14 +00:00
Eduardo Quiros 3fa3146b5d
agregar pipe para filtrado de la tabla 2021-07-10 20:23:22 -06:00
Eduardo Quiros ecd96d6d07
agregar formulario para input de busqueda 2021-07-10 20:22:54 -06:00
Eduardo Quiros 73fece59a2
inicializar search string en listado de categorias 2021-07-10 20:20:13 -06:00
Eduardo Quiros 4ceff2b1f4
importar filtro 2021-07-10 20:19:28 -06:00
Paola 7da71d8769 arreglo de estilos GoogleLogIn 2021-07-10 20:02:17 -06:00
Eduardo Quiros 680ad90f7c
colocar biblioteca de filtrar en directorio correcto 2021-07-10 19:40:41 -06:00
Eduardo Quiros 4a0e6a2c81
crear pipe para filtrado 2021-07-10 19:34:08 -06:00
Pablo Bonilla 572ba5362d
Merge pull request #13 from Quantum-P3/feature/US-11
Fix package-lock license
2021-07-09 20:03:45 -06:00
Pablo Bonilla 8de052be25
Merge branch 'dev' into feature/US-11 2021-07-09 19:55:44 -06:00
Pablo Bonilla f2a91ced5f
Update package-lock license 2021-07-09 19:55:25 -06:00
Paola 1340861658 Implementacion Google finalizada 2021-07-09 19:10:12 -06:00
Paola 4e09ba7e53 Arreglo de CORS y de log in Google 2021-07-09 17:34:57 -06:00
Paola 4f86dd62ad Merge branch 'dev' into feature/US-01 2021-07-09 14:32:45 -06:00
Pablo Bonilla cc014c1886
Merge pull request #12 from Quantum-P3/feature/US-11
Add visualizar perfil del usuario final
2021-07-09 01:10:52 -06:00
Pablo Bonilla 130ef6eab1
Remove nombre completo from users list 2021-07-09 00:56:54 -06:00
Pablo Bonilla de543365d9
Merge branch 'dev' into feature/US-11 2021-07-09 00:45:18 -06:00
Pablo Bonilla 415c600ccc
Add custom data survey danger button 2021-07-09 00:44:15 -06:00
Pablo Bonilla bda6395d9d
Add custom data survey form styles 2021-07-09 00:19:21 -06:00
Eduardo Quiros 15a7969cb7
Merge pull request #11 from Quantum-P3/feature/US-07
Feature/US-07
2021-07-09 06:19:07 +00:00
Pablo Bonilla 3686de93a8
Add custom data survey buttons 2021-07-08 23:01:07 -06:00
Pablo Bonilla 70ae52ffc6
Update npm test detect open handles option 2021-07-08 21:17:29 -06:00
Pablo Bonilla 94de06c609
Add profile icon selector to user profile 2021-07-08 20:48:27 -06:00
Pablo Bonilla 23094e4c0d
Update user profile with password section 2021-07-08 19:04:40 -06:00
Pablo Bonilla f5c2f626df
Update retrieve data from usuario extra to display on profile 2021-07-08 18:33:54 -06:00
Paola 10587cf511 Merge branch 'dev' into feature/US-01 2021-07-08 17:26:44 -06:00
Mariela Bonilla 64af3725de Merge branch 'dev' into feature/US-07 2021-07-08 17:23:52 -06:00
Pablo Bonilla 34597f8209
Update user profile layout design 2021-07-08 17:07:42 -06:00
Paola ec61de0c3a Merge remote-tracking branch 'origin/feature/US-01' into feature/US-01 2021-07-08 15:46:21 -06:00
Paola a3276c9161 Metodos nuevos de Google LogIn 2021-07-08 15:45:20 -06:00
Eduardo Quiros e5aa3f5fc3
Merge pull request #10 from Quantum-P3/feature/US-14
Feature/US-14
2021-07-08 21:17:25 +00:00
Pablo Bonilla a3f9403611
Merge pull request #9 from Quantum-P3/feature/US-05
Add registrar administrador en la plataforma
2021-07-07 15:34:29 -06:00
Paola 6563507d7f Merge remote-tracking branch 'origin/feature/US-01' into feature/US-01 2021-07-07 13:31:07 -06:00
Paola 08a1cc5c32 Agregar servicio de loggeo Google 2021-07-07 13:30:53 -06:00
Mariela Bonilla 8764f50e9f update botones en html de listar usuarios
se eliminó un botón en el html innecesario de editar y se eliminó documento defectuoso de testing
2021-07-07 02:06:52 -06:00
Pablo Bonilla db2b5f6fad
Update register administrator html class 2021-07-06 23:36:40 -06:00
Pablo Bonilla 3f723189b4
Add registrar usuario administrador por medio de la plataforma 2021-07-06 22:59:31 -06:00
Mariela Bonilla 48cd746b59 listar usuarios
historia de usuario: listar usuarios registrados
2021-07-06 22:53:02 -06:00
Pablo Bonilla 6395f3d8c8
Update user register to distinguish admin and user authorities 2021-07-06 21:31:12 -06:00
Paola ccc7784489 Remover procesos en service Google 2021-07-06 20:49:15 -06:00
Paola b35d77f637 Merge branch 'dev' into feature/US-01 2021-07-06 20:21:08 -06:00
Eduardo Quiros 09b3910e09
agregar wrapper de maven al gitignore 2021-07-06 09:20:32 -06:00
Eduardo Quiros ba6c6fd2bc
hacer mvnw y npmw ejecutables 2021-07-06 09:19:22 -06:00
Eduardo Quiros 57d492d21f
Merge pull request #8 from Quantum-P3/fix/userData-mainPage
Add logged in user profile icon and name on sidebar
2021-07-06 02:18:41 +00:00
Pablo Bonilla 11f483419e
Add logged in user profile icon and name on sidebar 2021-07-05 20:15:58 -06:00
Eduardo Quiros ba4d7cb83e
arreglar traducción en sección de categorías 2021-07-05 19:31:17 -06:00
Pablo Bonilla 6d4e76a193
Merge pull request #7 from Quantum-P3/fix/sql-publicKeyRetrieval
Fix database public key retrieval
2021-07-04 21:38:14 -06:00
Pablo Bonilla 6a0e34db1f
Fix database public key retrieval 2021-07-04 21:36:32 -06:00