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

6522 Commits

Author SHA1 Message Date
Carlos Satorres cd1c70850e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4774-traducciones 2024-10-17 09:37:59 +02:00
Alex Moreno 3069ac27d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-16 09:17:00 +02:00
Alex Moreno e0c294bce6 test(claimDevelopment): skip intermitent e2e 2024-10-16 09:16:57 +02:00
Jon Elias 4fb3e0dadf Merge pull request '#7825: Fill the bank field when a new entity is created' (!798) from 7825-FixCreatebankEntity into dev 
Reviewed-on: verdnatura/salix-front#798
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-15 11:42:38 +00:00
Jon Elias c4670b57de Merge branch 'dev' into 7825-FixCreatebankEntity 2024-10-15 11:13:35 +00:00
Jon Elias 15f171da0f perf: refs #7825 create bank entity 2024-10-15 13:12:37 +02:00
Carlos Satorres 22cc9d689d Merge pull request 'refs #7767 check holiday' (!800) from 7767-holidayDaysExceeded into dev 
Reviewed-on: verdnatura/salix-front#800
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-15 10:55:45 +00:00
Carlos Satorres 3badfbcff9 Merge branch 'dev' into 7767-holidayDaysExceeded 2024-10-15 10:54:57 +00:00
Alex Moreno 0f84baf1a8 build: init version 24.44 2024-10-15 09:29:06 +02:00
Alex Moreno a33dde3dcf Merge pull request '8093-devToTest_2442_3' (!831) from 8093-devToTest_2442_3 into test 
Reviewed-on: verdnatura/salix-front#831
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-10-15 07:22:03 +00:00
Alex Moreno 3bb5f66ce7 fix(claimNotes): refs #8093 $props.selectType && !newNote.observationTypeFk 2024-10-15 08:43:58 +02:00
Alex Moreno d87e8ec4ae Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-15 08:01:22 +02:00
Alex Moreno a68416244c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-15 08:01:02 +02:00
Carlos Satorres bc581caa4e fix: refs #7767 console remove 2024-10-15 07:57:19 +02:00
Carlos Satorres 29770c57bd Merge pull request 'refs #6898 #6899 hotfix lists' (!826) from #6898-&-#6899-hotfixFilterList into master 
Reviewed-on: verdnatura/salix-front#826
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-15 05:42:40 +00:00
Carlos Satorres 85eed86ba8 Merge branch 'master' into #6898-&-#6899-hotfixFilterList 2024-10-15 05:41:32 +00:00
Jorge Penadés 523423cce6 Merge pull request '#7874 add observation type' (!765) from 7874-addObservationType into dev 
Reviewed-on: verdnatura/salix-front#765
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-14 14:16:44 +00:00
Jorge Penadés 53fe6b0c3c Merge pull request 'fix: refs #7353 scopeDays' (!795) from 7353-hotfix-fixScopeDays into master 
Reviewed-on: verdnatura/salix-front#795
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-14 14:11:06 +00:00
Jorge Penadés 37dfca3bce Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays 2024-10-14 16:03:13 +02:00
Jorge Penadés 12e1d9c389 Merge pull request 'fix: refs #7524 dynamic fetch' (!828) from 7524-hotfix-dynamicFetch into master 
Reviewed-on: verdnatura/salix-front#828
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-14 14:02:02 +00:00
Jorge Penadés 1c7ec6af41 Merge branch '7353-hotfix-fixScopeDays' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays 2024-10-14 15:54:19 +02:00
Jorge Penadés 19545ca7e6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-hotfix-fixScopeDays 2024-10-14 15:54:08 +02:00
Jorge Penadés 2d34921cf5 fix: refs #7524 paginate 2024-10-14 15:52:12 +02:00
Jorge Penadés 245c027357 chore: refs #7874 refactor imports 2024-10-14 15:43:59 +02:00
Jorge Penadés 0fb9b22935 chore: refs #7874 refactor code 2024-10-14 14:09:52 +02:00
Carlos Satorres 8258fbb91e refs #7767 remove onMounted 2024-10-14 13:24:12 +02:00
Jorge Penadés 0f3168456a chore: refs #7524 sort by firstName 2024-10-14 13:22:59 +02:00
Carlos Satorres b225f6a4c8 refs #7767 fix contractHolidays 2024-10-14 13:18:34 +02:00
Jorge Penadés 4ff3c18f33 feat: refs #7874 use badge type 2024-10-14 13:00:15 +02:00
Jorge Penadés 6f2187cb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-14 12:18:37 +02:00
Jorge Penadés 4b78c1acd0 fix: refs #7524 dynamic 2024-10-14 12:00:05 +02:00
Jorge Penadés 12392444b9 Merge pull request '#8019 make responsive inputs' (!812) from 8019-makeResponsiveInputs into dev 
Reviewed-on: verdnatura/salix-front#812
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-14 08:50:20 +00:00
Jorge Penadés fdbae5c0b5 Merge branch 'dev' into 8019-makeResponsiveInputs 2024-10-14 08:48:50 +00:00
Carlos Satorres 2edeb1043e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7767-holidayDaysExceeded 2024-10-14 10:24:49 +02:00
Carlos Satorres 85b068eddb refs #6898 #6899 hotfix lists 2024-10-14 10:21:02 +02:00
Alex Moreno 29651b425e Merge pull request 'refs: #6898 hotfix accounts' (!824) from 6898-fixSupplierAccounts into master 
Reviewed-on: verdnatura/salix-front#824
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-14 07:46:30 +00:00
Carlos Satorres 6a624b12a5 refs: #6898 hotfix accounts 2024-10-14 09:28:51 +02:00
Javier Segarra adbb745f0f Merge pull request 'Fix own test' (!816) from fix_test_jsegarra into dev 
Reviewed-on: verdnatura/salix-front#816
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-14 07:24:16 +00:00
Javier Segarra 914f6022be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_test_jsegarra 2024-10-14 09:23:31 +02:00
Alex Moreno 55b9fb1a87 Merge pull request 'fix: MyEntry e2e test' (!823) from Fix-EntryTest into dev 
Reviewed-on: verdnatura/salix-front#823
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-14 07:10:20 +00:00
Jon Elias eebac7b36c fix: fixed e2e test 2024-10-14 08:51:26 +02:00
Jorge Penadés db5449444a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-14 08:37:44 +02:00
Alex Moreno 64c8d264af warmFix(TravelList): add daysOnward in travelFilter 2024-10-14 07:43:29 +02:00
Jorge Penadés 50042ed45b feat: refs #7874 prevent submit if empty fields 2024-10-10 16:49:41 +02:00
Jorge Penadés 6d674f2a2b Merge branch 'dev' into 7874-addObservationType 2024-10-10 13:41:01 +00:00
Javier Segarra f72761f36c Merge pull request '#7404 - Rollback Style to compress spaces' (!820) from revert_css_styles into dev 
Reviewed-on: verdnatura/salix-front#820
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-10 12:29:40 +00:00
Javier Segarra 2ff99d3faa feat: define as global dense value 2024-10-10 13:56:14 +02:00
Javier Segarra 3dfb836f8e revert: rollback compress spacestyle 2024-10-10 13:56:11 +02:00
Jorge Penadés 5af14b1b52 chore: refs #7874 fix test 2024-10-10 12:12:03 +02:00
Jorge Penadés 44c4c378f9 chore: refs #7874 add default ob type 2024-10-10 11:02:03 +02:00