Jorge Penadés
|
f62d11dab2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-26 09:17:14 +02:00 |
Javi Gallego
|
6ce4ff1311
|
Merge branch 'dev' into 6722-thermograph
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-25 13:31:12 +02:00 |
Javi Gallego
|
9ef44d8d8d
|
feat: refs #6722 refactor createThermograph
|
2024-09-25 13:23:31 +02:00 |
Sergio De la torre
|
8f63118550
|
fix: refs #6861 updateAvailable
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-25 12:24:00 +02:00 |
Jon Elias
|
26d7866ec8
|
Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-25 06:02:44 +00:00 |
Jon Elias
|
ae039d6ce2
|
Merge branch 'dev' into 7356-FixTicketWeekly
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 10:51:25 +00:00 |
Alex Moreno
|
63a4cb1847
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-24 12:25:41 +02:00 |
Alex Moreno
|
9106171b92
|
Merge branch 'test' into hotFix_travelList_daysOnward
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-24 09:39:21 +00:00 |
Jon Elias
|
d221611382
|
Merge branch 'dev' into 7356-FixTicketWeekly
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 09:33:47 +00:00 |
Alex Moreno
|
afbf084535
|
Merge branch 'test' into 8032-devToTest_2440
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-09-24 09:29:38 +00:00 |
Jon Elias
|
1e07a2fc59
|
Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 08:44:36 +00:00 |
Jorge Penadés
|
78b500e452
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-24 10:15:25 +02:00 |
Pablo Natek
|
f9b37541eb
|
Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 08:55:47 +02:00 |
Pablo Natek
|
a5f3dbc15a
|
fix: refs #7404 last entries spec
|
2024-09-24 08:55:24 +02:00 |
Alex Moreno
|
76e545d488
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travelList_daysOnward
gitea/salix/pipeline/pr-master This commit looks good
Details
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-09-24 08:35:30 +02:00 |
Pablo Natek
|
bfd52b8773
|
Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-24 05:31:34 +00:00 |
Pablo Natek
|
166ca42e32
|
Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-09-24 07:31:24 +02:00 |
Pablo Natek
|
3988eb0d97
|
fix: refs #7404 back and e2e
|
2024-09-24 07:31:22 +02:00 |
Sergio De la torre
|
ea06afb361
|
Merge pull request 'fix: hotFix backLimit refs #6964' (!3003) from 6964-ListItemNewer into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #3003
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-24 05:17:02 +00:00 |
Alex Moreno
|
882f1eb7c2
|
feat(travelFilter): add daysOnward
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-23 15:30:10 +02:00 |
Robert Ferrús
|
31d5a7a635
|
feat: refs #8000 add column
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-23 11:53:27 +02:00 |
Pablo Natek
|
ab89c8f3ba
|
Merge branch 'dev' into 7404-fixStockBought
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-23 08:16:16 +00:00 |
Pablo Natek
|
80985fbd56
|
fix: refs #7404 round data and fix specs
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-23 10:14:09 +02:00 |
Pablo Natek
|
459f6601b7
|
fix: refs #7404 add transaction on detail calculate
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-23 10:02:01 +02:00 |
Jorge Penadés
|
8ff0dc06fe
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-23 09:29:51 +02:00 |
Sergio De la torre
|
c6d5e2f292
|
fix: hotFix backLimit refs #6964
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-23 08:09:24 +02:00 |
Ivan Mas
|
06f8f8e95e
|
refactor: refs #7725 deprecate worker.isF11Allowed
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-22 08:39:19 +02:00 |
Pablo Natek
|
fb1e77f9c4
|
fix: refs #7404 fix back data source
|
2024-09-20 11:06:38 +02:00 |
Jon Elias
|
2fc07e651f
|
Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-20 08:24:42 +00:00 |
Carlos Satorres
|
eb3ea010a1
|
Merge branch 'master' into 6898-fixSupplier2
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 07:31:15 +00:00 |
Carlos Satorres
|
889b86644b
|
fix: refs #6898 filter fix
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-20 09:14:38 +02:00 |
Jon Elias
|
fa4f75fbb9
|
Merge branch '7356-FixTicketWeekly' of https://gitea.verdnatura.es/verdnatura/salix into 7356-FixTicketWeekly
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 13:14:24 +02:00 |
Jon Elias
|
b642147d82
|
feat: refs #7356 added new filter field
|
2024-09-19 13:14:22 +02:00 |
Ivan Mas
|
24b9dfb9a9
|
Merge branch 'dev' into 7343-ModifyDiverRouteEmail
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 10:50:44 +00:00 |
Ivan Mas
|
c82c9395a4
|
feat: refs #7343 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 12:49:45 +02:00 |
Alex Moreno
|
ccb60eee87
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2024-09-19 12:42:12 +02:00 |
Ivan Mas
|
c30ecd3760
|
feat: refs #7343 Modify driverRouteEmail.js
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 12:26:06 +02:00 |
Jorge Penadés
|
22af34c0cb
|
feat: refs #7323 use scopes
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-19 09:27:05 +02:00 |
Carlos Satorres
|
6b90690924
|
Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-19 06:10:15 +00:00 |
Javi Gallego
|
da0e735fb2
|
fix: hotFix limit 5
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-18 23:41:01 +02:00 |
Alex Moreno
|
79d79f0c9b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7792-twoFactorFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-18 12:03:52 +02:00 |
Jorge Penadés
|
c0c8548216
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-18 09:41:40 +02:00 |
Alex Moreno
|
829ecba2ef
|
refactor: refs #7792 revert TwoFactorType
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-18 08:30:05 +02:00 |
Jon Elias
|
35358834d9
|
Merge branch 'dev' into 7884-AddLabelerField
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-18 06:23:44 +00:00 |
Javier Segarra
|
96159224a4
|
Merge branch 'dev' of https: refs #7677//gitea.verdnatura.es/verdnatura/salix into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 16:48:09 +02:00 |
Jorge Penadés
|
eb430ea5c4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 15:44:19 +02:00 |
Javi Gallego
|
06d06d7b1a
|
Merge pull request '3505-closureTests' (!2970) from 3505-closureTests into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2970
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-09-17 13:09:18 +00:00 |
Javier Segarra
|
7f6bd55eaa
|
Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-17 13:07:25 +00:00 |
Jon Elias
|
59c6d316dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7884-AddLabelerField
|
2024-09-17 14:21:14 +02:00 |
Jon Elias
|
71362baa66
|
feat: refs #7884 added filter when daysOnward and daysAgo have value and refactor ifs block
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 12:42:47 +02:00 |
Jorge Penadés
|
529be86d84
|
fix: refs #7524 too records error
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-17 11:44:09 +02:00 |
Jorge Penadés
|
4332fccfcc
|
chore: refs #7524 rollback
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-09-17 11:43:34 +02:00 |
Javier Segarra
|
3e5442c40b
|
Merge branch 'dev' into 7677_vnLocation_perf
|
2024-09-17 11:42:04 +02:00 |
Jorge Penadés
|
3f321e8ee8
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-getAmountPaid
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-17 11:40:52 +02:00 |
Pablo Natek
|
d308f185bc
|
Merge branch 'dev' into 7404-stockBuyed
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 08:11:17 +00:00 |
Jon Elias
|
1d47690bb4
|
feat: refs #7884 added new filter field
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 08:31:58 +02:00 |
Javi Gallego
|
e5e14878b8
|
feat: refs #3505 remove return
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-17 07:57:00 +02:00 |
Javi Gallego
|
06efa8be94
|
Merge branch 'dev' into 3505-closureTests
|
2024-09-17 07:12:01 +02:00 |
Jorge Penadés
|
4d0bb81632
|
fix: refs #7323 worker/filter
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 16:33:22 +02:00 |
Jorge Penadés
|
8fedfbd090
|
fix: refs #7524 getAmountPaid wip
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-16 13:32:14 +02:00 |
Javi Gallego
|
f43fa32d36
|
feat: refs #3505 fdescribe
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-16 13:26:53 +02:00 |
Javi Gallego
|
e4a74ba0e9
|
feat: refs #3505 testBack closure
|
2024-09-16 13:24:33 +02:00 |
Guillermo Bonet
|
0d7953a869
|
Merge branch 'dev' into 7912-wasteChanges
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 10:33:23 +00:00 |
Guillermo Bonet
|
5c7a537275
|
feat: refs #7912 Added new waste types
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 12:32:52 +02:00 |
Jorge Penadés
|
0a0701f7c2
|
Merge branch 'dev' into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 10:24:36 +00:00 |
Pablo Natek
|
1f1da689d4
|
fix: refs #7404 remove console log
|
2024-09-16 12:17:51 +02:00 |
Pablo Natek
|
138640f991
|
fix: refs #7404 update test to match new fixtures for travel by continent
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-16 12:05:36 +02:00 |
Pablo Natek
|
8f4f2d2d15
|
Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix into 7404-stockBuyed
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-16 09:06:04 +02:00 |
Pablo Natek
|
cc1cd0563f
|
feat: refs #7404 fixtures and translates
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-16 09:00:46 +02:00 |
Guillermo Bonet
|
5489a5edbc
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-16 07:16:33 +02:00 |
Guillermo Bonet
|
2e34f1bbe6
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-16 07:16:13 +02:00 |
Guillermo Bonet
|
635eb405a2
|
fix: refs #7644 Update in print method
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-13 14:53:44 +02:00 |
Guillermo Bonet
|
6f1d962db2
|
fix: refs #7644 Update in print method
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-13 14:39:47 +02:00 |
Sergio De la torre
|
11193bebe6
|
Merge pull request '6868_createLogin' (!2598) from 6868_createLogin into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2598
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-09-13 09:43:31 +00:00 |
Javier Segarra
|
6f18b8a719
|
Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 07:28:45 +00:00 |
Jorge Penadés
|
2dc55a706c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 09:20:57 +02:00 |
Jon Elias
|
99bd20bc05
|
Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 06:13:26 +00:00 |
Sergio De la torre
|
e80fe1d0dc
|
feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-13 07:10:47 +02:00 |
Sergio De la torre
|
2d4e667009
|
feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-13 07:02:30 +02:00 |
Sergio De la torre
|
05b6c75a19
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin
|
2024-09-13 07:02:15 +02:00 |
Sergio De la torre
|
93e7163858
|
feat: refs #6868 refs# 6868 handleUser
|
2024-09-12 17:09:27 +02:00 |
Alex Moreno
|
1abf6a14f9
|
fix: workerDms filter workerFk
|
2024-09-12 13:26:09 +02:00 |
Jorge Penadés
|
edccd95fa1
|
fix: refs #7828 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-09-12 10:29:03 +02:00 |
Jorge Penadés
|
b2bc095caa
|
fix: refs #7828 rollback
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 10:28:29 +02:00 |
Jorge Penadés
|
74fafdf330
|
fix: refs #7828 filter mail access
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 10:27:18 +02:00 |
Jorge Penadés
|
6f81ca08db
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 09:55:03 +02:00 |
Alex Moreno
|
9435ce8c5b
|
Merge pull request '7182-workerDms_optimization' (!2946) from 7182-workerDms_optimization into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2946
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
|
2024-09-12 07:28:07 +00:00 |
Jorge Penadés
|
f1f10d1367
|
refactor: refs #7828 wip
|
2024-09-12 09:15:07 +02:00 |
Jon Elias
|
d36ce6bf99
|
Merge branch 'dev' into 6346-FixWagonModule
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-12 05:43:17 +00:00 |
Jon Elias
|
a73bdfe18f
|
Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix into 6346-FixWagonModule
|
2024-09-12 07:36:55 +02:00 |
Carlos Satorres
|
757cd78cfc
|
fix: refs #7354 fix files
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 14:42:21 +02:00 |
Guillermo Bonet
|
728c40916c
|
refactor: refs #7895 workerDocument to workerDms
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 14:38:58 +02:00 |
Carlos Satorres
|
f696c4043d
|
Merge branch 'dev' of https: refs #7354//gitea.verdnatura.es/verdnatura/salix into 7354_ZoneMigration_End
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 13:47:30 +02:00 |
Jon Elias
|
e5161fe9e2
|
fix: fixed balanceDialog amount field
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-09-11 13:26:40 +02:00 |
Guillermo Bonet
|
6b5f59a09b
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-11 12:54:27 +02:00 |
Guillermo Bonet
|
4c6aba96e5
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-09-11 12:54:16 +02:00 |
Alex Moreno
|
17fecf6dcb
|
Merge branch '7182-workerDms_optimization' of https://gitea.verdnatura.es/verdnatura/salix into 7182-workerDms_optimization
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 10:31:44 +02:00 |
Alex Moreno
|
c21da8d258
|
fix: refs #7182 function name
|
2024-09-11 10:31:43 +02:00 |
Alex Moreno
|
e062088f1e
|
Merge branch 'dev' into 7182-workerDms_optimization
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 08:29:38 +00:00 |
Pablo Natek
|
842c98edfc
|
Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-09-11 08:22:24 +00:00 |