 Joan Sanchez
|
e0a8daf2f8
|
Merge pull request '4480-vnUser - Replaced model Account in favor of VnUser' (!1267) from 4480-vnUser into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1267
|
2023-04-18 09:52:24 +00:00 |
|
Joan Sanchez
|
32c9e22d96
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 11:41:55 +02:00 |
|
Joan Sanchez
|
a0d8ed1433
|
E2e fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 11:33:36 +02:00 |
 Alexandre Riera
|
11b905138f
|
Merge pull request 'fixes #5418 Buscador lateral en item/fixed-price' (!1412) from 5418-buscador-lateral-fixed-price into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1412
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-04-18 08:49:53 +00:00 |
 Carlos Satorres
|
3c639b9a2b
|
refs # cambios entrantes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 10:48:41 +02:00 |
|
Alexandre Riera
|
2df362327f
|
Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 08:33:15 +00:00 |
|
Alexandre Riera
|
e8e373d924
|
Merge pull request 'fixes #5518 Crear secciones de histórico para usuarios y roles' (!1446) from 5518-log-user-role into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1446
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2023-04-18 08:31:17 +00:00 |
|
Joan Sanchez
|
a5f6991511
|
continue
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 10:18:44 +02:00 |
|
Joan Sanchez
|
aabc4ec58d
|
fix(consumption): continue queue if client mailing fails
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 10:08:04 +02:00 |
|
Alexandre Riera
|
28a7722bb6
|
Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 08:01:42 +00:00 |
|
Joan Sanchez
|
fded7d062b
|
section fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 09:49:23 +02:00 |
 Vicent Llopis
|
b3e7cedd1e
|
refs #5128 borrada línea por error
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 09:49:12 +02:00 |
|
Joan Sanchez
|
cebab42b47
|
Merge pull request 'hotfix delivery' (!1457) from hotfix-delivery-231401 into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1457
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-18 07:35:16 +00:00 |
|
Alexandre Riera
|
4eb7e19c43
|
Merge branch 'test' into hotfix-delivery-231401
gitea/salix/pipeline/head Build queued...
Details
|
2023-04-18 07:30:27 +00:00 |
|
Alexandre Riera
|
89f6f0fbdb
|
hotfix delivery
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 09:29:36 +02:00 |
|
Vicent Llopis
|
c5225cb632
|
refs #5128 borrado código innecesario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 09:23:19 +02:00 |
|
Vicent Llopis
|
fef9387782
|
Merge pull request 'fix intermintent test' (!1456) from fix_intermitentTest into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1456
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2023-04-18 07:18:28 +00:00 |
|
Vicent Llopis
|
48cd23750e
|
refs #5128 add testBack
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 09:09:09 +02:00 |
|
Joan Sanchez
|
6c71bda814
|
Merge pull request 'masterHotfix_arcRfid' (!1455) from masterHotfix_arcRfid into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1455
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-18 07:00:09 +00:00 |
|
Vicent Llopis
|
c9dffe9175
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 08:39:43 +02:00 |
|
Joan Sanchez
|
6fd5c8ae2d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-18 08:34:20 +02:00 |
|
Joan Sanchez
|
d6fb05cc93
|
Merge pull request 'refs #5213 cambios e2e, descriptor' (!1437) from 5213-minorBugs2 into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1437
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-18 06:33:47 +00:00 |
|
Joan Sanchez
|
6d593a0937
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5213-minorBugs2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 08:32:22 +02:00 |
|
Vicent Llopis
|
edc49ab5b3
|
refactor code
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 08:26:26 +02:00 |
|
Vicent Llopis
|
ce3e299d09
|
fix intermintent test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 08:20:50 +02:00 |
 Pablo Natek
|
3636543f73
|
refs #5075
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 08:19:23 +02:00 |
|
Carlos Satorres
|
8b60e9f5fd
|
sql arreglado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 08:07:35 +02:00 |
 Alex Moreno
|
560b5b374f
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 05:37:12 +00:00 |
|
Vicent Llopis
|
d99815356a
|
refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 07:26:35 +02:00 |
|
Joan Sanchez
|
2192cd4066
|
Merge pull request 'hotfix minor version delivery' (!1454) from hotfix-applyChanges-delivery into test
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1454
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-18 05:20:09 +00:00 |
|
Alexandre Riera
|
18b859ae71
|
Merge branch 'hotfix-applyChanges-delivery' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-applyChanges-delivery
|
2023-04-18 07:19:35 +02:00 |
|
Alexandre Riera
|
5a2dbbabfd
|
template string
|
2023-04-18 07:19:33 +02:00 |
|
Alexandre Riera
|
095135807d
|
Merge branch 'test' into hotfix-applyChanges-delivery
gitea/salix/pipeline/head Build queued...
Details
|
2023-04-18 05:18:29 +00:00 |
|
Alexandre Riera
|
b3fb661f12
|
hotfix minor version delivery
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 07:17:36 +02:00 |
|
Joan Sanchez
|
a41cf2f3f9
|
Merge pull request 'refs #5553 Don't save image extension' (!1453) from 5553-dontSaveImageExtension into master
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1453
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-18 05:05:12 +00:00 |
 Juan Ferrer
|
1c4f919e89
|
refs #5553 Don't save image extension
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 22:24:19 +02:00 |
|
Juan Ferrer
|
378400c6d2
|
refs #5553 Image scrubing method improved
gitea/salix/pipeline/head This commit looks good
Details
Remove & dryRun options, check that collection exists, performance improved, exclusive lock
|
2023-04-17 18:19:25 +02:00 |
|
Carlos Satorres
|
f76727903a
|
update insert
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 15:17:05 +02:00 |
|
Juan Ferrer
|
0423fac88c
|
refs #5553 Image clean method Image/scrub
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 14:33:07 +02:00 |
|
Alex Moreno
|
0c475be10b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 14:23:02 +02:00 |
|
Alex Moreno
|
2a8383f9cc
|
Merge pull request 'fix e2e' (!1450) from fix_e2e into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 12:19:26 +00:00 |
|
Joan Sanchez
|
06a845e7f0
|
Cambios SQL
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 14:15:39 +02:00 |
|
Alex Moreno
|
6a0a08be95
|
typo
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 13:03:09 +02:00 |
|
Alex Moreno
|
b5434c5e4e
|
tab
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 12:58:55 +02:00 |
|
Alex Moreno
|
6144c24a44
|
fix(ticket_edit): fix e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 12:44:58 +02:00 |
|
Alexandre Riera
|
7d8a0597c1
|
Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 09:53:36 +00:00 |
|
Alexandre Riera
|
2675c02d13
|
refs #5518 moved models to account
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 11:52:52 +02:00 |
|
Alex Moreno
|
f97d169cbf
|
observationEmail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 11:52:31 +02:00 |
|
Alexandre Riera
|
2bc190b01e
|
Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 08:49:41 +00:00 |
|
Alexandre Riera
|
0dcbc9fc8b
|
refs #5293 redirected claim.photos to lilium
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 10:46:26 +02:00 |