7863-devToTest_2434 #613

Merged

alexm merged 131 commits from 7863-devToTest_2434 into test 2024-08-13 06:58:13 +00:00

Conversation 0 Commits 131 Files Changed 127 +8344 -11278

alexm commented 2024-08-13 06:39:14 +00:00

Member

Copy Link

No description provided.

alexm added 131 commits 2024-08-13 06:39:15 +00:00

64c21aa5d9 refs #7355 fix vnTable

ae01aa614b refs #7355 mail alias acls

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

9caacf3f86 refs #7355 accountAcl

592829c7a3 fix #7355 fix acls list

2e3970c0cc refs #7355 fix accountAlias

e1a25e3cf4 refs #7355 fix create Rol

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

a43a6aec82 refs #7355 fix Rol, alias

31056ea5c9 refs #7355 fix lists redirects summary

06f88c8cb3 refs #7355 fix alias summary

29405a8771 refs #7355 remove spaces

fc3fc27461 refs #7355 fix list

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

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

369e730670 refs #7355 fix search exprBuilder

8b2b618d35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration

2f617f4b92 passwordAccount

026c632a4c feat(customer): improve basicData to balance

21dd2e4b46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection

28e50512ba remove console.log

839af6d50c fix: refs #6989 show entity name & default time from config table

b16f00b2e9 build: init version 2434

1fe2ba7f09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6989-showClientName

c306969f6a Merge pull request 'fix: refs #6989 show entity name & default time from config table' (!576) from 6989-showClientName into dev ...

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

ecb201edce delete unnesessary class

ed110beda6 Merge branch 'dev' into 6943-customer_migration_subsection

c10e05396d Merge pull request '#6943 - customer_migration_subsection' (!570) from 6943-customer_migration_subsection into dev ...

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

5b214b58ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration

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

e41078b973 refs #7355 traduccions

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

2d467016b2 refs #7355 fix roles

68e4831ea5 refs #7355 fix conflicts

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

8d8bd095f6 Merge branch 'dev' into 7355-accountMigration

f618ed1132 Merge pull request 'refs #7355 fix vnTable' (!506) from 7355-accountMigration into dev ...

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

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

0d016e0898 Merge branch 'test' into dev

bc4ee5c8a5 fix: refs #7283 basicData locale

27e7d30158 fix: refs #7283 basicData locale

6f771c7ae6 fix: refs #7283 basicData locale

460b166a17 feat(customer_balance): refs #6943 add functionality from salix

30961c796d feat(customer_balance): refs #6943 translations

c83b3d54ae typo

cb95f0637f Merge pull request 'feat(customer_balance): refs #6943 add functionality from salix' (!589) from 6943-cusotmer-balance into dev ...

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

59b709b57d Merge branch 'test' into dev

810e579ea9 refactor(customer_recovery): to vnTable

16cfd84fab fix: refs #7283 itemTags & VnImg

7612260359 refactor(customer_webAccess): FormModel

