 Javier Segarra
|
f4f02c98c0
|
Merge branch '6434-improve-signInLog' of https://gitea.verdnatura.es/verdnatura/salix into 6434-improve-signInLog
|
2023-11-28 12:39:29 +01:00 |
|
Javier Segarra
|
fb583780fc
|
Merge branch 'test' into 6434-improve-signInLog
|
2023-11-28 12:37:46 +01:00 |
|
Javier Segarra
|
c23c10dd5a
|
Revert "revert merge from dev"
gitea/salix/pipeline/head Build queued...
Details
This reverts commit e026d487c7.
|
2023-11-28 12:28:37 +01:00 |
|
Javier Segarra
|
81b3b22e55
|
Merge branch 'test' into 6434-improve-signInLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-11-28 12:26:09 +01:00 |
|
Javier Segarra
|
19021c16fe
|
Merge branch '6434-improve-signInLog' of https://gitea.verdnatura.es/verdnatura/salix into 6434-improve-signInLog
|
2023-11-28 12:20:51 +01:00 |
|
Javier Segarra
|
750f8665f4
|
revert merge from dev
|
2023-11-28 12:18:50 +01:00 |
|
Javier Segarra
|
21092cc9ee
|
revert merge from dev
|
2023-11-28 12:14:39 +01:00 |
|
Javier Segarra
|
97cb92716c
|
Merge branch '6434-improve-signInLog' of https://gitea.verdnatura.es/verdnatura/salix into 6434-improve-signInLog
|
2023-11-28 12:04:26 +01:00 |
|
Javier Segarra
|
ae4ce42233
|
Merge remote-tracking branch 'origin' into 6434-improve-signInLog
|
2023-11-28 12:04:09 +01:00 |
|
Javier Segarra
|
3dc5188242
|
Merge branch '6434-improve-signInLog' of https://gitea.verdnatura.es/verdnatura/salix into 6434-improve-signInLog
|
2023-11-28 11:57:15 +01:00 |
|
Javier Segarra
|
c4896e5aa4
|
revert merge from dev
|
2023-11-28 11:57:02 +01:00 |
|
Javier Segarra
|
823315f4ac
|
Merge remote-tracking branch 'origin' into 6434-improve-signInLog
gitea/salix/pipeline/head Build queued...
Details
|
2023-11-28 11:49:45 +01:00 |
|
Javier Segarra
|
a9e1b8cf28
|
Merge branch '6434-improve-signInLog' of https://gitea.verdnatura.es/verdnatura/salix into 6434-improve-signInLog
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-28 11:47:29 +01:00 |
|
Javier Segarra
|
e026d487c7
|
revert merge from dev
|
2023-11-28 11:47:26 +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 |
 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 |
 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 |
|
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 |
|
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 |
|
Javier Segarra
|
c890dfeb7d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-improve-signInLog
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-11-24 12:45:22 +01:00 |
|
Javier Segarra
|
cbcc2ba17c
|
refs #6434 perf: remove default value param
|
2023-11-24 12:44:36 +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 |
|
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
|
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
|
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 |