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

3029 Commits

Author SHA1 Message Date
Javier Casado bdfcba5c3e Merge branch 'dev' into 6911-saveOnEnter 2024-05-03 05:22:00 +00:00
Javier Segarra e3a36c0ab1 Merge pull request 'refactor: refs #6887 pending claim changes' (!335) from 6887-endClaimMigration into dev 
Reviewed-on: verdnatura/salix-front#335
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-02 12:45:12 +00:00
Javier Segarra 9fa03beda1 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:44:02 +00:00
Javier Segarra 9dcce336a8 Merge pull request 'Item last entries' (!342) from hyervoni/salix-front-mindshore:feature/ItemLastEntries into dev 
Reviewed-on: verdnatura/salix-front#342
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 12:43:04 +00:00
Javier Segarra 988be19b96 Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:42:46 +00:00
Javier Segarra d069ca5095 Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration 2024-05-02 14:40:59 +02:00
Javier Segarra 1a79bd6fb8 feat: zoneSummary 2024-05-02 14:40:56 +02: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
Javier Segarra 7e842f2ce1 Merge pull request 'Item tax' (!337) from hyervoni/salix-front-mindshore:feature/ItemTax into dev 
Reviewed-on: verdnatura/salix-front#337
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 12:23:53 +00:00
William Buezas 8043d72676 Merge branch 'feature/ItemLastEntries' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemLastEntries 2024-05-02 09:16:44 -03:00
William Buezas 120e84f439 Add condition to packing and grouping badge colors 2024-05-02 09:16:24 -03:00
Javier Segarra 793376139c Merge branch 'dev' into 6887-endClaimMigration 2024-05-02 12:05:30 +00:00
Javier Segarra f90bd908a5 Merge branch 'dev' into feature/ItemTax 2024-05-02 14:00:01 +02:00
Carlos Satorres 104b159039 Merge pull request 'refs #6895 remove autoload' (!341) from 6895-removeShelving into dev 
Reviewed-on: verdnatura/salix-front#341
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 11:43:48 +00:00
Jon Elias 0fa2a99080 Merge branch '6887-endClaimMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 6887-endClaimMigration 2024-05-02 13:03:04 +02:00
Jon Elias c1a464d9ae fix: refs #6887 fix conflicts 2024-05-02 13:02:59 +02:00
Carlos Satorres 8bb5f77b57 Merge branch 'dev' into 6895-removeShelving 2024-05-02 10:09:41 +00:00
Javier Segarra 6a958a0807 Actualizar src/pages/InvoiceIn/Card/InvoiceInDueDay.vue 2024-05-02 08:32:39 +00:00
Javier Segarra c81e20e22e Merge pull request 'Item diary' (!339) from hyervoni/salix-front-mindshore:feature/ItemDiary into dev 
Reviewed-on: verdnatura/salix-front#339
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 08:29:17 +00:00
Javier Segarra e4f787f2fa Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:28:00 +00:00
Javier Segarra ef63d0cb6a Merge remote-tracking branch 'origin/dev' into feature/ItemTax 2024-05-02 10:25:49 +02:00
Javier Segarra cd5389fb91 fix: i18n 2024-05-02 10:25:46 +02:00
Javier Segarra 29b215ac2e Merge branch 'feature/ItemTax' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemTax 2024-05-02 10:25:27 +02:00
Javier Segarra f46b78131c perf: remove onMounted and reload 2024-05-02 10:24:07 +02:00
Carlos Satorres e685b58adf Merge pull request 'refs #7172 change vnselectfilter' (!274) from 7172-fixClaimBasicData into dev 
Reviewed-on: verdnatura/salix-front#274
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 08:23:21 +00:00
Carlos Satorres 73ade834e9 Merge branch 'dev' into 7172-fixClaimBasicData 2024-05-02 08:21:43 +00:00
Javier Segarra 494f0be44a Merge branch 'dev' into feature/ItemDiary 2024-05-02 08:13:41 +00:00
Javier Segarra 6482f5680d Merge pull request '#7190 - Renew tokenMultimedia' (!278) from 7190_renewTokenMultimedia into dev 
Reviewed-on: verdnatura/salix-front#278
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 08:11:08 +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 43093cfa7d Merge pull request 'Item types' (!319) from hyervoni/salix-front-mindshore:feature/ItemFamily into dev 
Reviewed-on: verdnatura/salix-front#319
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-02 07:39:58 +00:00
Javier Segarra 57736654f1 Merge branch 'dev' into feature/ItemFamily 2024-05-02 07:38:41 +00:00
Javier Casado e44e182fec Merge branch 'dev' into 6911-saveOnEnter 2024-05-02 05:28:23 +00:00
Javier Segarra 4fdf2bacf8 fix: pvp tooltip 2024-05-01 13:52:45 +02: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 72ad524c68 change prop names 2024-04-30 16:23:19 -03:00
William Buezas 0890de3771 change prop name 2024-04-30 16:21:06 -03:00
William Buezas 2e85b9c063 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemLastEntries 2024-04-30 16:19:06 -03:00
Alex Moreno 2c4cd56102 Merge pull request 'fix: refs #6336 fix reload and disable button when is loading' (!340) from 6336-claims_v4_action into dev 
Reviewed-on: verdnatura/salix-front#340
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-04-30 13:01:09 +00:00
Alex Moreno f3387cf120 fix: refs #6336 fix reload and disable button when is loading 2024-04-30 12:39:50 +02:00
Carlos Satorres 38cd54a7f0 refs #6895 remove autoload 2024-04-30 12:10:30 +02:00
Javier Segarra a512f094d6 perf: ZoneDescriptor 2024-04-30 12:06:24 +02:00
Jon Elias 9563a1a6ed Merge branch 'dev' into 6887-endClaimMigration 2024-04-30 08:35:35 +00: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
Carlos Satorres acb4e2d98e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-30 09:44:06 +02:00
Javier Segarra 3cb662d406 Merge branch 'dev' into feature/ItemTax 2024-04-30 07:29:07 +00:00
Javier Casado 38f25eb02d Merge branch 'dev' into 6911-saveOnEnter 2024-04-30 06:15:38 +00:00