98a16b9453 refactor(customer_log: use VnLog

88ea25cb83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-customer_migration_subsection-v2

5bac9143e6 fix(customer_sms: fix reload

5bd0bbb3ac fix: refs #7283 userPanel pic

b8d38f15e4 fix: refs #7283 use vnAvatar & add optional zoom

005f571ecf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration

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

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

50468d22cc fix: refs #7283 min-width vnImg

90073a0a68 fix: refs #7283 locale

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

1411833a4c chore: refs #7283 fix e2e logout

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

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

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

9e0fba49ea fix: accountMailAlias

dafa8cdebd Merge branch 'dev' into 6943-customer_migration_subsection-v2

f4a9577cc0 Merge pull request '6943-customer_migration_subsection-v2' (!591) from 6943-customer_migration_subsection-v2 into dev ...

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

08ed134b12 fix: refs #7323 wrong css

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

017d5382bb fix: refs #7323 data-key & add select

98656aa2c8 fix: refs #7323 add department popup

06eac739cd chore: refs #7323 fix test

4ee6c7436f fix: refs #7323 righ menu bug

855483cefd fix: refs #7323 css righ menu

baf0981233 chore: refs #7323drop commented code

44e3eb779d feat(VnCard): use props searchbar

2f7dd0a4cb remove unecessary props

12bd66b9ca typo

afe178216c invoiceOut

50f7b11c65 Merge pull request '#7323 fix worker errors' (!599) from 7323-fixErrors into dev ...

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

88dffbce8a Merge branch 'dev' into 7283-itemSectionsMigration

3a77be0043 change searchbar to searchbarProps

ac1434fb9c Merge branch 'dev' into vnCard-unify-searchbarParams

bc62dc9a89 Merge pull request 'feat(VnCard): use props searchbar' (!600) from vnCard-unify-searchbarParams into dev ...

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

0fa0ddec7e Merge branch 'dev' into 7283-itemSectionsMigration

dc5142c20a feat: refs #6900 use VnTable & sort filter fields

0782b3ff5f chore: #6900 order params

ea8aca29a6 fix(twoFactor): unify code login and twoFactor

2f3ad52d48 duplicate notify

adc3b0307e Merge pull request 'fix(twoFactor): unify code login and twoFactor' (!603) from 7854-fix_twoFator into dev ...

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

80f63f1ae2 fix: VnCard VnSearchbar props

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

f669002421 feat: refs #6130 husky hooks

4cb543f20e feat: refs #6130 husky commitLint config

1f7a9889a9 Merge pull request '6130-addHuskyHooks' (!604) from 6130-addHuskyHooks into dev ...

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

2afe9b445e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-fineTunning

6a347d60ff fix: refs #6130 add commit lint modules

fee432cb12 fix: refs #6130 pnpm-lock.yml

49e9b23ccb Merge pull request '6130-add-conventional-commits' (!606) from 6130-add-conventional-commits into dev ...

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

d593866c7a feat: refs #6900 dev

1a4cf51246 fix: refs #6900 vat & dueday

344ca7d243 fix: refs #6900 vat, dueday & intrastat

12bb88f7f8 chore: refs #6900 drop vnCurrency

4dc12cf119 chore: refs #6900 responsive code

88b6d7c9ae fix: refs #6900 rectificative btn reactivity

81ed679a2b chore: refs #6900 mv rectificative logic

3f6b20270d chore: refs #6900 drop console log

2dd8376bcd typo

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

a9e8621903 chore: refs #6900 fix e2e tests

43ca7e1667 fix(VnFilterPanel): emit userParams better

bd05460b90 console.log

3680321ae8 fix: refs #6900 use type number

7a2170e7c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration

ee5a592e6f Merge branch '7283-itemSectionsMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration

02cfa54a40 unify watchers

f4f1bb7792 Merge pull request '#6900 fine tunning invoice in' (!601) from 6900-fineTunning into dev ...

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

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

08972d62b0 Merge branch 'dev' into warmFix_vnFilterPanel_setUserParams

42a490cf18 Merge pull request 'fix(VnFilterPanel): emit userParams better' (!607) from warmFix_vnFilterPanel_setUserParams into dev ...

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

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

f17ca4fe30 fix: refs #7283 itemLastEntries filter

6b80c52b71 chore: refs #7283 drop import

f5ffe2a07b refactor: refs #7283 update avatar size and color

239e796d2e chore: refs #7283 update VnAvatar title handling

9708214462 chore: refs #7283 drop array types

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

2cf669b479 Merge branch 'dev' into 7283-itemSectionsMigration

59262019f8 Merge pull request '#7283 finish item card sections' (!588) from 7283-itemSectionsMigration into dev ...

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

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

guillermo approved these changes 2024-08-13 06:48:32 +00:00

alexm merged commit ecfe933039 into test 2024-08-13 06:58:13 +00:00

alexm deleted branch 7863-devToTest_2434 2024-08-13 06:58:13 +00:00

alexm referenced this issue from a commit 2024-08-13 06:58:16 +00:00

Merge pull request '7863-devToTest_2434' (!613) from 7863-devToTest_2434 into test

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

No description provided.