Commit Graph

1231 Commits

Author SHA1 Message Date
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Joan Sanchez 3ee29553b4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 09:00:52 +02:00
Joan Sanchez 35f94c58b7 reafactor(image): upload image using gm library
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-14 13:04:40 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Alexandre Riera c6fc2dee24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5206-travel-buscadorLateral
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:53:11 +01:00
Carlos Satorres f5109724bf refs #5073 adaptacion para solo el año
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 11:39:16 +01:00
Vicent Llopis c51e542235 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 13:43:59 +01:00
Vicent Llopis 2be7320d89 refs #4856 fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 07:45:22 +01:00
Vicent Llopis 4dc9e9e590 refs #4856 refactor: make agnostic the component calendar 2023-03-14 07:44:39 +01:00
Vicent Llopis 165dc73b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:22:29 +01:00
Vicent Llopis 07edacd557 fix: frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:22:14 +01:00
Vicent Llopis 0396d3707c refator: creada ruta de back, en vez de hacer peticiones http anidadas en el front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 11:47:10 +01:00
Joan Sanchez 56d3b32af5 Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 09:12:53 +00:00
Vicent Llopis a68fef8a5b feat: test front 2023-03-08 09:51:09 +01:00
Joan Sanchez 14a5c78303 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 08:13:07 +01:00
Joan Sanchez c0ff6bea57 fix(smartTable): fixed filtering with an intermediate check
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: #5177
2023-03-07 07:47:30 +01:00
Vicent Llopis a98bb59479 fix: test front
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-06 12:47:49 +01:00
Vicent Llopis 9e9807c4b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-06 11:55:30 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Vicent Llopis 7c24b940b3 feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 14:55:18 +01:00
Alexandre Riera dbe42e3bf4 refs #5206 version with plane added, needs to implement general search
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 13:55:47 +01:00
Carlos Satorres 79d15d930e Updated package-lock
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 11:50:36 +01:00
Carlos Satorres a1d4dff7d8 Merge branch '5090-renameGoLabel' of https://gitea.verdnatura.es/verdnatura/salix into 5090-renameGoLabel
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 11:48:50 +01:00
Carlos Satorres 6509a79b02 Deleted package-lock 2023-03-02 11:48:45 +01:00
Carlos Satorres ea9a15ece1 Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 10:44:24 +00:00
Alexandre Riera be1993cf8b refs #5206 version with top-searcher and two fields for reference and id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 11:33:55 +01:00
Joan Sanchez 57e36cebde fix(field): prevent input size changes when showing clear icon
gitea/salix/pipeline/head This commit looks good Details
Refs: #5338
2023-03-02 09:44:45 +01:00
Vicent Llopis bc542d8a40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:11:12 +01:00
Carlos Satorres 1c3aa29642 refs #5090 model.ezp nuevo
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 11:56:41 +01:00
Vicent Llopis 8a1a7d7159 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5240-ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 08:20:28 +01:00
Alexandre Riera 94901d5b1f refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 07:49:34 +01:00
Vicent Llopis c8c48ea175 feat: colorar numeros de semanas segun el registro de horas
gitea/salix/pipeline/head This commit looks good Details
2023-02-21 15:16:28 +01:00
Vicent Llopis 1c1e4cc176 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 13:37:53 +01:00
Vicent Llopis 432c8a9ab8 refactor: cambiados estilos de los chips
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 10:56:46 +01:00
Joan Sanchez c5c76984ff Merge pull request 'fix(image): store images with a name generated through uuid instead of url path' (!1337) from 5266-image_fixes into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1337
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-02-21 08:56:19 +00:00
Joan Sanchez 90e1136ee2 fix(image): store images with a name generated through uuid instead of url path
gitea/salix/pipeline/head This commit looks good Details
Refs: #5266
2023-02-20 12:40:13 +01:00
Alexandre Riera b926666b25 refs #5220 fonts updated
gitea/salix/pipeline/head This commit looks good Details
2023-02-20 09:38:24 +01:00
Joan Sanchez 527caf9ca0 refactor(zerofill): deprecated zerofill and removed function
gitea/salix/pipeline/head This commit looks good Details
Refs: #5207
2023-02-17 11:19:35 +01:00
Alex Moreno 65df9b87e7 fix: conflicts
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 13:22:53 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 09:16:30 +01:00
Vicent Llopis be539a54ce delete console.log
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 09:31:03 +01:00
Vicent Llopis cda7a6e3fd fix: no mostraba los numeros de la semana al inicio
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 15:01:33 +01:00
Alex Moreno 575784c870 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-03 10:03:59 +01:00
Alex Moreno e16c16c194 Merge branch 'dev' into 5170-recover-password_use_user
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 08:12:54 +00:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Vicent Llopis 15429293dd fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 11:34:13 +01:00
Vicent Llopis 76865fc7b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5084-monitor.index_tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 09:18:37 +01:00
Joan Sanchez 4477486f8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:58:44 +01:00
Joan Sanchez 7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:23:17 +01:00
Alex Moreno 4a587049fc feat(recover-password): use user
gitea/salix/pipeline/head This commit looks good Details
refs #5170
2023-02-01 15:13:38 +01:00