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

7249 Commits

Author SHA1 Message Date
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
Jorge Penadés 455f47d46f feat: refs #5919 set store.data 2024-05-02 10:23:35 +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
William Buezas ac219bfbb7 Item shelvings 2024-04-30 16:15:48 -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
jcasado d8d805a0ca refs #6911 changesSaveOnEnter 2024-04-30 08:16:31 +02:00
Javier Casado 38f25eb02d Merge branch 'dev' into 6911-saveOnEnter 2024-04-30 06:15:38 +00:00
Alex Moreno 34797450af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-30 07:59:14 +02:00
Alex Moreno 6a03038c3a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-04-30 07:58:56 +02:00
Alex Moreno 2dfb2300a2 hotFix: refs #6336 fix vnLog user?.id 2024-04-30 07:51:22 +02:00
Javier Segarra d92a0ba77e fix: Roadmap Summary ID 2024-04-30 07:46:57 +02:00
Alex Moreno 0abc31d96d Merge pull request 'feat: refs #6336 v4' (!334) from 6336-claims_v4 into dev 
Reviewed-on: verdnatura/salix-front#334
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-04-30 05:38:37 +00:00
Alex Moreno 8390a8b7b0 Merge branch 'dev' into 6336-claims_v4 2024-04-30 05:37:46 +00:00
William Buezas ccac3a54f9 move translations 2024-04-29 17:39:37 -03:00
William Buezas ac9063e166 Item Last entries 2024-04-29 17:01:26 -03:00
William Buezas 1b619055eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemDiary 2024-04-29 10:32:53 -03:00
Javier Segarra 4be559bbe8 fix: hansChanges to false 2024-04-29 15:16:37 +02:00
Alex Moreno ed3c9db919 feat: refs #6825 create vnTableColumn, cardActions 2024-04-29 15:12:49 +02:00
William Buezas 0b5aea76d9 Move translations 2024-04-29 09:39:04 -03:00
William Buezas bd5bf2419b Merge branch 'feature/ItemFamily' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemFamily 2024-04-29 08:23:50 -03:00
William Buezas 6276c433d1 Fix exprBuilder 2024-04-29 08:23:29 -03:00
Javier Segarra a5d6ca447b fix: TicketSummary.packages label 2024-04-29 12:12:20 +02:00