wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
2,307 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

2307 Commits

Author SHA1 Message Date
Jorge Penadés 14d9147cc1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-10 13:02:22 +02:00
Jon Elias 81d0e397f0 Merge pull request '#7186 - tabIndexVATExpenses' (!277) from 7186-tabIndexVATExpenses into dev 
Reviewed-on: verdnatura/salix-front#277
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-10 07:37:01 +00:00
Jon Elias e3e6c74afa Merge branch 'dev' into 7186-tabIndexVATExpenses 2024-04-10 07:36:17 +00:00
Jon Elias 09ceefb7c5 style: refs #7186 fixed style 2024-04-10 08:49:54 +02:00
Jorge Penadés a153146f82 Merge pull request '#6992 add URL params' (!273) from 6992-addQueryParamsUrl into dev 
Reviewed-on: verdnatura/salix-front#273
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-10 06:45:14 +00:00
Jon Elias f9de26933a refactor: refs #7186 fill-icon change 2024-04-10 08:00:36 +02:00
Jorge Penadés 83bf8183f0 fix: refs #6992 warning console & formModel hook 2024-04-09 15:12:54 +02:00
Jorge Penadés 6349a3e790 feat: refs #6992 comments 2024-04-09 15:08:54 +02:00
Jon Elias 15d4b54dda refactor: refs #7186 fixed changes 2024-04-09 13:34:45 +02:00
Jon Elias 65626446fd refactor: refs #7186 fixed style and tab 2024-04-09 13:01:29 +02:00
Jon Elias c217e8a1a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7186-tabIndexVATExpenses 2024-04-09 11:44:11 +02:00
Jorge Penadés 50bce40613 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl 2024-04-09 10:09:41 +02:00
Guillermo Bonet be9dd8b2b7 Merge pull request 'feat: refs #6636 Added pickup in claim' (!268) from 6636-pickup into dev 
Reviewed-on: verdnatura/salix-front#268
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-09 08:04:58 +00:00
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup 2024-04-09 08:02:30 +00:00
Jorge Penadés fdfa99c718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl 2024-04-09 09:55:44 +02:00
Jon Elias f1c67a9775 Merge pull request 'refactor: refs #6973 updated label and updated cypress test' (!275) from 6973-UpdateVnLocationLabel into dev 
Reviewed-on: verdnatura/salix-front#275
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-09 06:48:49 +00:00
Jon Elias f988923b4b Merge branch 'dev' into 6973-UpdateVnLocationLabel 2024-04-09 06:48:06 +00:00
Jon Elias 0e064b3305 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899-endInvoiceOutMigration 2024-04-09 08:45:12 +02:00
Jon Elias b7788512bc refactor: refs #6973 fix requested changes 2024-04-09 08:41:44 +02:00
Jon Elias 3bededcd94 refactor: refs #6973 updated label and updated cypress test 2024-04-09 07:47:40 +02:00
Jorge Penadés 16548dadef feat: refs #6992 add test 2024-04-08 16:38:36 +02:00
Jorge Penadés 8de3ea16a6 fix: refs #6992 add queryParams 2024-04-08 15:15:18 +02:00
Jorge Penadés dfac40adb3 feat: refs #6480 vnCard 2024-04-08 10:27:37 +02:00
Jorge Penadés 4fa311120d feat: refs #6480 hide if no content 2024-04-08 10:11:50 +02:00
Javier Segarra 1a9e9d35ca Merge pull request 'fix_merge_worker_submoduls' (!272) from fix_merge_worker_submoduls into dev 
Reviewed-on: verdnatura/salix-front#272
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-08 07:04:29 +00:00
Javier Segarra f2d513766e fix_merge_worker_submoduls 2024-04-08 07:03:42 +00:00
Javier Segarra dafc9f83b9 Merge pull request 'Desarrollo de los submodulos basic data, notes y pbx' (!245) from hyervoni/salix-front-mindshore:features/ms_submodulos_worker into dev 
Reviewed-on: verdnatura/salix-front#245
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-08 06:19:28 +00:00
Guillermo Bonet b2ef381f1d Merge branch 'dev' into 6636-pickup 2024-04-08 05:18:34 +00:00
William Buezas 4701714aa9 merge with dev 2024-04-05 08:42:13 -03:00
William Buezas 970d1a48e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into features/ms_submodulos_worker 2024-04-05 08:25:28 -03:00
William Buezas 03be831ee5 remove package-lock.json 2024-04-05 08:24:55 -03:00
Guillermo Bonet 1a15ccec2c fix: refs #6636 Call getEnumValues method 2024-04-05 11:01:48 +02:00
Javier Casado d72c151d82 Merge pull request 'refs #6816 remove microsip tag' (!267) from 6816-removeMicroSip into dev 
Reviewed-on: verdnatura/salix-front#267
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-05 08:01:10 +00:00
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip 2024-04-05 07:57:21 +00:00
Alex Moreno e14993c114 minor changes 2024-04-05 09:12:49 +02:00
Guillermo Bonet 9310d863aa fix: refs #6636 Icon save and reset 2024-04-05 07:39:05 +02:00
Guillermo Bonet 58b9eb1c78 feat: refs #6636 Requested changes 2024-04-05 07:29:25 +02:00
Guillermo Bonet 8d7670cc85 Merge branch 'dev' into 6636-pickup 2024-04-05 05:24:31 +00:00
Jon Elias b5f721316b Merge pull request 'refactor: refs #6894 changed filter fields and checked functionality' (!269) from 6894-invoiceInChangeFilters into dev 
Reviewed-on: verdnatura/salix-front#269
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-04-04 12:33:34 +00:00
Jon Elias 59a631b19e Merge branch 'dev' into 6894-invoiceInChangeFilters 2024-04-04 12:32:40 +00:00
Jon Elias 97b7c2469a refactor: refs #6894 changed filter fields and checked functionality 2024-04-04 14:13:34 +02:00
Guillermo Bonet b09ecefad4 feat: refs #6636 Added pickup in claim 2024-04-04 14:12:16 +02:00
Guillermo Bonet b21c54f20d Merge branch 'test' into dev 2024-04-04 11:31:20 +02:00
Guillermo Bonet d98e5d78ff hotfix: refs #6930 Rollback tokenMultimedia 2024-04-04 10:17:13 +02:00
jcasado d00ec3c41c refs #6816 remove microsip tag 2024-04-04 09:38:47 +02:00
Alex Moreno 06af04a043 Merge pull request '7167-testToMaster_2414' (!266) from 7167-testToMaster_2414 into master 
Reviewed-on: verdnatura/salix-front#266
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-04-04 05:35:07 +00:00
Pablo Natek ef489b74df Merge pull request '7128-copyStyles' (!265) from 7128-copyStyles into dev 
Reviewed-on: verdnatura/salix-front#265
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-04-03 19:12:23 +00:00
Pablo Natek be42593368 Merge branch 'dev' into 7128-copyStyles 2024-04-03 19:10:38 +00:00
Alex Moreno 7ed505bde8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-03 16:30:10 +02:00
Alex Moreno dec71dbf62 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-04-03 16:29:40 +02:00