232201_dev_to_test #59

Merged

alexm merged 48 commits from dev into test 2023-06-01 07:18:41 +00:00

Conversation 0 Commits 48 Files Changed 23 +3329 -6438

alexm commented 2023-06-01 07:14:48 +00:00

Member

Copy Link

No description provided.

alexm added 48 commits 2023-06-01 07:14:48 +00:00

baaf6b6c74 refs #4797 @6h

7d198a819b add icons

cbeeea8f88 refs #4797 @2,30h

b155547702 refs #4797 @30min disable modifications if user is not the one editing

72d8cb7c04 allow only the user to modify itself

f98c82185f Merge branch '4834-create-worker-module' into 4797-worker-notification-selector

3824ea62c9 changed the boss or user check to the backend

b4d66e8496 refs #4797 @2h

50376a3ec5 change request parameters to match backend

52988f6299 change request to the backend

9e0adce4f1 fix error not being able to unsubscribe instantly

88e8530b43 add isloading

0d2e7b2611 refs #5357 refactor vnLog and vnLogFilter

5833141065 refs #5357 unit test added

27352eaf15 refs #5357 mocked route.params.id

8dfc8d5c73 refs #5357 mocked useRoute function

6fcefc8df1 refs #5357 faking route

a969fb44f8 refs #5357 faking get request

28d844ab3d refs #5357 beforeEach

a79ac18f38 Merge branch 'dev' into 5357-vnLog-component

6c9ca97274 refs #5357 mocking fetch

85bb019fd4 Merge branch '5357-vnLog-component' of https://gitea.verdnatura.es/verdnatura/salix-front into 5357-vnLog-component

9dfcaaf056 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4797-worker-notification-selector

ba9d8b3c21 refs #4797 section code refactored

5702e23c6f refs #4797 e2e test

d4cc8830d8 refs #4797 added unit test

82e805eebf refs #4797 unit test refactored

216114d55b Merge branch 'dev' into 4797-worker-notification-selector

fd456ec559 refs #4797 fix unit test

8a3df43684 Merge branch '4797-worker-notification-selector' of https://gitea.verdnatura.es/verdnatura/salix-front into 4797-worker-notification-selector

f53745f1f7 refs #4797 fixing e2e

1627f9cd36 refs #5655 added useUserConfig

c4f40fbb59 refs #5655 fix unit test

502f550a41 Merge pull request 'test to dev' (!55) from test into dev ...

Reviewed-on: #55
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

e254a1e721 refs #5655 useRole and useUserConfig independents

e2586bd6e1 refs #5655 fix test

4681cc17e4 Merge branch 'dev' into 5655-afinar-login

ecb83f24dc refs #4797 minor fixes

725e8db7d8 Merge branch 'dev' into 4797-worker-notification-selector

a1ca8c822f Merge pull request 'fixes #4797 Seccion Worker/Notification' (!51) from 4797-worker-notification-selector into dev ...

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

a7b524f552 Merge branch 'dev' into 5655-afinar-login

ed7819c2bf Merge pull request 'fixes #5655 Afinar login' (!54) from 5655-afinar-login into dev ...

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

a2cdddb17e Merge branch 'dev' into 5357-vnLog-component

06645d941b Merge pull request 'fixes #5357 Convertir sección de histórico en componente reutilizable vnLog' (!48) from 5357-vnLog-component into dev ...

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

7473a8a04c refs #5668 update package.json

0efbe1df52 Merge pull request 'refs #5668 update package.json' (!57) from 5668-update-node20 into dev ...

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

1205f277fc refs #5752

5cf7bd95ec Merge pull request 'refs #5752' (!58) from 5752-fix-dev into dev ...

Reviewed-on: #58
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>

alexm requested review from alexandre 2023-06-01 07:14:59 +00:00

alexandre approved these changes 2023-06-01 07:15:18 +00:00

alexm merged commit 8f5a3b3876 into test 2023-06-01 07:18:41 +00:00

alexm referenced this issue from a commit 2023-06-01 07:18:41 +00:00

Merge pull request '232201_dev_to_test' (!59) from dev into test

alexm referenced this issue from a commit 2024-01-09 06:47:32 +00:00

Merge pull request 'Order Catalog Filter' (#59) from feature/order-catalog-filter into branch-PR-2

Sign in to join this conversation.

Reviewers

No reviewers

alexandre

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

No description provided.