Commit Graph

17654 Commits

Author SHA1 Message Date
Carlos Satorres 5b587b3449 Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 12:56:45 +00:00
Alex Moreno 89967b8538 fix(workerDescriptor): show account button
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-15 13:16:31 +01:00
Alex Moreno 0d9ee1758b Merge branch 'master' into hotfix-ticketAddresFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-15 11:06:52 +00:00
Juan Ferrer a5682e9a0d doc: refs #6062 README abbreviation
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 15:39:50 +01:00
Carlos Satorres f3faf37e1a hotfix addressFk
gitea/salix/pipeline/head This commit looks good Details
2023-11-14 12:34:00 +01:00
Alex Moreno 1a66987cd0 refs #5979 fix(vn-user): resetPassword url
gitea/salix/pipeline/head This commit looks good Details
2023-11-13 12:26:31 +01:00
Carlos Satorres bfaa648280 Merge pull request 'hotfix addressId' (!1834) from hotfix-addressId into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1834
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-11-10 11:05:39 +00:00
Carlos Satorres a1c8bba4a5 hotfix addressId
gitea/salix/pipeline/head This commit looks good Details
2023-11-10 11:29:18 +01:00
Juan Ferrer 99c88e6f5d fix: refs #6390 Loggable set as base for ItemShelving
gitea/salix/pipeline/head This commit looks good Details
2023-11-05 09:33:18 +01:00
Sergio De la torre 439b3091d0 Merge pull request 'hotFix_6312 fix originalQuantity' (!1819) from hotFix_6312 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1819
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-11-02 14:05:17 +00:00
Sergio De la torre 728838334c hotFix_6312 fix originalQuantity
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 14:42:22 +01:00
Alex Moreno 03e2f57306 refs #6067 fix: emailVerify url
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 10:57:50 +01:00
Alex Moreno bf84863237 refs #6376 fix: changelog
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 08:42:53 +01:00
Alex Moreno 742d6de986 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-11-02 07:28:41 +01:00
Alex Moreno 55d80458cc refs #6065 warmFix(workerTimeControl): set date
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 14:37:42 +02:00
Alex Moreno 83cff37422 refs #6350 fix: 00-dropWorkerCreate.sql
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 08:23:18 +02:00
Alex Moreno 013b010c22 refs #6278 test(itemRequest): fix e2e, correct selector
gitea/salix/pipeline/head This commit looks good Details
2023-10-26 07:56:57 +02:00
Carlos Andrés 6e7b41fbfa Merge pull request '4707-test-workerTimeControl' (!1813) from 4707-test-workerTimeControl into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1813
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-25 09:16:04 +00:00
Carlos Andrés acfec8681d Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:04:16 +00:00
Carlos Andrés 3906b9fd9c Merge branch '4707-test-workerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 11:02:55 +02:00
Carlos Andrés b461f63e2c refs #4707 fix: correct sqlVersion 2023-10-25 11:02:53 +02:00
Carlos Andrés 3ba4e72359 Merge pull request 'refs #4707 fix: problemas fichadas y test' (!1808) from 4707-test-workerTimeControl into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1808
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-25 08:54:37 +00:00
Alex Moreno a501d577f8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:23:00 +02:00
Alex Moreno efa9f16452 fix: remove unnecessary UserError
gitea/salix/pipeline/head This commit looks good Details
2023-10-25 09:22:44 +02:00
Carlos Andrés 001d7cd574 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 15:03:38 +00:00
Carlos Andrés 800bbd74c8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl 2023-10-24 14:35:36 +02:00
Alex Moreno 9c689c194f Merge pull request 'testToMaster' (!1812) from testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1812
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2023-10-24 12:25:51 +00:00
Alex Moreno 9865af8f81 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 14:20:02 +02:00
Alex Moreno 59aa738f38 Merge pull request 'fix: ticket_canAdvance correct worker. fix(dockerFIle)! dockerFile debian version' (!1811) from warmFix_ticketAdvance_salesPerson into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1811
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-24 12:11:14 +00:00
Alex Moreno 22fdcef7bb fix(dockerFIle)! front debian version
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 14:07:05 +02:00
Alex Moreno 589d7cbbb8 fix: ticket_canAdvance correct worker. fix(dockerFIle)! dockerFile debian version
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 12:02:21 +02:00
Alex Moreno 5442476f05 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-10-24 10:35:11 +02:00
Jorge Penadés 24b6dcc606 Merge pull request 'ref #5947 refactorWorkerCreate' (!1802) from 5947-refactorWorkerCreate into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1802
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-24 08:14:26 +00:00
Alex Moreno 201241e2dc Merge pull request 'refs #6335 feat(ticketAdvance): add zone field' (!1810) from 6335_ticketAdvance_zone into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1810
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-24 07:51:22 +00:00
Alex Moreno 22b7c59812 refs #6335 feat(ticketAdvance): add zone field
gitea/salix/pipeline/head This commit looks good Details
2023-10-24 09:23:03 +02:00
Carlos Andrés 2fa2e7f099 Merge branch '4707-test-workerTimeControl' of https://gitea.verdnatura.es/verdnatura/salix into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 16:58:58 +02:00
Carlos Andrés 4ff0bb94c0 refs #4707 2023-10-23 16:58:56 +02:00
Carlos Andrés 08431e94c6 Merge branch 'master' into 4707-test-workerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 13:52:52 +00:00
Carlos Andrés 0055abc0a8 refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 15:52:05 +02:00
Carlos Andrés 6e3517b40f refs #4707 fix: problemas fichadas y test
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 14:51:09 +02:00
Jorge Penadés a630d28f07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 11:37:36 +02:00
Alex Moreno 26aaaff21c Merge pull request '6199_hotFix_isReduction' (!1807) from 6199_hotFix_isReduction into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1807
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-10-23 08:52:55 +00:00
Alex Moreno ae27aa5b1e fix: test to dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 10:08:26 +02:00
Alex Moreno 247aa5af2a refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 09:52:06 +02:00
Alex Moreno cf856a585b refs #6199 fix(sale_quantity): add isReduction
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 09:50:00 +02:00
Jorge Penadés 1f0a57d320 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 09:03:15 +02:00
Alex Moreno dc00b85bec Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-23 08:31:37 +02:00
Jorge Penadés 33656e9d9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5947-refactorWorkerCreate
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 08:21:32 +02:00
Alex Moreno 2edfacb91c refs #5979 fix(sendCheckingPresence)!
gitea/salix/pipeline/head This commit looks good Details
2023-10-23 07:33:52 +02:00
Pablo Natek 59e91221cb Merge pull request '5979-getAppOrigin' (!1799) from 5979-getAppOrigin into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1799
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-10-23 05:06:41 +00:00