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

8938 Commits

Author SHA1 Message Date
Robert Ferrús a0f4b74422 Merge branch 'dev' into 8077-sumDefaulterFrontFix 2025-01-23 12:31:18 +00:00
Robert Ferrús bf4faa88a1 Merge pull request 'feat: refs #8398 moveTicketsFuture' (!1223) from 8398-mergeSendCheckingPresence into dev 
Reviewed-on: verdnatura/salix-front#1223
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-23 09:50:56 +00:00
Robert Ferrús 961c9a6973 Merge branch 'dev' into 8398-mergeSendCheckingPresence 2025-01-23 08:22:02 +00:00
Robert Ferrús 1b567f8fa0 Merge branch 'dev' of https: refs #8077//gitea.verdnatura.es/verdnatura/salix-front into 8077-sumDefaulterFrontFix 2025-01-23 09:19:39 +01:00
Robert Ferrús 2ffcb6dfe8 feat: refs #8077 changes request 2025-01-23 09:14:54 +01:00
Jon Elias 8c46ee45c2 Merge pull request '#7184: Added myTeam filter at WorkerFilter' (!1271) from 7184-MyTeamFilter into dev 
Reviewed-on: verdnatura/salix-front#1271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-23 08:03:02 +00:00
Jon Elias 807567cede Merge branch 'dev' into 7184-MyTeamFilter 2025-01-23 07:59:45 +00:00
Alex Moreno f9dd927292 Merge pull request '#8197 - advancedMenu' (!1248) from 8197-advancedMenu into dev 
Reviewed-on: verdnatura/salix-front#1248
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-23 07:27:36 +00:00
Alex Moreno a0895488b4 Merge branch 'dev' into 8197-advancedMenu 2025-01-23 07:20:05 +00:00
Alex Moreno f86dc7b60f fix: defineProps not import 2025-01-23 08:19:42 +01:00
Alex Moreno 58edd511dc fix: refs #8197 improve code robustness by adding optional chaining and fixing syntax errors 2025-01-23 08:18:24 +01:00
Jose Antonio Tubau 2068fa4795 Merge branch 'dev' into 7073-createTestToVnDms 2025-01-23 07:08:58 +00:00
Alex Moreno fc886c2a8b Merge branch 'dev' of https: refs #8197//gitea.verdnatura.es/verdnatura/salix-front into 8197-advancedMenu 2025-01-23 07:33:45 +01:00
Alex Moreno a58f31f7d8 fix: change name 2025-01-23 07:18:28 +01:00
Jon Elias 81718c0c4d feat: refs #7184 added myTeam filter at WorkerFilter 2025-01-22 16:35:13 +01:00
Javier Segarra 3ef43531c3 Merge pull request 'style: perf max-width rule' (!1270) from hotfix_checbox_css into master 
Reviewed-on: verdnatura/salix-front#1270
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-22 13:09:48 +00:00
Javier Segarra 0658785a9a style: perf max-width rule 2025-01-22 13:03:23 +00:00
PAU ROVIRA ROSALENY a6adec0407 Merge pull request 'feat: #7103 created test for VnSearchbar' (!1256) from 7103-testVnSearchbar into dev 
Reviewed-on: verdnatura/salix-front#1256
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-22 11:15:20 +00:00
PAU ROVIRA ROSALENY d361ecd514 Merge branch 'dev' into 7103-testVnSearchbar 2025-01-22 11:13:37 +00:00
Alex Moreno 273d086154 Merge pull request 'feat: refs #7196 update vite and q-calendar' (!1264) from 7196-updateVite into dev 
Reviewed-on: verdnatura/salix-front#1264
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-22 11:05:56 +00:00
Alex Moreno a8870ec46a Merge branch 'dev' into 7196-updateVite 2025-01-22 11:02:17 +00:00
PAU ROVIRA ROSALENY ffe17751d9 Merge branch 'dev' into 7103-testVnSearchbar 2025-01-22 10:43:41 +00:00
Javier Segarra 88ce527bf1 Merge pull request '#7308 - Warning inject' (!1065) from 7308_warning into dev 
Reviewed-on: verdnatura/salix-front#1065
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-22 10:41:32 +00:00
PAU ROVIRA ROSALENY f94c457263 Merge branch 'dev' into 7103-testVnSearchbar 2025-01-22 10:40:49 +00:00
PAU ROVIRA ROSALENY ea4a46d9c7 fix: refs #7103 used consts for repeated variables 2025-01-22 11:40:25 +01:00
Alex Moreno 0b17da1b76 Merge branch '7196-updateVite' of https://gitea.verdnatura.es/verdnatura/salix-front into 7196-updateVite 2025-01-22 11:11:42 +01:00
Alex Moreno 675820eff6 fix: refs #7196 not neccessary 2025-01-22 11:11:41 +01:00
Jon Elias 3b0d0afddb Merge pull request 'Warmfix[WorkerDescriptor]: link to DepartmentDescriptor' (!1269) from Warmfix-WorkerDescriptorLink into test 
Reviewed-on: verdnatura/salix-front#1269
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-22 10:03:34 +00:00
Javier Segarra 48a1f89399 Merge branch 'dev' into 7196-updateVite 2025-01-22 10:01:38 +00:00
Javier Segarra c19f49dcdd Merge branch 'dev' into 7308_warning 2025-01-22 10:01:05 +00:00
Alex Moreno 650a5409b1 Merge branch '7196-updateVite' of https://gitea.verdnatura.es/verdnatura/salix-front into 7196-updateVite 2025-01-22 10:58:01 +01:00
Alex Moreno 155b8b3743 fix: refs #7196 sass 2025-01-22 10:57:59 +01:00
Alex Moreno 1bbee11ec0 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1142) from 8316-customerCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1142
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-22 09:11:30 +00:00
Javier Segarra 8dc277ec2a Merge branch 'dev' into 7196-updateVite 2025-01-22 08:58:28 +00:00
Alex Moreno 467cd8faf7 Merge branch 'dev' into 8316-customerCardWithVnCardBeta 2025-01-22 08:42:53 +00:00
Jon Elias 6b84f24a08 Merge pull request 'Fix[VnLocation]: fixed label and warnings' (!1268) from Fix-VnLocationLabel into dev 
Reviewed-on: verdnatura/salix-front#1268
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-22 08:41:17 +00:00
Jon Elias 82010f1684 Merge branch 'dev' into Fix-VnLocationLabel 2025-01-22 08:40:18 +00:00
Jon Elias bb2c3fef51 fix: department descriptor link 2025-01-22 09:36:56 +01:00
Jon Elias f536d08317 fix: fixed VnLocation and warnings 2025-01-22 09:27:58 +01:00
Alex Moreno 18737878a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-customerCardWithVnCardBeta 2025-01-22 09:27:41 +01:00
Alex Moreno ba8db3b73f Merge branch 'dev' into 7196-updateVite 2025-01-22 08:26:55 +00:00
Jose Antonio Tubau d499565ca3 Merge pull request 'test: refs #7075 add unit tests for VnInput component' (!1209) from 7075-createTestToVnInput into dev 
Reviewed-on: verdnatura/salix-front#1209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-22 08:23:39 +00:00
Jose Antonio Tubau 47cb1c2586 Merge branch 'dev' into 7075-createTestToVnInput 2025-01-22 08:18:58 +00:00
Alex Moreno 092745a069 perf: refs #7196 update eslint 2025-01-22 09:13:30 +01:00
Alex Moreno 9cd56bb33d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7196-updateVite 2025-01-22 09:05:58 +01:00
Robert Ferrús 13290aa44b feat: refs #8077 changes request 2025-01-22 08:34:13 +01:00
Javier Segarra 1ec91add8e Merge branch 'dev' into 7308_warning 2025-01-22 06:45:37 +00:00
Robert Ferrús db54277bc0 Merge branch 'dev' into 8077-sumDefaulterFrontFix 2025-01-22 06:35:30 +00:00
PAU ROVIRA ROSALENY d33909ad01 Merge branch '7103-testVnSearchbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 7103-testVnSearchbar 2025-01-22 07:30:31 +01:00
PAU ROVIRA ROSALENY 2aa7177449 fix: refs #7103 updated tests for new changes 2025-01-22 07:30:28 +01:00