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

2335 Commits

Author SHA1 Message Date
Jorge Penadés bfa9dc9634 feat: refs #6480 include drawer 2024-04-11 12:23:00 +02:00
Jorge Penadés edf75c8cdd feat: refs #6480 check if hasContent or slots 2024-04-11 09:22:15 +02:00
Jorge Penadés 96d3073f67 Revert "Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard" 
This reverts commit 984539b70f, reversing
changes made to d7ab6e8a02.
 2024-04-11 09:01:44 +02:00
Jorge Penadés 984539b70f Merge branch '6480-improveCard' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:42:17 +02:00
Jorge Penadés d7ab6e8a02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-11 08:41:52 +02:00
Alex Moreno 9be132b8a0 Merge pull request 'feature/ItemsList' (!280) from hyervoni/salix-front-mindshore:feature/ItemsList into dev 
Reviewed-on: verdnatura/salix-front#280
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-11 05:56:27 +00:00
Javier Segarra 5f502c2aad #6480: POC Claims 2024-04-10 20:52:45 +02:00
William Buezas 9dfe5f5e68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-10 09:34:51 -03:00
William Buezas 99c576b16e Add actions again 2024-04-10 09:32:15 -03:00
Alex Moreno e459c14dd3 Merge pull request 'Se crea submodulo mis documentos en worker' (!253) from hyervoni/salix-front-mindshore:features/ms_19_worker_my_documents into dev 
Reviewed-on: verdnatura/salix-front#253
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-10 12:15:32 +00:00
William Buezas e676933942 Update worker dms remove 2024-04-10 08:59:05 -03:00
William Buezas eceb60f6e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-10 08:46:00 -03:00
William Buezas 9ae79a5631 Add translation again 2024-04-10 08:43:57 -03:00
William Buezas e8486099fc Resolve conflicts 2024-04-10 08:37:52 -03:00
William Buezas 39af4278a6 Add delete model to worker dms 2024-04-10 08:27:30 -03:00
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
William Buezas e88194eb88 Update worker dms model prop 2024-04-09 16:00:12 -03:00
William Buezas 9c3407846b Fix translation 2024-04-09 10:30:40 -03: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
William Buezas 0144aab7a5 Mini fix 2024-04-09 08:51:00 -03:00
Jon Elias 15d4b54dda refactor: refs #7186 fixed changes 2024-04-09 13:34:45 +02:00
William Buezas f6e140e369 Apply workerDms changes 2024-04-09 08:28:00 -03:00
William Buezas e51ea9996b Item list view 2024-04-09 08:18:18 -03: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
William Buezas 64ff5e4446 Add pagination and table actions 2024-04-08 11:40:44 -03: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
William Buezas 4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-08 08:47:56 -03:00
William Buezas f12ec3c0c9 Add redirection to summary and open summary action 2024-04-08 08:47:29 -03: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