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

373 Commits

Author SHA1 Message Date
Alex Moreno d69b362407 Merge branch 'dev' into feature/ItemTags 2024-05-08 08:02:55 +00: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
Javier Segarra 1675919801 fix: minor build bugs 2024-05-02 14:33:24 +02:00
Jon Elias c1a464d9ae fix: refs #6887 fix conflicts 2024-05-02 13:02:59 +02:00
Javier Segarra 494f0be44a Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:13:41 +00:00
Javier Segarra 94fc856bea Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:05:17 +00:00
Javier Segarra b530101cda Merge branch 'dev' into 7190_renewTokenMultimedia 2024-05-02 07:44:20 +00:00
Javier Segarra 4ef7b0e17c fix: item routes order 2024-05-01 13:31:32 +02:00
Javier Segarra d2531efdd6 fix: Botanical icon 2024-05-01 13:27:40 +02:00
William Buezas ac219bfbb7 Item shelvings 2024-04-30 16:15:48 -03:00
Jon Elias d5762f65b3 refactor: refs #6887 fixed errors 2024-04-30 10:34:48 +02:00
Jon Elias 5b15558dbf refactor: refs #6887 fixed errors 2024-04-30 10:32:32 +02:00
William Buezas ac9063e166 Item Last entries 2024-04-29 17:01:26 -03:00
Javier Segarra 761bc7724f fix: redirect 2024-04-29 11:46:40 +02:00
Javier Segarra 19fcacebc9 perf: VnSearchbar 2024-04-29 10:12:19 +02:00
William Buezas 322ad816b9 item diary 2024-04-28 19:37:44 -03:00
Javier Segarra 2deeada1f5 Merge remote-tracking branch 'origin/dev' into fix_Customer_1 2024-04-26 12:50:46 +02:00
Javier Segarra 33f3024246 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-26 07:47:24 +00:00
Javier Segarra 98846bbd1a Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 09:28:40 +02:00
Pablo Natek cb22eaee4d Merge branch 'dev' into 4988-agencySection 2024-04-26 06:58:53 +00:00
Javier Segarra 22d9d369c8 Merge remote-tracking branch 'origin/dev' into feature/ItemBotanical 2024-04-26 08:52:05 +02:00
Javier Segarra aa87d54f57 Merge remote-tracking branch 'origin/dev' into feature/ItemLog 2024-04-26 08:34:05 +02:00
Pablo Natek f29f7a55a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-25 16:28:30 +02:00
William Buezas 823351f76d Item botanical 2024-04-25 10:55:48 -03:00
Pablo Natek e184f70be5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-25 09:59:17 +02:00
William Buezas 726699bbc5 Item log 2024-04-24 10:38:00 -03:00
William Buezas 934db32973 WIP 2024-04-24 10:31:33 -03:00
Javier Segarra dcb06918dd Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily 2024-04-24 14:35:20 +02:00
Javier Segarra e6c9a692f5 feat moduleName 2024-04-24 14:33:10 +02:00
Javier Segarra e65ffb63c9 Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests 2024-04-24 14:26:12 +02:00
Javier Segarra 299838bfa5 Merge branch 'dev' into feature/ItemsSummary 2024-04-24 14:23:49 +02:00
Javier Segarra 1c3660050b Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-24 12:15:34 +02:00
Javier Segarra de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices 2024-04-24 09:33:34 +02:00
Javier Segarra bf08ca7655 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-24 06:25:14 +00:00
Javier Segarra 861e4385bb Merge branch 'dev' into feature/ItemsSummary 2024-04-24 07:34:49 +02:00
Javier Segarra 5dc41f8236 Merge branch 'dev' into feature/ItemFamily 2024-04-24 07:01:46 +02:00
William Buezas 42fe189e9f Add module name in Item router file 2024-04-23 16:45:28 -03:00
Javier Segarra 9a78b8ac3b Merge branch 'dev' into feature/ItemRequests 2024-04-23 13:55:43 +02:00
Javier Segarra bfb7dfb472 Merge branch 'dev' into feature/WorkerTimeControl 2024-04-23 13:31:41 +02:00
William Buezas 78561c5f42 Item types 2024-04-22 08:34:38 -03:00
Pablo Natek 43aadd4fc6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4988-agencySection 2024-04-22 12:22:04 +02:00
Pablo Natek 6b4cb4ed12 feat: refs #4988 add agency section 2024-04-22 12:19:22 +02:00
Javier Segarra 5a588ead87 Merge remote-tracking branch 'origin/dev' into 7190_renewTokenMultimedia 2024-04-22 07:38:07 +02:00
Javier Segarra 2b24e18f75 FEAT: SETiNTERVAL WITH RENEWpERIOD 2024-04-22 07:37:35 +02:00
William Buezas 9212e53905 resolve conflicts 2024-04-19 12:48:07 -03:00
William Buezas 3a03e42cf9 Resolve conflicts 2024-04-19 10:40:04 -03:00
William Buezas 5f01e5c705 change es translations 2024-04-18 09:09:22 -03:00