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

8566 Commits

Author SHA1 Message Date
Carlos Satorres ad8f58e3e1 Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 13:04:00 +00:00
Robert Ferrús 60191b61ce Merge pull request 'fix: refs #8001 change link grafana' (!1186) from 8001-expeditionGrafanaHotFix into master 
Reviewed-on: verdnatura/salix-front#1186
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-08 12:34:55 +00:00
Jon Elias 6fd9c84efe Merge pull request 'Fix: VnTableFilter translations' (!1183) from Fix-VnTableFilterTranslations into dev 
Reviewed-on: verdnatura/salix-front#1183
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-08 12:26:45 +00:00
Jon Elias 1c2f3e7c53 Merge branch 'dev' into Fix-VnTableFilterTranslations 2025-01-08 12:24:52 +00:00
PAU ROVIRA ROSALENY 149cca37ef Merge branch 'dev' into 7055-testFilterItemForm 2025-01-08 12:02:43 +00:00
Robert Ferrús 65b9da7b54 Merge branch 'master' into 8001-expeditionGrafanaHotFix 2025-01-08 12:02:23 +00:00
PAU ROVIRA ROSALENY 5dc14b8dc1 feat: refs #7055 created FilterItemForm test 2025-01-08 13:02:08 +01:00
Alex Moreno e693323166 fix: workerTimeControl state week colors 2025-01-08 12:57:15 +01:00
Robert Ferrús 1a72eda359 fix: refs #8001 change link grafana 2025-01-08 12:44:35 +01: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
Javi Gallego 3e06f604bb feat: refs #8298 add price optimum input and update translations for bonus and price optimum 2025-01-08 10:32:15 +01:00
Carlos Satorres 96f8cab38c Merge branch 'dev' into 7699-refactroViewPassword 2025-01-08 08:27:54 +00:00
Pablo Natek 1dee824224 Merge pull request 'feat: refs #8348 add CSV download functionality and update print label icon' (!1172) from 8348-exportDataOnCsv into master 
Reviewed-on: verdnatura/salix-front#1172
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-08 07:55:25 +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
Jose Antonio Tubau 11642c075c refactor: refs #8316 added claimFilter 2025-01-08 08:10:00 +01:00
Jon Elias 1e8e2aff72 Merge pull request '#8219 Added InvoiceOut e2e tests' (!1001) from 8219-InvoiceOutE2E into dev 
Reviewed-on: verdnatura/salix-front#1001
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-08 06:41:32 +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 9fa2a77c96 refactor: refs #8219 modified list test, created cypress download folder and added to gitignore 2025-01-08 07:35:08 +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 666cdc7674 Merge pull request 'refactor: refs #8317 disable action buttons when no rows are selected in ItemFixedPrice' (!1174) from 8317-buttonsToRightOnItemFixedPrice into dev 
Reviewed-on: verdnatura/salix-front#1174
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-01-08 06:09:55 +00:00
Jose Antonio Tubau cdcc3de917 Merge branch 'dev' into 8317-buttonsToRightOnItemFixedPrice 2025-01-08 06:08:44 +00:00
Jose Antonio Tubau bb9df49ef9 Merge pull request 'feat: refs #8117 filters and values added as needed' (!1132) from 8117-filtersAndValuesReviewed into dev 
Reviewed-on: verdnatura/salix-front#1132
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-01-08 06:06:51 +00:00
Jon Elias 57ce6d6ea3 Merge branch 'dev' into 8117-filtersAndValuesReviewed 2025-01-08 06:06:02 +00:00
Jose Antonio Tubau 2c8b120ce4 Merge pull request 'test: refs #7100 added test to vnNotes component' (!1121) from 7100-createVnNotesSpec into dev 
Reviewed-on: verdnatura/salix-front#1121
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-08 06:05:01 +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 46cd5382c1 Merge pull request 'feat: #7078 created test for VnJsonValue' (!1168) from 7078-testVnJsonValue into dev 
Reviewed-on: verdnatura/salix-front#1168
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-08 05:04:47 +00:00
PAU ROVIRA ROSALENY 663a417a45 Merge branch 'dev' into 7078-testVnJsonValue 2025-01-08 05:03:46 +00:00
Jorge Penadés c0d909b3e8 Merge pull request 'feat: refs #7957 open in new tab' (!1086) from 7957-monitorChanges into dev 
Reviewed-on: verdnatura/salix-front#1086
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-07 14:38:55 +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
Alex Moreno ebb4d36fda fix: refs #8264 parallelism 2025-01-07 15:04:45 +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 c9c0a25ff9 Merge pull request '#8220 created items e2e' (!1039) from 8220-ItemsE2E into dev 
Reviewed-on: verdnatura/salix-front#1039
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-07 12:50:35 +00:00
Jon Elias 33ba6d3142 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:48:26 +00:00
PAU ROVIRA ROSALENY 16e4845d83 Merge pull request 'refactor: #8322 changed Worker component to use VnSection/VnCardBeta' (!1152) from 8322-worker into dev 
Reviewed-on: verdnatura/salix-front#1152
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-07 12:26:29 +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
Jorge Penadés f04aeec21d fix: refs #7957 update data-cy 2025-01-07 13:21:20 +01:00
PAU ROVIRA ROSALENY f273540708 Merge pull request 'fix: #8338 fixed VnTable translations' (!1173) from 8338-traduccionesVnTable into dev 
Reviewed-on: verdnatura/salix-front#1173
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-07 12:18:50 +00:00