0
0
Fork 0
Commit Graph

2234 Commits

Author SHA1 Message Date
Jorge Penadés 9a06a1296c ref #6104 conflicts fixed 2023-09-28 13:57:39 +02:00
Jorge Penadés 30791acba6 ref #6104 replace color vars 2023-09-28 13:56:21 +02:00
Jorge Penadés d0de690dc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog 2023-09-28 13:55:38 +02:00
Jorge Penadés 4995c993bd ref #6104 validations store created 2023-09-28 13:45:14 +02:00
Alex Moreno 11305fc4c8 Merge pull request '5673-claim-development & crudModel' (!71) from 5673-claim-development into dev
Reviewed-on: verdnatura/salix-front#71
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-09-28 07:46:01 +00:00
Jorge Penadés 41eccd2885 ref #6104 fix claimNotes test 2023-09-27 14:07:49 +02:00
Jorge Penadés 36a0f36f8a ref #6104 fix conflicts 2023-09-27 14:05:37 +02:00
Jorge Penadés 7ae098d779 ref #5417 fix filters and view 2023-09-27 13:41:50 +02:00
Alex Moreno 149e611ae3 Merge branch 'dev' into 5673-claim-development 2023-09-26 12:59:46 +00:00
Jorge Penadés ca28ecdd8e ref #6104 tests created and searchFn fixed 2023-09-26 11:49:57 +02:00
Alex Moreno 1637921fab refs #5673 fix: VnSelect update model, feat(claimDevelopment) add reload function 2023-09-25 12:06:49 +02:00
Alex Moreno 685c835d13 refs #5673 fix(crudModel): fix formData watcher and removed useState 2023-09-21 15:04:21 +02:00
Guillermo Bonet 9fad8bf78d Merge branch 'master' into test 2023-09-20 08:12:28 +02:00
Guillermo Bonet b8f329afe1 Merge pull request '5995-improvedExternalCmr' (!88) from 5995-improvedExternalCmr into master
Reviewed-on: verdnatura/salix-front#88
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-09-20 06:08:21 +00:00
Alex Moreno 52fcbdb689 refs #5673 feat(crudModel): add saveFn prop 2023-09-19 10:21:24 +02:00
Pablo Natek b66c265dee refs #6118 removeVariables 2023-09-19 09:43:21 +02:00
Pablo Natek 8d27ef5402 refs #6118 fixResponsive 2023-09-19 09:42:47 +02:00
Alex Moreno ea8a7de6d2 refs #5673 feat(crudModel): works with null values 2023-09-18 14:56:14 +02:00
Jorge Penadés bdf288241b ref #6104 fix package 2023-09-18 14:38:35 +02:00
Jorge Penadés 79fc503a01 ref #6104 recreate vnlog 2023-09-18 14:35:21 +02:00
Jorge Penadés a2b619b0af Merge branch 'dev' into 6175-addMicrosipLink 2023-09-18 12:17:37 +00:00
Alex Moreno 3a5002b3a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-09-18 10:41:31 +02:00
Guillermo Bonet 394a7f7bb7 Merge branch 'master' into 5995-improvedExternalCmr 2023-09-18 05:17:30 +00:00
Javi Gallego 5e8a2c4121 Merge pull request 'dev' (!95) from dev into test
Reviewed-on: verdnatura/salix-front#95
2023-09-14 08:31:32 +00:00
Javi Gallego edc0a013a9 Merge pull request 'test' (!94) from test into dev
Reviewed-on: verdnatura/salix-front#94
2023-09-14 08:30:16 +00:00
Pablo Natek c727480569 refs #6118 scoppedcss 2023-09-13 16:46:09 +02:00
Pablo Natek 39cbc32547 refs #6118 newVariable 2023-09-13 16:30:20 +02:00
Pablo Natek ae1ba448f7 refs #6118 fix 2023-09-13 16:24:54 +02:00
Pablo Natek 924dea66d4 refs #6118 importSalixVariables 2023-09-12 18:27:31 +02:00
Javi Gallego f1af3b80bd Merge pull request 'test' (!92) from test into master
Reviewed-on: verdnatura/salix-front#92
2023-09-07 07:51:36 +00:00
Javi Gallego d1a88776f2 Merge branch 'master' into test 2023-09-07 09:48:47 +02:00
Jorge Penadés a4a62c8e3b ref #6175 match linkPhone 2023-09-07 09:27:23 +02:00
Jorge Penadés 71d3f0c4c6 ref #6175 tests fixed 2023-09-07 08:42:39 +02:00
Jorge Penadés e4efffb336 ref #6175 simplify the component 2023-09-07 08:23:55 +02:00
Jorge Penadés 48b4fd96e5 ref #6175 scheme url removed 2023-09-06 14:40:26 +02:00
Jorge Penadés 5bcd5a8e85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-09-06 14:25:29 +02:00
Jorge Penadés db733e63af Merge pull request '6105-createClaimNotes' (!90) from 6105-createClaimNotes into dev
Reviewed-on: verdnatura/salix-front#90
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-01 13:06:26 +00:00
Jorge Penadés a7cea458a2 ref #6105 fix test 2023-09-01 13:42:53 +02:00
Jorge Penadés 0882c3440d ref #6105 fix dialog 2023-09-01 13:09:30 +02:00
Guillermo Bonet 71c6b865b6 refs #5995 Improved external CMR 2023-09-01 12:11:56 +02:00
Javi Gallego 777e45a0cd Merge pull request 'dev' (!89) from dev into test
Reviewed-on: verdnatura/salix-front#89
2023-08-31 09:12:53 +00:00
Jorge Penadés 3a3ae14dc5 ref #6175 VnLinkPhone and MicroSIP icon created 2023-08-31 09:05:21 +02:00
Guillermo Bonet 6786ac97e4 refs #5995 Improved external CMR 2023-08-30 12:53:18 +02:00
Javi Gallego 7348d36be4 Merge pull request 'refs #6153 test - master' (!86) from test into master
Reviewed-on: verdnatura/salix-front#86
2023-08-29 07:48:22 +00:00
Alex Moreno 8bd590447d refs #5673 feat: add toolbar in all cards 2023-08-25 14:17:11 +02:00
Alex Moreno 1f169d31e5 typo 2023-08-25 13:47:56 +02:00
Alex Moreno 94f5deffac Merge branch '5673-claim-development' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development 2023-08-25 12:56:02 +02:00
Alex Moreno ea346cdca2 refs #5673 test(CrudModel): skip remove test 2023-08-25 12:56:00 +02:00
Alex Moreno edc55f2154 Merge branch 'dev' into 5673-claim-development 2023-08-25 10:52:13 +00:00
Alex Moreno 367141a80d refs #5673 test(CrudModel): add getChanges getDifferences front test 2023-08-25 12:33:38 +02:00