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

6567 Commits

Author SHA1 Message Date
PAU ROVIRA ROSALENY 58a4ef2ca8 Merge branch 'dev' into 7088-testFetchedTags 2025-01-09 06:00:13 +00:00
Carlos Satorres ad8f58e3e1 Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 13:04:00 +00:00
Jon Elias 1c2f3e7c53 Merge branch 'dev' into Fix-VnTableFilterTranslations 2025-01-08 12:24:52 +00:00
Alex Moreno 3ba37d515a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-08 12:19:51 +01:00
Alex Moreno b889bfd178 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-08 12:19:38 +01:00
Alex Moreno 70f692ffd5 fix(WorkerTimeControl): fix isoYear 2025-01-08 12:19:27 +01:00
Carlos Satorres 96f8cab38c Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 08:27:54 +00:00
Pablo Natek d392e93efd Merge branch 'master' into 8348-exportDataOnCsv 2025-01-08 07:15:05 +00:00
PAU ROVIRA ROSALENY 03c23a133b Merge branch 'dev' into 7088-testFetchedTags 2025-01-08 07:12:02 +00:00
PAU ROVIRA ROSALENY 6499eeda01 Merge branch 'dev' into 7088-testFetchedTags 2025-01-08 06:40:29 +00:00
PAU ROVIRA ROSALENY 0d3b1130f9 fix: refs #7088 changed "vm.vm" to "vm" 2025-01-08 07:39:50 +01:00
Jon Elias ec40dc6171 Merge branch 'dev' of https: refs #8219//gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2025-01-08 07:15:52 +01:00
Jon Elias 39917e656e Merge branch 'dev' into Fix-VnTableFilterTranslations 2025-01-08 06:13:35 +00:00
Jon Elias f4b443f2b0 fix: translations 2025-01-08 07:11:26 +01:00
Jose Antonio Tubau cdcc3de917 Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice 2025-01-08 06:08:44 +00:00
Jon Elias 57ce6d6ea3 Merge branch 'dev' into 8117-filtersAndValuesReviewed 2025-01-08 06:06:02 +00:00
Jose Antonio Tubau 79c7d66fe6 Merge branch 'dev' into 7100-createVnNotesSpec 2025-01-08 06:03:37 +00:00
Jose Antonio Tubau eb6121cbb5 Merge branch 'dev' into 8117-filtersAndValuesReviewed 2025-01-08 06:01:45 +00:00
Jose Antonio Tubau 6ce571a8ab Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice 2025-01-08 05:59:56 +00:00
PAU ROVIRA ROSALENY f0889f158d Merge branch 'dev' into 7088-testFetchedTags 2025-01-08 05:56:57 +00:00
PAU ROVIRA ROSALENY 663a417a45 Merge branch 'dev' into 7078-testVnJsonValue 2025-01-08 05:03:46 +00:00
Jorge Penadés 08d20d3e7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2025-01-07 15:35:45 +01:00
Alex Moreno 5dcf77a226 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 15:05:44 +01:00
Alex Moreno 621d98b32b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-07 15:05:33 +01:00
Jorge Penadés 8f418dcb4b style: refs #7957 update VnSearchbar padding for improved layout 2025-01-07 14:31:38 +01:00
Jorge Penadés b289ba3196 Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2025-01-07 14:11:44 +01:00
Jon Elias 33ba6d3142 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:48:26 +00:00
PAU ROVIRA ROSALENY 8e1f888134 Merge branch 'dev' into 8322-worker 2025-01-07 12:24:44 +00:00
Jon Elias ea89cf4062 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:22:32 +00:00
Jon Elias 548db113eb refactor: refs #8220 requested changes 2025-01-07 13:16:05 +01:00
Jon Elias 5de2805fa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2025-01-07 13:13:12 +01:00
Alex Moreno 62cdc2b4f7 Merge branch 'dev' into 8322-worker 2025-01-07 12:02:22 +00:00
Alex Moreno 02973cc7d6 fix: refs #8322 unnecessary section 2025-01-07 13:02:04 +01:00
Alex Moreno 5440d94df2 chore: refs #8322 unnecessary prop 2025-01-07 13:00:42 +01:00
Alex Moreno 245530b542 refactor: refs #8322 set department inside worker 2025-01-07 13:00:00 +01:00
Jorge Penadés 73c133c62b fix: refs #7957 css 2025-01-07 12:26:05 +01:00
Jorge Penadés d925e3f8b4 fix: refs #7957 css 2025-01-07 12:24:32 +01:00
Jorge Penadés 7b9731a4c8 fix: refs #7957 css 2025-01-07 12:22:21 +01:00
Jorge Penadés 30bdf42f3f Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2025-01-07 12:16:39 +01:00
PAU ROVIRA ROSALENY 07222f9fb8 fix: refs #8338 removed chipLocale property/added more translations 2025-01-07 11:43:39 +01:00
Carlos Satorres 8c2f102414 Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword 2025-01-07 11:18:19 +01:00
Carlos Satorres 3953721424 fix: refs #7699 fix component 2025-01-07 11:18:16 +01:00
Jorge Penadés da0e31b978 fix: refs #7323 update getAbsences to handle multiple years for absence data 2025-01-07 11:17:56 +01:00
PAU ROVIRA ROSALENY e8bad89008 Merge branch 'dev' into 8338-traduccionesVnTable 2025-01-07 09:42:16 +00:00
Jorge Penadés e0179d99d6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-hideCaption 2025-01-07 10:33:05 +01:00
Jorge Penadés 59c755329a fix: refs #7936 update VnSelect to conditionally render option caption 2025-01-07 10:29:37 +01:00
Jon Elias 04f1a805ab Merge branch 'dev' into Fix-EntrySummary 2025-01-07 09:24:00 +00:00
PAU ROVIRA ROSALENY e7f2d6ae7f Merge branch 'dev' into 8322-worker 2025-01-07 09:22:40 +00:00
Jon Elias 48ba567489 Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-07 09:09:35 +00:00
Jon Elias 2373404d90 Merge branch 'dev' into 7202-AddCustomAgentFkColumn2 2025-01-07 09:02:13 +00:00