Commit Graph

23400 Commits

Author SHA1 Message Date
Alex Moreno f0f4610be5 Merge branch '6336-claim-redirectToLilium' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 09:05:08 +02:00
Alex Moreno 4fb82dc944 test: fix ticket sale e2e 2024-08-08 09:05:08 +02:00
Alex Moreno 8112797918 Merge branch 'dev' into 6336-claim-redirectToLilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 06:23:59 +00:00
Alex Moreno 715439ae38 test: fix claim descriptor redirect to lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 08:23:17 +02:00
Alex Moreno c768fa113e test: fix ticket redirect to lilium
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-08 08:20:26 +02:00
Pako Natek c3da3b9bf3 Merge pull request '7836-futureEntries' (!2839) from 7836-futureEntries into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2839
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-08 06:06:22 +00:00
Pako Natek a9cdbb1255 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-08 06:01:35 +00:00
Alex Moreno 4e831dc1bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6336-claim-redirectToLilium
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 11:17:09 +02:00
Pako Natek 9b2cbcd5cc reviewed
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-07 10:42:14 +02:00
Guillermo Bonet fc102eff7b Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 14:12:32 +02:00
Guillermo Bonet 03358170d3 fix: refs #7740 ticket route throw
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 14:10:16 +02:00
Pako Natek fc7c7beef7 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 11:23:56 +00:00
Guillermo Bonet 184cbb2800 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 12:58:08 +02:00
Guillermo Bonet ffa775a8a5 Merge pull request 'fix: refs #7834 expeditionScan_Put' (!2832) from 7834-fixExpeditionScanPut into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2832
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-08-06 10:56:10 +00:00
Guillermo Bonet d1bb77d6ed fix: refs #7834 expeditionScan_Put
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 12:51:55 +02:00
Guillermo Bonet 28b848930e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 12:45:55 +02:00
Guillermo Bonet c7c711ac1a fix: refs #7728 duaInvoiceInBooking
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 12:43:51 +02:00
Alex Moreno 0152fb8a98 hotFix getTIckets
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 09:51:15 +02:00
Alex Moreno f1b55ff75b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 09:44:27 +02:00
Alex Moreno 69c676d44b hotFix(route): fix getTicket use skip
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-06 09:38:27 +02:00
Alex Moreno afbba83969 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-06 09:17:16 +02:00
Alex Moreno 89ba79053a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-08-06 09:17:11 +02:00
Alex Moreno fb15225078 Merge pull request 'build: dump 2432' (!2838) from 7837-dump_2432 into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2838
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-08-06 07:16:43 +00:00
Guillermo Bonet 58677dca56 Merge pull request 'refactor: refs #7820 Deprecated silexACL' (!2833) from 7820-silexAcl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2833
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-06 07:15:20 +00:00
Alex Moreno 6fb78e1599 test: hotFix saveSign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 08:59:20 +02:00
Alex Moreno 70a91da0ff build: dump 2432
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-06 08:27:40 +02:00
Alex Moreno 36dee872d6 Merge pull request '7837-testToMaster_2432' (!2834) from 7837-testToMaster_2432 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2834
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-06 05:52:04 +00:00
Guillermo Bonet 54e6c63b8b fix: refs #7834 SELECT
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 07:29:32 +02:00
Guillermo Bonet e03a1914d9 fix: refs #7834 Throw
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 07:27:36 +02:00
Guillermo Bonet 1e41f5d533 Merge pull request 'feat: refs #7713 Created ACLLog' (!2783) from 7713-AclLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2783
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-06 05:05:19 +00:00
Alex Moreno e95d722a7c add changelog
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 14:52:09 +02:00
Pako Natek dcdbb0bf93 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 12:29:30 +00:00
Pako Natek be5859b8cf prototipo
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-05 14:28:29 +02:00
Guillermo Bonet ea65a13cfb Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:59:44 +02:00
Guillermo Bonet d6e09fcfc9 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 12:59:37 +02:00
Guillermo Bonet 91253cc807 fix: refs #7835 transferSales
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:57:38 +02:00
Guillermo Bonet fa3a7aa931 refactor: refs #7820 Deprecated silexACL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 12:49:04 +02:00
Guillermo Bonet 967443b427 fix: refs #7834 expeditionScan_Put
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 12:26:16 +02:00
Guillermo Bonet 21423d3b48 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:00:01 +02:00
Guillermo Bonet d5a8e32b52 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 11:59:46 +02:00
Guillermo Bonet df672a22eb Merge pull request 'feat: refs #7644 Optimized entry labels report' (!2831) from 7644-buyLabelChunk into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2831
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-08-05 09:53:33 +00:00
Guillermo Bonet 32b48a7bb6 feat: refs #7644 Fix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 11:48:02 +02:00
Guillermo Bonet 760a1debca feat: refs #7644 Requested changes
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-05 11:44:20 +02:00
Guillermo Bonet ab446b54ed feat: refs #7644 Optimized entry labels report
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-05 11:29:35 +02:00
Carlos Andrés e1dc7a3cb9 Merge pull request 'Hotfix changes whit conficts merged incorrectly' (!2829) from Hotfix-changes-whit-conficts-merged-incorrectly into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2829
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-02 12:16:03 +00:00
Carlos Andrés f431d6c37f Hotfix changes whit conficts merged incorrectly
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 13:45:58 +02:00
Guillermo Bonet abd8bc9639 fix: refs #6453 order_confirmWithUser
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 12:20:50 +02:00
Guillermo Bonet ae9472e092 Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2694
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-02 10:14:58 +00:00
Guillermo Bonet 6acba08a91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 12:08:40 +02:00
Guillermo Bonet f6db62945d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 12:08:22 +02:00