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

8544 Commits

Author SHA1 Message Date
Alex Moreno 3a7f46856a Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism 2025-01-09 09:10:19 +00:00
PAU ROVIRA ROSALENY c6a9c55ddc Merge pull request 'fix: removed unused searchbar' (!1190) from 8322-workerDepartment into dev 
Reviewed-on: verdnatura/salix-front#1190
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-09 09:02:37 +00:00
PAU ROVIRA ROSALENY 343c1b538a Merge branch 'dev' into 8322-workerDepartment 2025-01-09 09:01:42 +00:00
Alex Moreno c95d2d7eac Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-09 09:54:26 +01:00
Alex Moreno e36e9b5617 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 09:54:15 +01:00
Carlos Satorres 135266a300 Merge branch 'master' into hotfix-7283itemRequestConfirm 2025-01-09 08:54:09 +00:00
Alex Moreno a317006cc4 fix: refs #8316 ref="claimFilterRef" 2025-01-09 09:52:44 +01:00
Carlos Satorres 5882ee8463 fix: fix confirmRequest 2025-01-09 09:44:37 +01:00
Alex Moreno f45612f058 Merge pull request 'perf_redirectTransition' (!1178) from perf_redirectTransition into test 
Reviewed-on: verdnatura/salix-front#1178
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-09 08:16:53 +00:00
PAU ROVIRA ROSALENY e9ea70de19 fix: removed unused searchbar 2025-01-09 08:03:59 +00:00
Alex Moreno f668a4bac4 Merge branch 'test' into perf_redirectTransition 2025-01-09 08:00:57 +00:00
Alex Moreno 3f167ffd3a fix: hotFix if not date return null/undefined 2025-01-09 09:00:29 +01:00
Javi Gallego bd09090e11 fix: update button sizes in ExtraCommunity.vue for better visibility 2025-01-09 08:47:18 +01:00
Alex Moreno a54483f9a5 Merge branch 'test' into perf_redirectTransition 2025-01-09 07:30:37 +00:00
Alex Moreno b28873c67d perf: simplify if 2025-01-09 08:30:23 +01:00
PAU ROVIRA ROSALENY 92a130b5db Merge branch 'dev' into 7055-testFilterItemForm 2025-01-09 07:25:36 +00:00
PAU ROVIRA ROSALENY b466dfe034 feat: refs #7055 added new test case 2025-01-09 08:25:23 +01:00
Carlos Satorres 14b8fc150b Merge pull request 'fix: modelName' (!1189) from hotfix-7366travelPopup into master 
Reviewed-on: verdnatura/salix-front#1189
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-09 07:07:43 +00:00
Alex Moreno 2505061b8c perf: simplify if 2025-01-09 08:06:35 +01:00
Carlos Satorres 93c059cdde Merge branch 'dev' into 7076-createTestVnInputDate 2025-01-09 07:04:56 +00:00
Carlos Satorres 5e31b93675 fix: modelName 2025-01-09 08:00:30 +01:00
Jose Antonio Tubau f8a0940eba test: refs #7076 added new test for VnInputDate 2025-01-09 07:59:43 +01:00
Alex Moreno 6d1478f703 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-09 07:59:34 +01:00
Alex Moreno b563eda782 Merge branch '8264-hotFix_globalInvoicing_paralellism' of https://gitea.verdnatura.es/verdnatura/salix-front into 8264-hotFix_globalInvoicing_paralellism 2025-01-09 07:56:00 +01:00
Alex Moreno 0c30a82440 fix(InvoiceOutGlobal): refs #8264 fix invoicing 2025-01-09 07:55:57 +01:00
PAU ROVIRA ROSALENY 1142797114 Merge pull request 'feat: #7088 created test for FetchedTags' (!1162) from 7088-testFetchedTags into dev 
Reviewed-on: verdnatura/salix-front#1162
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-09 06:04:15 +00:00
PAU ROVIRA ROSALENY 58a4ef2ca8 Merge branch 'dev' into 7088-testFetchedTags 2025-01-09 06:00:13 +00:00
Alex Moreno 83d4997c89 Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism 2025-01-08 13:29:39 +00:00
Alex Moreno 5b415a8398 Merge pull request 'fix: refs #7699 add icons and hint' (!1123) from 7699-refactroViewPassword into dev 
Reviewed-on: verdnatura/salix-front#1123
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-08 13:20:16 +00:00
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