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

8449 Commits

Author SHA1 Message Date
Jon Elias 9cd8b2e8d6 Merge branch 'dev' into 8120-CompactSummaryPopup 2025-01-13 09:23:17 +00:00
Jon Elias 2aff1d3d06 feat: refs #8120 added new style to summary popups 2025-01-13 10:20:28 +01:00
Jon Elias 330d0dd637 Merge pull request '#8225 use VnMoreOptions' (!1194) from 8225-UseSameMoreOptions into dev 
Reviewed-on: verdnatura/salix-front#1194
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 09:17:17 +00:00
Alex Moreno bb8e9c5baa Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 09:14:24 +00:00
Javi Gallego 7018f09ad1 Merge pull request 'feat: refs #8298 add price optimum input and update translations for bonus and price optimum' (!1185) from 8298-zonePriceOptimum into dev 
Reviewed-on: verdnatura/salix-front#1185
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 08:41:49 +00:00
Jon Elias f229ef1cd8 Merge branch 'dev' into 8225-UseSameMoreOptions 2025-01-13 07:35:38 +00:00
Jon Elias 413d567ffb refactor: refs #8225 requested changes 2025-01-13 08:34:32 +01:00
Jose Antonio Tubau e65b53fad0 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1140) from 8316-claimCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1140
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 06:35:51 +00:00
Jose Antonio Tubau a8706b3daa Merge branch 'dev' into 8316-claimCardWithVnCardBeta 2025-01-13 06:34:35 +00:00
Alex Moreno 6b8f6c464c Merge pull request 'feat: refs #8372 workerPBX' (!1192) from 8372-workerPBX into dev 
Reviewed-on: verdnatura/salix-front#1192
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-10 12:39:00 +00:00
Alex Moreno a28d9280a4 Merge branch 'dev' into 8372-workerPBX 2025-01-10 12:38:01 +00:00
Jon Elias 57c538c9c9 fix: refs #8225 invoice in translations 2025-01-10 10:49:07 +01:00
Jon Elias ac1515e107 feat: refs #8225 added worker and zone modules 2025-01-10 10:27:03 +01:00
Jon Elias 69bcab0ec4 feat: refs #8225 added invoiceIn and travel module 2025-01-10 10:25:16 +01:00
Jon Elias 300d64b076 feat: refs #8225 added entry module and fixed translations 2025-01-10 10:22:37 +01:00
Jon Elias 774c714755 feat: refs #8225 added route and shelving module 2025-01-10 10:14:56 +01:00
Jon Elias 5d9227723e feat: refs #8225 added account and invoiceOut modules 2025-01-10 10:10:16 +01:00
Jon Elias 1b986f4b4c feat: refs #8225 use it in claim, item and order modules 2025-01-10 10:03:51 +01:00
Jon Elias 95712728d6 feat: refs #8225 added moreOptions and use it in customer and ticket summary 2025-01-10 10:00:42 +01:00
PAU ROVIRA ROSALENY 6cc400a975 Merge pull request 'fix: fixed InvoiceIn filter translations' (!1193) from invoiceInTranslations into dev 
Reviewed-on: verdnatura/salix-front#1193
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-10 08:38:46 +00:00
PAU ROVIRA ROSALENY 27aa2969e8 fix: fixed InvoiceIn filter translations 2025-01-10 07:34:29 +01:00
Robert Ferrús 0057932bfa feat: refs #8372 workerPBX 2025-01-09 14:46:53 +01: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
Alex Moreno a317006cc4 fix: refs #8316 ref="claimFilterRef" 2025-01-09 09:52:44 +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
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 5e31b93675 fix: modelName 2025-01-09 08:00:30 +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
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 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
Robert Ferrús 65b9da7b54 Merge branch 'master' into 8001-expeditionGrafanaHotFix 2025-01-08 12:02:23 +00: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