wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
3,461 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

419 Commits

Author SHA1 Message Date
William Buezas 8e1f7c24a4 submodules WIP 2024-06-02 13:26:46 -03:00
William Buezas 4292804922 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountList 2024-05-28 11:30:10 -03:00
William Buezas fcaca42b1f resolve conflicts 2024-05-27 12:35:59 -03:00
Javier Segarra 286fe0d20c Merge branch 'dev' into feature/UpcomingDeliveries 2024-05-24 08:13:37 +02:00
Javier Segarra 889263bfb8 feat: roleCreate as dialog 2024-05-23 13:47:14 +02:00
Javier Segarra 433564507e Merge branch 'dev' into 7311_boilerplate_users 2024-05-23 08:53:10 +02:00
Javier Segarra 06664cc2d0 feat: newRole 2024-05-23 08:52:57 +02:00
Javier Segarra dc14116717 perf: RoleCard, BasicData, summary 2024-05-21 08:52:34 +02:00
Javier Segarra 2cae2168ac perf: AccountCard, BasicData, summary 2024-05-21 08:52:19 +02:00
William Buezas 7466d03f15 resolve conflicts 2024-05-20 08:46:08 -03:00
Javier Segarra c40f322a8f Merge branch 'dev' into feature/ZoneWarehouses 2024-05-20 08:40:27 +02:00
William Buezas 202473158c resolve conflicts 2024-05-19 14:21:32 -03:00
Javier Segarra aa007117a7 Merge branch 'dev' into 7311_boilerplate_users 2024-05-18 10:16:28 +02:00
William Buezas e196cf8fd5 Zone warehouses 2024-05-17 10:57:20 -03:00
Javier Segarra 49b562ca44 Merge branch 'dev' into feature/UpcomingDeliveries 2024-05-17 12:30:55 +02:00
Javier Segarra 01ad6d9bea Merge branch 'dev' into feature/ZoneDelivery 2024-05-17 09:52:21 +02:00
William Buezas a35ccb5b51 Zone Locations 2024-05-16 16:38:27 -03:00
Jorge Penadés 31573c0f0b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7274-fixCustomer 2024-05-15 11:22:23 +02:00
Alex Moreno 2b27e39d72 fix: zone icon and isVolumetric default false 2024-05-15 09:37:33 +02:00
William Buezas cbe44c97f6 Upcoming deliveries 2024-05-14 12:03:43 -03:00
Jorge Penadés a6c761c031 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1 2024-05-14 13:42:38 +02:00
Javier Segarra fc6bd82ea0 Merge branch 'dev' into feature/ZoneCreate 2024-05-14 11:52:29 +02:00
Javier Segarra 20f9b53afb Merge branch 'dev' into 7271-EndZoneMigration 2024-05-14 10:42:43 +02:00
Javier Segarra 32e715ce6b Merge branch 'dev' into feature/Monitors 2024-05-13 17:59:39 +02:00
William Buezas 8e7b043a46 Resolve conflicts 2024-05-13 10:28:21 -03:00
William Buezas 9304b511bc Zone delivery 2024-05-13 10:14:36 -03:00
Javier Segarra 1181cd0daa Merge branch 'dev' into 7271-EndZoneMigration 2024-05-13 12:15:50 +00:00
Jorge Penadés 0b83d3663f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker 2024-05-13 13:20:15 +02:00
Jon Elias 14910c5899 feat: refs #7271 basicData and Log 2024-05-13 12:46:25 +02:00
Javier Segarra f9e77596e4 feat: roles sections 2024-05-10 22:01:57 +02:00
Javier Segarra 555b5a663c feat: role router 2024-05-10 18:06:40 +02:00
Javier Segarra c045b0d1f4 feat accountRoutes 2024-05-10 17:47:34 +02:00
Javier Segarra f6d3e37787 feat: accountRoles 2024-05-10 08:02:12 +02:00
William Buezas d227d4b09b Zone create 2024-05-09 11:32:04 -03:00
William Buezas 9b9e482fa7 Zone list and Zone summary 2024-05-09 08:21:30 -03:00
Javier Segarra c68ad5be34 feat #7311: minor changes 2024-05-09 08:40:00 +02:00
Javier Segarra 034342beb2 Merge branch 'dev' into 7311_boilerplate_users 2024-05-09 08:29:18 +02:00
Javier Segarra 99ef7fad76 feat #7311: subsections 2024-05-09 08:28:58 +02:00
Javier Segarra 01bedb94d0 feat #7311: enable leftmenu option 2024-05-09 07:54:16 +02:00
William Buezas a3ce81d66d Zone list 2024-05-08 15:23:52 -03:00
William Buezas 712d7e13ff Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/Monitors 2024-05-08 10:45:05 -03:00
William Buezas 5bdbbf426a Tables development 2024-05-08 10:43:18 -03:00
Jorge Penadés a1f785ccbe feat: refs #5919 WIP workerlocker 2024-05-08 11:02:40 +02:00
Alex Moreno d69b362407 Merge branch 'dev' into feature/ItemTags 2024-05-08 08:02:55 +00:00
Alex Moreno a139c11a22 Merge branch 'test' into fix_Customer_1 2024-05-07 07:05:25 +00:00
William Buezas dbc9e9dd71 Sales monitor base 2024-05-05 19:13:36 -03:00
William Buezas 99adc9aa05 WIP 2024-05-03 08:53:50 -03:00
William Buezas d2e178a41b resolve conflicts 2024-05-02 12:02:44 -03:00
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:44:02 +00:00
Javier Segarra 03759d2746 Merge branch 'dev' into feature/ItemLastEntries 2024-05-02 14:34:54 +02:00