Commit Graph

18521 Commits

Author SHA1 Message Date
Javier Segarra 48b82b02ca refs #6434 change param type for signInValidate
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 19:32:10 +00:00
Javi Gallego d246b5f9a8 Merge branch 'dev' into 5652-fixtures-fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 15:26:51 +01:00
Carlos Satorres 9a3efdd6fe refs #6085 model y back
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 13:55:44 +01:00
Guillermo Bonet b3cc020ea7 Merge pull request 'refs #6023 Fix change rol bug' (!1727) from 6023-changeRol into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1727
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-29 11:48:17 +00:00
Jorge Penadés c609f6f47f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 09:27:50 +01:00
Guillermo Bonet 5e9a62eac2 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 08:21:23 +00:00
Alex Moreno 2e22984e77 refs #6197 fix: add salix role in fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 09:13:54 +01:00
Jorge Penadés 48dd068190 refs #6274 upperCase Model
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 08:37:56 +01:00
Carlos Satorres e548ef4dae refs #6085 searchpanel and change path
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-29 07:51:58 +01:00
Carlos Satorres 0186c2c806 refs #6085 aclMail back
gitea/salix/pipeline/head This commit looks good Details
2023-11-29 07:33:49 +01:00
Jorge Penadés 29fb36010c refs #6274 back methods created
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 14:48:03 +01:00
Javier Segarra 63533459b0 refs #6434 feat: improve signIn method
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 13:22:17 +01:00
Jorge Penadés f2673c3818 refs #5835 rate added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-28 12:12:42 +01:00
Guillermo Bonet 1a5cc67312 Merge branch 'dev' into 6023-changeRol
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 12:07:50 +01:00
Javi Gallego 2fa56cce4b fix: refs #5652 arreglo fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 09:22:00 +01:00
Javier Segarra bb9723b65d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 08:18:11 +01:00
Javier Segarra f5f2896cbf refs 5666 feat: replace Role model by VnRole model 2023-11-28 08:12:16 +01:00
Javier Segarra 50a97693b9 refs 5666 feat: remove loggable.js file 2023-11-28 07:48:42 +01:00
Alex Moreno 37555cbb63 refs #6335 warmFix(ticketAdvance): correct properties
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 15:10:00 +01:00
Alex Moreno 7911cc12df Merge branch 'dev' into 6489-authSupport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 12:57:46 +00:00
Juan Ferrer c7291e3367 Merge pull request 'test' (!1863) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1863
2023-11-27 12:17:11 +00:00
Juan Ferrer 74772472d5 Merge pull request 'master' (!1820) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1820
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-27 12:16:42 +00:00
Carlos Satorres 23235e2b44 Merge pull request 'refs #6506 contract' (!1861) from 6506-hotfixContract into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1861
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-27 12:07:52 +00:00
Carlos Satorres a7361a89bd refs #6489 remove auth
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 12:58:07 +01:00
Robert Ferrús 5f26553092 Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 11:05:50 +00:00
Robert Ferrús 62fab4e744 refs #5854 itemShelving traducciones
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 11:52:37 +01:00
Guillermo Bonet 8ee8d90eec Merge pull request 'refactor: refs #3222 Expence to expense' (!1860) from 3222-expenceToExpense into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1860
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-27 09:56:30 +00:00
Javier Segarra 9da5fb9a14 refs #6264 other: rename camel-case variable
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 10:24:25 +01:00
Guillermo Bonet 3bdb002034 Merge branch 'dev' into 3222-expenceToExpense
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 09:06:17 +00:00
Guillermo Bonet aefff68c29 refactor: refs #3222 Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 09:51:56 +01:00
Javier Segarra 901a44cc62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 09:48:31 +01:00
Javier Segarra 81be3b18f7 refs #6264 test: validate-token and renew-token 2023-11-27 09:48:15 +01:00
Javier Segarra 72a0932e35 refs #6264 other: rename camel-case variable 2023-11-27 09:46:27 +01:00
Alex Moreno 3fb1ed9dfe Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6506-hotfixContract
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 08:38:17 +01:00
Jorge Penadés d075cb97ad Merge pull request 'refs #5811 feat: al borrar expedicion borrar de viaexpress' (!1754) from 5811-ticket.expedition_deleteViaexpress into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1754
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-27 07:36:28 +00:00
Carlos Satorres f9d5cad412 refs #6506 contract
gitea/salix/pipeline/head This commit looks good Details
2023-11-27 07:57:18 +01:00
Alex Moreno 824ca1d70a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-27 07:42:50 +01:00
Guillermo Bonet 2be1639e9f refactor: refs #3222 Expence to expense
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 12:42:25 +01:00
Jorge Penadés 53c8e87b5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:57:32 +01:00
Jorge Penadés 74dd64126a Merge pull request '#5835 getTotals fixed' (!1854) from 5835-fixGetTotals into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1854
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-24 09:56:21 +00:00
Jorge Penadés 8ac3887d80 refs #5811 rename methods
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-24 10:53:38 +01:00
Jorge Penadés c56588a472 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:18:47 +01:00
Jorge Penadés b3584d9db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 10:12:45 +01:00
Carlos Satorres 461cb3d2ba Merge pull request 'hotfix-undefinedContract' (!1859) from hotfix-undefinedContract into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1859
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-24 08:06:41 +00:00
Carlos Satorres 5d18c211a0 refs #6507 state
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 08:40:06 +01:00
Javi Gallego 4071c06b5f feat: refs #6275 getTickets con los campos de silex
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 08:15:39 +01:00
Carlos Satorres 8a568f180a refs #6506 fix e2e, refactor business
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 07:47:57 +01:00
Carlos Satorres ebe467f721 refs #6506 hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 07:04:55 +01:00
Javi Gallego aa0794e136 Merge branch 'dev' into 6275-silex-to-salix
gitea/salix/pipeline/head This commit looks good Details
2023-11-24 06:31:25 +01:00
Javi Gallego 4a62588464 Merge pull request '6028_route_getRouteByWorker' (!1857) from 6028_route_getRouteByWorker into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1857
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-23 14:01:53 +00:00