fixes #6153 desplegar test-master #1721

Merged

jgallego merged 52 commits from test into master 2023-08-29 07:26:34 +00:00

Conversation 0 Commits 52 Files Changed 42 +260 -90

alexm commented 2023-08-25 07:13:06 +00:00

Member

Copy Link

No description provided.

alexm added 49 commits 2023-08-25 07:13:07 +00:00

467c4e997c refs #5941 feat: when error can send email to support

7881385f4b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5941-send-to-support

9097a1dc28 refs #5941 feat: sendToSuppor component and fix CSS and JSON format

858a3a3a45 refs #5941 typo

ad5c021832 refs #5941 duplicate code

d2120cdc3d refs #5762 feat: multiplatform recover-password and change-password

125d908c5d refs #5762 uncomment

15dee8bef4 refs #5976 refactor: transaferSale call setDeleted

f07ac89cb6 refs #5976 add custom error

2c79056f34 refs #5976 error extended

b188ae6f57 refs #5976 fix: e2e

47b2aa0ee7 Merge branch 'dev' into 5941-send-to-support

3e8bb221e0 refs #5762 Securify fix for recovery url

f26ab787cc Merge pull request 'test → dev' (!1701) from test into dev ...

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

75d3d12ae9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5762-recoverPassword-multiplatform

4c199f66b2 refs #5762 refactor: recoverPassword use app param

b3ac98d751 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

0d5c6ffdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted

5804064c8c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

61e3b71bbf init version 233401 after revert(version) in test

8e961fc25c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5976-transferSale_call_setDeleted

c5e853b028 refs #5976 correct sql folder

19c09d60a2 refs #5986 feat(ticket_filter): add classColor column

ce78fc8e5d refs #5986 feat: state model add classColor properties

f70b767506 Merge branch 'dev' into 5976-transferSale_call_setDeleted

d3d5bcbd00 Merge pull request '5976-transferSale_call_setDeleted' (!1681) from 5976-transferSale_call_setDeleted into dev ...

Reviewed-on: #1681
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>

5653a39e3b fix fixtures names, socialnames streets

aff6668dc9 remove names upper

209cac2a6a Merge branch 'dev' into 5762-recoverPassword-multiplatform

9e4f80e187 Merge pull request 'refs #5762 feat: multiplatform recover-password and change-password' (!1673) from 5762-recoverPassword-multiplatform into dev ...

Reviewed-on: #1673
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

8807b9f87f fix upper

a11905ee63 Merge branch 'dev' into fix-fixtures_test

afc0c98065 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

00fa5b7ce3 Merge branch 'dev' into fix-fixtures_test

674a28d967 Merge pull request 'fix fixtures names, socialnames streets' (!1704) from fix-fixtures_test into dev ...

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

02dddaeffe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5941-send-to-support

4719922883 refs #5941 fix(support-dialog): change message, test: fix e2e

5924303ae2 refs #5483 Dumped fixtures for vn.time removed

f9778c02b7 refs #5483 DB Dockerfile: STAMP removed, not needed anymore

f1e5051eeb Merge branch 'test' into dev

7aee5bafff Merge branch 'dev' into 5941-send-to-support

9fffa1601a Merge pull request 'refs #5941 feat: when error can send email to support' (!1670) from 5941-send-to-support into dev ...

Reviewed-on: #1670
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

4fb6d91e54 refs #6126 feat: add changeLog

6d60592fb9 Merge branch 'master' into test

36623c1cae refs #5941 fix(sendToSupport): fix email from

14d4de0e1f refs #5941 fix(sendToSupport): add as a collaborator

d72e3ec4ec Merge pull request 'refs #5941 fix(sendToSupport): fix email from' (!1711) from 5941-warnFix_email_from into test ...

Reviewed-on: #1711
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

cb8ed437d9 refs #6140 fix: el valor de ttl ya no es undefined

508a4b2d34 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

alexm added 2 commits 2023-08-25 07:55:19 +00:00

7e0865e4b7 refs #5941 feat(sendToSupport): don't show the button if it doesn't have token

1f06cc2072 Merge pull request 'refs #5941 feat(sendToSupport): don't show the button if it doesn't have token' (!1720) from 5941-warmFix_sendToSupport_mandatoryToken into test ...

Reviewed-on: #1720
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

jgallego changed title from test to fixes #6153 desplegar test-master 2023-08-29 07:25:43 +00:00

jgallego approved these changes 2023-08-29 07:26:15 +00:00

jgallego merged commit 28be9ec6a6 into master 2023-08-29 07:26:34 +00:00

jgallego referenced this issue from a commit 2023-08-29 07:26:36 +00:00

Merge pull request 'fixes #6153 desplegar test-master' (!1721) from test into master

Sign in to join this conversation.

Reviewers

No reviewers

jgallego

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#1721

No description provided.