Alex Moreno
|
10a663b400
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-06-25 13:33:23 +02:00 |
Alex Moreno
|
d7cc983f29
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-06-25 13:33:19 +02:00 |
Jorge Penadés
|
8d921322c4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection
|
2024-06-25 13:32:39 +02:00 |
Carlos Satorres
|
c644abe571
|
Merge pull request '7406-workerFormation' (!405) from 7406-workerFormation into dev
Reviewed-on: verdnatura/salix-front#405
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-25 11:31:46 +00:00 |
Jorge Penadés
|
239cdd74b5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection
|
2024-06-25 13:27:50 +02:00 |
William Buezas
|
8e538fb463
|
WIP
|
2024-06-25 08:27:25 -03:00 |
Carlos Satorres
|
49b86672f5
|
Merge branch 'dev' into 7406-workerFormation
|
2024-06-25 11:18:05 +00:00 |
Alex Moreno
|
d55d6ec06e
|
Merge pull request 'master to test' (!483) from master into test
Reviewed-on: verdnatura/salix-front#483
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-25 11:17:10 +00:00 |
Jorge Penadés
|
e26ef0bf66
|
Merge pull request '#7578 add data-key attribute to CardSummary components' (!482) from 7578-hotfix-itemsWithName into master
Reviewed-on: verdnatura/salix-front#482
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-25 11:08:23 +00:00 |
Jorge Penadés
|
ff33923b7a
|
feat: refs #7578 add data-key attribute to CardSummary components
|
2024-06-25 12:49:54 +02:00 |
Javier Segarra
|
1eaa0c9ce2
|
perf: replace ItemPicture in favour of VnImg
|
2024-06-25 12:39:21 +02:00 |
Javier Segarra
|
0c42bba779
|
perf: remove ItemPicture
|
2024-06-25 12:39:05 +02:00 |
Javier Segarra
|
98510c1d38
|
Merge remote-tracking branch 'origin/6977-ClonedURL' into feature/TicketSale
|
2024-06-25 12:38:53 +02:00 |
Javier Segarra
|
54d7263d13
|
Merge remote-tracking branch 'origin/dev' into feature/TicketSale
|
2024-06-25 12:23:32 +02:00 |
Carlos Satorres
|
a705245783
|
refs #7406 fix pr
|
2024-06-25 12:18:02 +02:00 |
Jon Elias
|
2ab105dda5
|
feat: refs #6826 added rol summary link
|
2024-06-25 12:03:41 +02:00 |
Jorge Penadés
|
3c810254a4
|
fix: refs #7623 redirect
|
2024-06-25 11:40:07 +02:00 |
Javier Segarra
|
d10f6b4d6c
|
replace value sale.itemFk
|
2024-06-25 10:33:15 +02:00 |
Javier Segarra
|
5a66af341f
|
fix: state translations
|
2024-06-25 10:07:36 +02:00 |
Javier Segarra
|
ea7ee97867
|
proposals
|
2024-06-25 09:35:21 +02:00 |
Alex Moreno
|
86524fe9e2
|
Merge pull request '7631_testToMaster_2426' (!480) from 7631_testToMaster_2426 into master
Reviewed-on: verdnatura/salix-front#480
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
|
2024-06-25 06:40:04 +00:00 |
Alex Moreno
|
d421cefeb1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-06-25 07:32:17 +02:00 |
William Buezas
|
fb12d4ddc0
|
WIP
|
2024-06-24 17:24:36 -03:00 |
Jorge Penadés
|
cdf3a588af
|
fix: refs #7623 updating skip param
|
2024-06-24 16:55:09 +02:00 |
Jorge Penadés
|
9956561e4c
|
chore: refs #7300 wip: create reset function
|
2024-06-24 16:17:21 +02:00 |
William Buezas
|
91df35fcae
|
Ticket volume
|
2024-06-24 11:12:49 -03:00 |
William Buezas
|
17e9d95702
|
Ticket notes
|
2024-06-24 09:02:29 -03:00 |
Jorge Penadés
|
0765166423
|
fix: refs #7623 disable router update
|
2024-06-24 13:56:50 +02:00 |
Jorge Penadés
|
9169b793a9
|
fix: refs #7623 update add updateRoute prop in VnPaginate
|
2024-06-24 12:51:44 +02:00 |
Jon Elias
|
50d135f282
|
refactor: refs #6977 fix VnImg props
|
2024-06-24 09:20:47 +02:00 |
Jon Elias
|
da20abf34c
|
Merge branch '6977-ClonedURL' of https://gitea.verdnatura.es/verdnatura/salix-front into 6977-ClonedURL
|
2024-06-24 08:30:07 +02:00 |
Jon Elias
|
82cc844ddd
|
refactor: refs #6977 refactor VnImg
|
2024-06-24 08:30:06 +02:00 |
William Buezas
|
3d0cbcfd12
|
remove form model expose
|
2024-06-21 16:57:51 -03:00 |
William Buezas
|
3d9d41afcb
|
Add deep true
|
2024-06-21 16:55:33 -03:00 |
William Buezas
|
dfb67f6f2b
|
refactor
|
2024-06-21 16:51:29 -03:00 |
Jorge Penadés
|
0daf61608d
|
Merge pull request '#6238 show notes & create vnPopup' (!470) from 6238-addNotes into test
Reviewed-on: verdnatura/salix-front#470
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-06-21 13:49:22 +00:00 |
Javier Segarra
|
ec7b0c1416
|
Merge pull request '7323 # FIX Department descriptor and routerLink' (!435) from 7323_department_descriptor_routerLink into dev
Reviewed-on: verdnatura/salix-front#435
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-21 12:53:10 +00:00 |
Javier Segarra
|
01816613f2
|
Merge branch 'dev' into 7323_department_descriptor_routerLink
|
2024-06-21 12:50:14 +00:00 |
Javier Segarra
|
d083319f34
|
Merge pull request 'Ticket log' (!465) from hyervoni/salix-front-mindshore:feature/TicketLog into dev
Reviewed-on: verdnatura/salix-front#465
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-21 12:49:46 +00:00 |
William Buezas
|
5cf183607d
|
WIP
|
2024-06-21 09:20:03 -03:00 |
Jorge Penadés
|
44d762694a
|
fix: refs 6238 replace style
|
2024-06-21 13:53:35 +02:00 |
Jorge Penadés
|
606c629d77
|
feat: refs #6238 function name
|
2024-06-21 13:47:42 +02:00 |
Jorge Penadés
|
bebb20c76f
|
fix: refs 6238 drop locale
|
2024-06-21 13:07:43 +02:00 |
Jorge Penadés
|
891c0d2347
|
feat: refs 6238 show notes & create vnPopup
|
2024-06-21 13:05:28 +02:00 |
Javier Segarra
|
63b8ca46a3
|
Merge branch 'dev' into feature/TicketLog
|
2024-06-21 11:33:29 +02:00 |
Javier Segarra
|
febc7f1f46
|
fix: notify icon style
|
2024-06-21 11:33:14 +02:00 |
Javier Segarra
|
9ce49bf108
|
fix: TravelLog
|
2024-06-21 11:31:09 +02:00 |
Alex Moreno
|
961c8140af
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-06-21 10:53:57 +02:00 |
Jorge Penadés
|
93407d8219
|
Merge pull request '#6243 show rightPanel' (!468) from 6243-warmfix-showRightPanel into test
Reviewed-on: verdnatura/salix-front#468
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-21 08:52:56 +00:00 |
Carlos Satorres
|
9d38c1ff1c
|
Merge pull request 'refs #6504 fix formModel claimFilter claimCard' (!464) from 6504-fixCardClaim into dev
Reviewed-on: verdnatura/salix-front#464
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-06-21 08:51:12 +00:00 |