7299_testToMaster #351

Merged

alexm merged 321 commits from 7299_testToMaster into master 2024-05-07 05:36:02 +00:00

Conversation 0 Commits 321 Files Changed 153 +13215 -4198

alexm commented 2024-05-06 12:49:33 +00:00

Member

Copy Link

No description provided.

alexm added 321 commits 2024-05-06 12:49:33 +00:00

d4a89895b4 WIP

1c689ce966 Travel termographs WIP

0c385d9a6f WIP

cbd8af7fae In TravelList show warehouses name instead warehouseFk

91cd4c35e8 TravelSummary improvements

9757fdf70a Travel termographs and general improvements

8cc92f127c merge with dev

7eda82bf82 Improvements WIP

f911a644e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

6096123c6e Mejoras y cosas faltantes

b440545ac9 Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TravelSubmodules

f0778daaa6 Merge pull request 'feature/TravelSubmodules' (#83) from feature/TravelSubmodules into dev ...

Reviewed-on: hyervoni/salix-front-mindshore#83
Reviewed-by: Carlos Fonseca <cfonseca@verdnatura.es>

26a1b29070 mini fix in travel termograph create

7b3ff319d4 Desarrollo de tarjetas varias en el modulo de clientes en el summary

9c351b6494 Tarjeta pago web sin contenido

b06e5b9252 Correcciones comentarios pr

94ca3318a3 Merge pull request 'Desarrollo de tarjetas varias en el modulo de clientes en el summary' (#86) from features/ms_160_contracts_opinion_credit_cards into dev ...

Reviewed-on: hyervoni/salix-front-mindshore#86

dc554f03d0 merge with salix-front dev

a88b1137dc Merge branch 'dev' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into dev

01ffe3adb7 Se termina desarrollo de las tarjetas gestion documental e impagado

fd3eea70de Se corrigen comentarios de PR

f2a877557f Merge branch 'dev' into features/ms_164_file_management_card

5127369e5c Merge pull request 'Se termina desarrollo de las tarjetas gestion documental e impagado' (#88) from features/ms_164_file_management_card into dev ...

Reviewed-on: hyervoni/salix-front-mindshore#88

fcdcfd9e97 Modulo customer completo

7f1c4690e8 Correccion de comentarios

11eb597fa3 Correccion de comentarios2

3cf3687b84 Correccion de comentarios3

6bf9b7c0c8 Se deshacen cambios que se hicieron el el commit 11eb597fa3

c0a9835e80 Solucion a comentarios 5

d0e98010a5 Solucion a comentarios 6

da5186f184 Show sample preview as v-html

617200331d remove unnecesary code

08e072100b Solucion a comentarios 7

ab20ec1738 Solucion a comentarios 8

5e2c668fec Solucion a comentarios 9

17a0afda73 Solucion a comentarios 10

ebd1ee07f4 Solucion a comentarios 11

d0cf13d0af Solucion a comentarios 12

bb10714824 Solucion a comentarios 13

86199d8197 Solucion a comentarios 14

f1f0f9fffb Customer contacts view

e48b094280 Merge pull request 'Customer contacts view' (#90) from bugfix/CustomerContacts into PR-CUSTOMER ...

Reviewed-on: hyervoni/salix-front-mindshore#90

a0e5549311 Solucion a comentarios 15

01d68734b6 Correccion de conflictos

7c8b0a345e Fix CustomerSummaryTableActions import

a0d75e5b02 Remove unnecesary validate un CustomerNotificationsFilter

d06271b91d Solucion a comentarios 16

1e7c8e03df refs #6907 feat: fix_input_clearable_hover

f075041da3 refs #6907 fix: revert autofocus property

627fa12748 Merge branch 'dev' into 6907_fix_input_clearable_hover

6227795100 Merge branch 'dev' into 6907_fix_input_clearable_hover

b67a359068 Merge branch 'dev' into 6907_fix_input_clearable_hover

c9cdb721d6 Merge branch 'dev' into 6907_fix_input_clearable_hover

3bcd4984f5 Solucion a comentarios 17

980904a382 Solucion a comentarios 18

d9a1d62c74 Solucion a comentarios

1b67b7ab36 Customer description corrections and creation of tickets create view

f69b25716d Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER

9ae0874ccf Solucion a comentarios

2c70a73b8e Solucion a comentarios 19

90ee50eab5 Solucion a comentarios 20

b12968f982 Solucion a comentarios 21

926f3b6950 refs #6907 feat: add mouseEvent VnInputDate

9e9ad577f4 refs #6907 feat: add mask and today button

f596620cfc refs #6907 feat: add click event inside input

1f46f534ec refs #6907 test: update VnSearchBar spec

a7b87473b0 Merge branch 'dev' into 6907_fix_input_clearable_hover

7b5f4230df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover

5916cb29d4 refs #6722 test: improve

453a27ac70 Merge branch '6907_fix_input_clearable_hover' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover

efb676e4a4 Solucion a comentarios 22

7eca27b8af Solucion a comentarios 23

0e4936bd0f Merge branch 'dev' into 6907_fix_input_clearable_hover

88cf5160f8 refs #6907 test: update ClaimDevelopment spec

c767bcde7d Add scroll on LeftMenu item expansion

0a33b8d92a Solucion a comentarios 24

e56aa6587f Solucion a comentarios 25

93015d9f98 Solucion a comentarios 26

a0f9c811ff resolve conflicts

49cd90d9ff resolve customer extended list conflicts

663010a0d4 Solucion a comentarios 27

f8b698e4e7 Solucion a comentarios 28

09a2af4124 Solucion a comentarios 29

d74119f433 Solucion a comentarios 30

764ccbd151 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover

dc3b91032c Solucion a comentarios 31

c844d26ccb Solucion a comentarios 32

5ff90d127b Solucion a comentarios 33

38d3d49ecb Solucion a comentarios 34

09582ab6a8 WIP

0aa5a051fb Solucion a comentarios 35

0ba7ea86ed Handle customer balance id null on route change exception

91bd396eab Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER

1e9b3f8f0e Solucion a comentarios 36

41e1bad44d Handle more watchs route changes bugs

0f85bd25a2 Merge branch 'PR-CUSTOMER' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-CUSTOMER

fe737324ea Fix unpaid bug

4925bed845 resolve conflicts

a3097a9223 Merge branch 'dev' into PR-CUSTOMER

4a2a855f58 Correcciones generales customers 37

da23ff7ca2 Correcciones generales

f25e46cf08 Merge branch 'dev' into PR-CUSTOMER

e0e5082e1e refs #6321 perf: replace QIcon with clearable prop

9ecb0643b6 Merge branch 'dev' into 6907_fix_input_clearable_hover

643e068863 remove tabs in docker-compose.yml

2f27b8537c refactor: #6946 add table and floating button

85a78d847b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover

4ffabaa4f2 Merge branch '6907_fix_input_clearable_hover' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover

f5d6c45339 refs #6907 updates

63c6b523fb refactor: refs #6425 new translation proposal

7658573ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal

18d4be0ea2 refs #6907 feat: merge changes

fedec76b62 refs #6907 feat: merge changes

aa8e052633 QCalendar implementation test

36a6554fb1 Merge branch 'dev' into 6907_fix_input_clearable_hover

3d1e34a5b0 Create worker date label

6df1d0cf99 feat: #7130 added "served" field to RouteList table and added to the filter too.

0dee7e8cc9 Create worker calendar submodule

37d869d1d5 refactor: refs #7130 requested changes

998561badd Change customer unpaid initial date

d8dc969614 Fix date utils

c856adc8d0 Replace customer samples dateTime formatting with new utils

e1f8b7217a Replace Customer Notes dateTime formatting with new utils

f6b8a73ae2 Improve Customer Notes classes definition

fb59ac1f2f Remove single quotes and colon

093c367d7e Replace Customer Mandates dateTime formatting with new utils

73ea49df63 Replace Customer Greuges dateTime formatting with new utils

3cb045936b Replace Customer File management dateTime formatting with new utils

bafb938e23 VnSmsDialog add default value to template prop as empty string

1316fe3896 Merge branch 'dev' into 7130-addFieldInRoutes

3e124581c4 Remove route import in CustomerCard

6028fd0c4d empty commit test

107eaea704 Remove unused variable in CustomerSummaryTableActions

47a588fff4 Update WorkerCalendarItem

33c54042df refactor: refs #6425 translation files in .yml format and minor changes

94644de4fa VnSmsDialog adapt style and add tooltip

146d3e87db Change calendar extension

fc87bb8293 Add page title name

fb795f65ee refactor: refs #6425 test changes

cb31c2baa2 refs: #6425 merge conflicts

9a160d9248 refactor: refs #6425 merged changes

bfee37b631 WIP

3e423867e3 fix: refs #6425 fix yml format

64b1083619 Add today date

94b177c9a2 fix: refs #6425 fix yml format

4ee8c45fdc resolve conflicts

60b146196f add calendar short-weekday-label

0f6c6cde91 Improve visually WorkerDateLabel

0ad722381e #6425 fix quotes in yml file

503efb79c9 WIP

fd5ea8f6f5 WIP

78dc3c1c9a Move data fetching to main component

82f259be32 Add focus to amount input in customer unpaid

1cff622898 Fix customer balance calculation

cb55115cd2 Remove unused component

5ae54d557b Fix form model beforeRouteLeave

87f376464b Wait to render teleport until subtoolbar is shown

ec2604b9ab Fix customer samples create preview

dae08c322d visual adjustments

4b6038d1d2 Last changes

f12ec3c0c9 Add redirection to summary and open summary action

4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList

64ff5e4446 Add pagination and table actions

cd3024c0a1 feat: refs #6679 add icon

e51ea9996b Item list view

97ad1c7579 refs #7179 changes customer proxy and client Id

0144aab7a5 Mini fix

b05c28f571 Add chaining to holiday detail and holiday type

e4166c85fa Move add absences text to a i18n variable

196679b9e9 Change v-if variable

0941d74d52 Move default value assignment

fb4f35a378 Rename WorkerDateLabel and change colors

881c6e2f7f Improve translations

d8ef199b14 refs #7179 remove code

9c3407846b Fix translation

3e5a5dfe1c remove import

dfcf6e35d5 Change WorkerEventLabels separations

9ea0a62046 Add border and change background color

c573019038 Sizes and spacings

faa8d05313 Change saturday and sunday days color

9bffc9bb25 classes and size improvements

c3835dfd7a resolve conflicts

fc4a69b2c6 resolve conflicts in worker routes

70c9f1dea4 refs #7179 changes pr

c640ba1298 fix set

eb91c0b1c2 Merge branch 'dev' into 6425-translationProposal

6a203f593f Merge branch '6425-translationProposal' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal

933e6b88b1 feat: refs #6679 add icon

a350de9119 Merge branch 'dev' into 6679-addCreateIcon

e4a8c45053 Change workweeks colod and capitalize

eceb60f6e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList

c881fe6577 Resolve conflicts

478ebfd0ea Merge branch 'dev' into 6679-addCreateIcon

99c576b16e Add actions again

9dfe5f5e68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList

7f2d8ee1e5 feat: refs #6679 add icon

f59ecbf94e Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon

de18b56cb2 feat: refs #6679 add icon

9be132b8a0 Merge pull request 'feature/ItemsList' (!280) from hyervoni/salix-front-mindshore:feature/ItemsList into dev ...

Reviewed-on: #280
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

3f8d97e2a3 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

cc633acfd9 deploy: refs #7199 init version 2418

6002800000 Merge branch 'dev' into 7179-changesClaimSummary

a66ece1683 Merge pull request 'refs #7179 changes customer proxy and client Id' (!279) from 7179-changesClaimSummary into dev ...

Reviewed-on: #279
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

c032c83e7f Item create view

73703dc778 Add translations

f83de74f01 refs #6425 fix conflicts

c12fd77218 Remove businessFk from FetchData

3d9d444bb4 remove filter field

f2dc50d229 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into WorkerCalendar

a27bdc37d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6946-refactorEntryNotes

372863e693 Merge pull request '#6946 add table and floating button' (!248) from 6946-refactorEntryNotes into dev ...

Reviewed-on: #248
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

5cd32ec2fe Merge branch 'dev' into 6425-translationProposal

32382622e4 Merge pull request 'refactor: refs #6425 new translation proposal' (!250) from 6425-translationProposal into dev ...

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

b4d92d4f97 Fix Options item labels

d38c85a0ef resolve conflicts

beaffbf685 delete old i18n files and adapt branch to the new ones

4efe09722f refs #6336 feat(claim): improvements

f176312163 feat(VnNotes): refs #6336 better design

68069ba9c6 feat: refs #6938 hide personal phone

e1716b9ea4 Merge branch 'dev' into 6907_fix_input_clearable_hover

058ddc8e9a feat: refs #6500

1e77e82784 fix: refs #6938 id filter

b2211369ea fix: refs #6938 remove personal phone

c50741b4bf Remove single quotes

d9d868a6af Waste breakdown

de68af5e13 feat: refs #6724 Disabled QCheckbox entry isBooked

46fa06cf1e feat: refs #6724 Restriction QCheckbox entry isBooked

d70da976c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon

d178d7dc6a feat: refs #6679 add icon

c2048afb53 Merge pull request '#6938 hide personal phone' (!290) from 6938-hideWorkerPhone into dev ...

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

130869dcdb Merge branch 'dev' into 6679-addCreateIcon

87ae6870a9 feat: refs #6679 add icon

81f29d815d Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon

5feb4a21a5 Merge pull request 'feat: refs #6679 add icon' (!276) from 6679-addCreateIcon into dev ...

Reviewed-on: #276
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

73c5a5b7d2 fix: refs #6425 fixed dev translations

7b29832966 feat: refs #6968 Changed groupingMode to enum

b216112d2a refactor: refs #6425 fix failed tests

adb31497e5 Merge branch 'dev' into 6907_fix_input_clearable_hover

2ab7a45114 resolve conflicts

5d6a10050e Merge pull request 'WorkerCalendar' (!270) from hyervoni/salix-front-mindshore:WorkerCalendar into dev ...

Reviewed-on: #270
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

4f286cd032 Merge branch 'dev' into 6425-fixDevTranslations

892c5986c0 Merge pull request 'fix: refs #6425 fixed dev translations' (!294) from 6425-fixDevTranslations into dev ...

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

a397c6ed30 remove component import

248416b676 fix(lilium) #7180 SupplierList Scroll

b4462fcdb5 Merge branch 'dev' into 6968-groupingModeRefactor

dca954850b Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!295) from 6968-groupingModeRefactor into dev ...

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

b95d44c05d feat(lilium): refs #6930 Undo rollback lilium

37ad84f239 perf(lilium): refs #6930 Improve setToken fn

c4c317ef41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3

52a0be449d feat: refs #6336 redesign

55dd401064 Merge pull request '#6930 - Revert/Undo rollback' (!299) from 6930_undo_rollback into dev ...

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

1dfaef2ffa Resolve conflicts

5d7cee38bd feat(lilium): refs #6930 Undo rollback salix-back

95cd795e7b Merge pull request 'feat(lilium): refs #6930 Undo rollback salix-back' (!301) from 6930_undo_rollback into dev ...

Reviewed-on: #301
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>

f5d8e94a24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemCreate

13214582ac Merge pull request 'Item create view' (!285) from hyervoni/salix-front-mindshore:feature/ItemCreate into dev ...

Reviewed-on: #285
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

5551189f2f resolve conflicts

79a90c1163 fix: refs #7130 fix conflicts

873d528e0d Merge pull request 'Waste breakdown' (!291) from hyervoni/salix-front-mindshore:feature/WasteBreakdown into dev ...

Reviewed-on: #291
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

ebd02987b9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

817a8fcc71 Merge branch 'dev' into 7180_bug_supplierListScroll

5382f306e2 Merge branch 'dev' into 6907_fix_input_clearable_hover

062d743896 refactor: refs #7139 replace warehouse with ticket

19e5694e09 Merge pull request '#6907 - input_clearable_hover' (!198) from 6907_fix_input_clearable_hover into dev ...

Reviewed-on: #198
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

e804af3512 Merge branch 'dev' into 7130-addFieldInRoutes

43976e8ced fix minor bug to show

bb97acc261 Merge pull request '#7130 - addFieldInRoutes' (!259) from 7130-addFieldInRoutes into dev ...

Reviewed-on: #259
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

846c85ed1a Actualizar src/components/ui/VnPaginate.vue

7f63ea4e1c Actualizar src/composables/useArrayData.js

c60558420f fix: refs #6425 fixed vitest config to avoid testing problems

3233210300 Merge pull request 'fix: refs #6425 fixed vitest config to avoid testing problems' (!306) from 6425-changedVitestConfig into dev ...

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

1f0394b5fc refactor: refs #7139 fixed error in translation

f3b893de67 Merge branch 'dev' into 7139-changeColumnsInRouteSummary

7eb9666c7c Merge branch 'dev' into 6724-disableEntryBooked

82937a103d Merge branch 'dev' into 7180_bug_supplierListScroll

6ab7b4b68d Merge pull request '#7180 - Error Supplier List Scroll NOT working' (!298) from 7180_bug_supplierListScroll into dev ...

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

9b5e8024be Merge branch 'dev' into 6724-disableEntryBooked

a8ac00f7e4 Merge pull request 'feat: refs #6724 Disabled QCheckbox entry isBooked' (!292) from 6724-disableEntryBooked into dev ...

Reviewed-on: #292
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>

8fadccce92 Merge branch 'dev' into 7139-changeColumnsInRouteSummary

a605c90a55 Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!305) from 7139-changeColumnsInRouteSummary into dev ...

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

6db5c56f5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3

dc4de8de7f Merge pull request 'refs #6336 feat(claim): improvements' (!288) from 6336-claim_changes_v3 into dev ...

Reviewed-on: #288
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

c638209f0e fix: hasMoreData

ae2737673d fix: hasMoreData

3a03e42cf9 Resolve conflicts

4f5c8ef0f6 fix: tests

ea4f72abf9 Merge pull request 'PR-CUSTOMER' (!186) from hyervoni/salix-front-mindshore:PR-CUSTOMER into dev ...

Reviewed-on: #186
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

edd1b66110 fix: merge toDateHourMin

c1f64b88b4 Merge pull request 'FIX Merge PR-CUSTOMER' (!309) from fix_Customer_merge into dev ...

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

3eb5041bf5 fix: refs #6590 remove unnecessary import

99af402281 fix(VnNotes): refs #6336 fix v-for key

9a3f714290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData

918ce0dc86 fix(VnNotes): refs #6336 remove index in key

4a5285358c fix(VnNotes): refs #6336 restore index in key

80844e7869 fix: hasMoreData

1f391dc49b fix: skip

64fc02e33b Fix supplier consumption disabled buttons

7dac6ba910 Remove unused imports

9d381a5c82 Merge pull request 'fix(VnNotes): refs #6336 fix v-for key' (!310) from 6336_fix_vn_notes_key into dev ...

Reviewed-on: #310
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

c9767e7b1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into bugfix/SupplierConsumptionDateRanges

036dcaadd2 Merge pull request 'bugfix/SupplierConsumptionDateRanges' (!312) from hyervoni/salix-front-mindshore:bugfix/SupplierConsumptionDateRanges into dev ...

Reviewed-on: #312
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

72deeab2ef Merge branch 'dev' into warmFix_hasMoreData

952d5bf543 fix(VnNotes): refs #6336 VnAvatar

13a46be85b fix: tests

3abc504158 fix: unit test

20ec141237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

498b8b3315 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into warmFix_hasMoreData

d710d736ca tests cypress

5f05ab93df Merge pull request 'warmFix_hasMoreData' (!308) from warmFix_hasMoreData into dev ...

Reviewed-on: #308
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>

450d4a0dc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fixCypressE2E

9cb662b6f5 Merge branch 'dev' into 6336_fix_vn_notes_VnAvatar

efbaa63e29 Merge pull request 'fix(VnNotes): refs #6336 VnAvatar' (!313) from 6336_fix_vn_notes_VnAvatar into dev ...

Reviewed-on: #313
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>

23ae47b5a5 fix e2e and skip claim photo

f85c44e1e2 Merge branch 'dev' into fixCypressE2E

833f5e48a8 Merge pull request 'tests cypress' (!314) from fixCypressE2E into dev ...

Reviewed-on: #314
Reviewed-by: Pablo Natek <pablone@verdnatura.es>

b265f9f705 Merge pull request '7253-devToTest_2418' (!315) from 7253-devToTest_2418 into test ...

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

ccc6885172 Fix: minor bugs, layout & vnlocation

6e5ac0eeb9 fix: CustomerAdress layout

22356966e1 Merge pull request 'Customer Fix: minor bugs, layout & vnlocation' (!325) from 6590_fix_CustomerAdressEdit into test ...

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

5378ed6f2e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

6a03038c3a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test

alexm added the

CR / Tests passed

label 2024-05-06 12:52:54 +00:00

alexm requested review from guillermo 2024-05-07 05:26:12 +00:00

guillermo approved these changes 2024-05-07 05:27:26 +00:00

alexm merged commit 5341f555ef into master 2024-05-07 05:36:02 +00:00

alexm deleted branch 7299_testToMaster 2024-05-07 05:36:03 +00:00

alexm referenced this issue from a commit 2024-05-07 05:36:05 +00:00

Merge pull request '7299_testToMaster' (!351) from 7299_testToMaster into master

Sign in to join this conversation.

Reviewers

No reviewers

guillermo

Labels

Clear labels   

bug

Something is not working

  

CR / Tests passed

CR / Tests passed

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

invalid

Something is wrong

  

Missing Tests

Missing Tests

  

wontfix

This won't be fixed

No Label

bug

CR / Tests passed

duplicate

enhancement

invalid

Missing Tests

wontfix

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-front#351

No description provided.