 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 |
|
Alex Moreno
|
1eb66f608b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5739-dockerRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 15:12:58 +01:00 |
|
Alex Moreno
|
24f3cb2244
|
refs #5739 feat: run db, back and front in docker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-24 15:12:35 +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 |
|
Jorge Penadés
|
1f9030c36d
|
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-23 13:35:46 +01:00 |
|
Jorge Penadés
|
eeef279483
|
refs #5811 replace decription
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 13:34:29 +01:00 |
|
Jorge Penadés
|
e314a67fe7
|
refs #6274 time control methods migrated
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 13:25:31 +01:00 |
|
Jorge Penadés
|
5f09907c98
|
Merge branch '5835-fixGetTotals' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 13:21:09 +01:00 |
|
Jorge Penadés
|
025e4f3f87
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
|
2023-11-23 13:21:00 +01:00 |
|
Jorge Penadés
|
f4a1d09ef8
|
Merge branch 'dev' into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 12:04:05 +00:00 |
 Sergio De la torre
|
756e55f5c2
|
Merge pull request 'refs #5890 fix: getTickets' (!1852) from 5890_collection_getTickets into dev
gitea/salix/pipeline/head Build queued...
Details
Reviewed-on: #1852
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-11-23 11:23:15 +00:00 |
|
Alex Moreno
|
4735307f5d
|
refs #5890: fix(Collection/getTickets): accepts iss.quantity nulls
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:49:00 +01:00 |
|
Jorge Penadés
|
6b2c1e09de
|
refs #5835 refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:31:00 +01:00 |
|
Javi Gallego
|
5b145a57e6
|
error: refs 6028 test front quitado
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:29:53 +01:00 |
|
Jorge Penadés
|
048e3089cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5835-fixGetTotals
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:26:41 +01:00 |
|
Jorge Penadés
|
db15285858
|
refs #5811 test updated
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 11:21:56 +01:00 |
|
Jorge Penadés
|
2e67ef4f5d
|
refs #5811 refactor deleteExpeditions
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:32:07 +01:00 |
|
Jorge Penadés
|
900dffbbba
|
refs #5811 delete viaexpress expeditions included
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 10:26:28 +01:00 |
|
Javi Gallego
|
f44424dbcf
|
test: refs #6028 test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 09:44:47 +01:00 |
|
Javi Gallego
|
5b289ec083
|
Merge branch 'dev' into 6028_route_getRouteByWorker
|
2023-11-23 09:21:44 +01:00 |
|
Alex Moreno
|
1277bec801
|
Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 07:56:02 +00:00 |
|
Jorge Penadés
|
6580896dcd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5811-ticket.expedition_deleteViaexpress
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 08:46:11 +01:00 |
|
Alex Moreno
|
217aa1ac77
|
refs #6491 deploy(2350) init version
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-23 08:35:08 +01:00 |
|
Jorge Penadés
|
da7b670d74
|
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-23 08:28:56 +01:00 |
|
Alex Moreno
|
f4fabb9fff
|
refs #6491 refactor(order_filter): optimized
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-23 08:26:14 +01:00 |
 Carlos Andrés
|
800d12e0f2
|
Merge branch 'dev' into 5890_collection_getTickets
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-22 18:00:34 +00:00 |
|
Carlos Satorres
|
2b455488a3
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-22 18:35:16 +01:00 |
|
Carlos Satorres
|
6b07ee4eb1
|
hotfix workerhours
|
2023-11-22 18:35:14 +01:00 |