test-to-dev #1478

Merged

alexandre merged 53 commits from test-to-dev into dev 2023-04-24 06:54:33 +00:00

Conversation 0 Commits 53 Files Changed 2 +7337 -564

alexandre commented 2023-04-24 06:43:51 +00:00

Contributor

Copy Link

No description provided.

alexandre added 52 commits 2023-04-24 06:43:53 +00:00

e6355e3232 hotfix paginate negative bases

b364564e4d Merge branch 'test' into hotfix-paginate-negativeBases

0423fac88c refs #5553 Image clean method Image/scrub

378400c6d2 refs #5553 Image scrubing method improved ...

Remove & dryRun options, check that collection exists, performance improved, exclusive lock

1c4f919e89 refs #5553 Don't save image extension

a41cf2f3f9 Merge pull request 'refs #5553 Don't save image extension' (!1453) from 5553-dontSaveImageExtension into master ...

Reviewed-on: #1453
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

b3fb661f12 hotfix minor version delivery

095135807d Merge branch 'test' into hotfix-applyChanges-delivery

5a2dbbabfd template string

18b859ae71 Merge branch 'hotfix-applyChanges-delivery' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-applyChanges-delivery

2192cd4066 Merge pull request 'hotfix minor version delivery' (!1454) from hotfix-applyChanges-delivery into test ...

Reviewed-on: #1454
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

d99815356a refs #5144 manejado que el usuario sea NULL

ce3e299d09 fix intermintent test

edc49ab5b3 refactor code

6c71bda814 Merge pull request 'masterHotfix_arcRfid' (!1455) from masterHotfix_arcRfid into master ...

Reviewed-on: #1455
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

fef9387782 Merge pull request 'fix intermintent test' (!1456) from fix_intermitentTest into test ...

Reviewed-on: #1456
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

89f6f0fbdb hotfix delivery

4eb7e19c43 Merge branch 'test' into hotfix-delivery-231401

cebab42b47 Merge pull request 'hotfix delivery' (!1457) from hotfix-delivery-231401 into test ...

Reviewed-on: #1457
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

aabc4ec58d fix(consumption): continue queue if client mailing fails

a5f6991511 continue

6b72d88256 test

1d7c1f8d41 Merge pull request 'hotfix expedition-pallet template' (!1458) from hotfix_arcRfid2 into master ...

Reviewed-on: #1458
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

90b38d02a0 Default username property

bf335a0447 Merge branch 'test' into hotfix-paginate-negativeBases

8f100c6021 Merge pull request 'hotfix paginate negative bases' (!1444) from hotfix-paginate-negativeBases into test ...

Reviewed-on: #1444
Reviewed-by: Joan Sanchez <joan@verdnatura.es>

26faab6a84 refs #5553 Exclusive lock fix, don't stop when unlink fails

8763dc32c4 refs #5553 Code syntax refactor

dc853213b8 refs #5553 Allow to skip default transaction timeout

5dd7c7e3bd refs #5553 Improve error handling

a85135b1c8 refs #5553 New parameter to skip lock

63e0031bc6 deploy(231401): test to master

7df4a2b15d fix(231401): fix tests and fixtures

6f35eb0ce3 Merge pull request '231401_test_to_production' (!1464) from 231401_test_to_production into master ...

Reviewed-on: #1464
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

239685b43f (231401) master to test

df3f2f3b62 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test

3103e60d4b fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 60000

5af961ac69 fix: maneja si se elimina la sale

9766008ca9 fix: upload jasmine.DEFAULT_TIMEOUT_INTERVAL to 90000

4c6b4ea6c8 refactor: eliminada la doble paginación en los logs

83f71cdd36 refactor: mostrar en columnas visibles 'Frágil'

a725ee90cf update backTest timeout

3fd145b9d0 Merge pull request 'hotfix_ticketSmsChanges' (!1471) from hotfix_ticketSmsChanges into master ...

Reviewed-on: #1471
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

1842a5c464 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 231401_master_to_test

25414f23f0 Merge pull request '(231401) master to test' (!1466) from 231401_master_to_test into test ...

Reviewed-on: #1466
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>

2975e7fae3 hotfix savesign

bbf1c40987 Merge branch 'master' into hotfix-dms-hasFile

d945707761 Merge pull request 'hotfix savesign dms hasFile' (!1474) from hotfix-dms-hasFile into master ...

Reviewed-on: #1474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

d48ede678d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into master-to-test

84c01ecea7 Merge branch 'test' into master-to-test

5b44323009 Merge pull request 'master -> test' (!1477) from master-to-test into test ...

Reviewed-on: #1477
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

0a1583aa54 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev

alexandre requested review from alexm 2023-04-24 06:44:03 +00:00

alexandre added 1 commit 2023-04-24 06:50:30 +00:00

925e30350a resolved conflicts

alexm approved these changes 2023-04-24 06:51:00 +00:00

alexandre merged commit 4eeeccf263 into dev 2023-04-24 06:54:33 +00:00

alexandre deleted branch test-to-dev 2023-04-24 06:54:34 +00:00

alexandre referenced this issue from a commit 2023-04-24 06:54:34 +00:00

Merge pull request 'test-to-dev' (!1478) from test-to-dev into dev

Sign in to join this conversation.

Reviewers

No reviewers

alexm

Labels

Clear labels   

CR / Tests passed

Unit tests and e2e passed

  

e2e

Implement e2e

  

Missing tests

Missing tests

  

Needs refactor

  

Simple

Simple check / No CR needed

No Label

CR / Tests passed

e2e

Missing tests

Needs refactor

Simple

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1478

No description provided.