Commit Graph

16430 Commits

Author SHA1 Message Date
Vicent Llopis eaaa860e97 Merge branch 'dev' into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 07:27:46 +00:00
Alex Moreno cc23fd1337 refs #5579 fix mockTimes and remove userLog_add
gitea/salix/pipeline/head This commit looks good Details
2023-05-17 09:23:37 +02:00
Alex Moreno c9af22780b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5579-db-export 2023-05-17 08:24:23 +02:00
Juan Ferrer dd9699e120 refs #5667 Translation fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:54:13 +02:00
Juan Ferrer d8eeacb371 refs #5667 Translation improved
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:24:04 +02:00
Juan Ferrer 30d6f56c39 refs #5667 Style fixes, model translations
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 20:06:14 +02:00
Alex Moreno 7f881409fc refs #5579 fix mockTime
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 15:00:31 +02:00
Vicent Llopis 191fb72331 test jenkins
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-16 13:54:09 +02:00
Alexandre Riera 62d0af25d3 refs #5642 uncommented tests
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 13:31:22 +02:00
Pablo Natek addd53feca Merge pull request 'refs #5153' (!1483) from 5153-worker-sin-tr into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1483
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-16 10:36:48 +00:00
Pablo Natek 3d05b79748 Merge branch 'dev' into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 10:30:28 +00:00
Alex Moreno 799045314f Merge pull request 'refs #5160 increase jasmine timeout' (!1524) from 5160-increase_jasmine_timeout into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1524
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-16 07:21:01 +00:00
Alex Moreno 9f0d5097fe refs #5160 increase jasmine timeout
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 09:14:38 +02:00
Alex Moreno 1dcce0f3ee Merge pull request 'hotFix(reset-passowrd): use model vnUser' (!1523) from hotFix_vnUser_reset-password into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1523
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-05-16 07:01:44 +00:00
Alex Moreno 504791fd6d typo
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 08:48:25 +02:00
Alex Moreno a1a3f910d3 hotFix(reset-passowrd): use model vnUser
gitea/salix/pipeline/head This commit looks good Details
2023-05-16 08:46:16 +02:00
Alex Moreno 3e33030b1d refs #5579 update mariadb version to 10.7.6
gitea/salix/pipeline/head This commit is unstable Details
2023-05-15 15:16:22 +02:00
Vicent Llopis 6300ee4be4 refs #5600 foto de los trabajadores cuadrada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 14:24:31 +02:00
Alex Moreno 08fcbebbaf refs #5488 polish specifics acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 14:14:08 +02:00
Vicent Llopis 9ce3e79e00 refs #5594 eliminado archivo ducplicado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-15 11:50:51 +02:00
Vicent Llopis d5f5115980 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice 2023-05-15 11:50:09 +02:00
Alex Moreno 7d589d5101 Merge pull request 'hotFix(worker_new): use postcode not postalCode' (!1520) from hotFix_worker_new_postcode into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1520
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-15 08:12:29 +00:00
Alex Moreno 0aa12a5efb hotFix(worker_new): use postcode not postalCode
gitea/salix/pipeline/head This commit looks good Details
2023-05-15 09:54:40 +02:00
Alex Moreno 248caf8519 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-15 07:20:53 +02:00
Alex Moreno ea6837e33a refs #5579 export structure and data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 13:07:24 +02:00
Pablo Natek 8419c76b12 refs #5153 worker sin tr
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 12:51:07 +02:00
Carlos Satorres ece2875b38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5328-abonarTodoTicket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 12:30:34 +02:00
Juan Ferrer 4abc8521d3 refs #5517 Style fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 11:25:16 +02:00
Carlos Satorres 9cbf3006a0 refs #5599 futureState
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 11:17:51 +02:00
Carlos Satorres 943e8b09c1 refs #5599 DELIMITER
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 11:15:47 +02:00
Juan Ferrer f6e1ffa849 refs #5517 Log loader fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 09:48:22 +02:00
Alexandre Riera b9ec6b93b6 Merge branch 'dev' into 5655-afinar-login
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 07:46:10 +00:00
Vicent Llopis 3f26072787 refs #5468 eliminados getters a VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-12 09:02:55 +02:00
Alexandre Riera 9760e50212 refs #5513 minor fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 08:46:12 +02:00
Alex Moreno 598fe7ac0d Merge pull request '231801_test_to_master' (!1519) from 231801_test_to_master into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1519
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-12 06:29:54 +00:00
Pablo Natek 65082be077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-05-12 08:28:19 +02:00
Carlos Satorres 0dea1dfd9e Merge branch 'dev'
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 15:52:35 +02:00
Carlos Satorres fd85cd2d98 refs #5599 replace
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 15:48:31 +02:00
Vicent Llopis b10f90fbe1 refs #5468 a la seccion privileges se le pasa el parametro user
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-11 15:25:37 +02:00
Alex Moreno 1d6a541b02 test into master
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 15:07:02 +02:00
Alex Moreno 30e71a9d5e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 231801_test_to_master 2023-05-11 15:06:50 +02:00
Carlos Satorres f53eef0455 Merge pull request 'refs move reports views' (!1518) from footnotesSolve into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1518
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-11 12:50:27 +00:00
Alex Moreno 5924a557e9 Merge branch 'test' into footnotesSolve
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 12:16:17 +00:00
Carlos Satorres 35b6642095 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5599-ticketColors 2023-05-11 14:15:30 +02:00
Javi Gallego 8a843b37bd refs #5160 Back test timeout workaround
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 13:54:42 +02:00
Juan Ferrer d0c8be5697 refs #5517, #5667 Fix crudModel status, log fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 12:07:14 +02:00
Carlos Satorres 43ab07d954 refs move reports views
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 11:57:13 +02:00
Vicent Llopis 2ed99426ef eliminado focus
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 10:18:02 +02:00
Vicent Llopis 90b844062d refs #5327 add frontTest
gitea/salix/pipeline/head Build queued... Details
2023-05-11 10:17:41 +02:00
Vicent Llopis 59f4b63db7 borrado espacio
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 10:04:59 +02:00