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

9106 Commits

Author SHA1 Message Date
PAU ROVIRA ROSALENY 71daac1c9d Merge pull request 'feat: #7077 created test for VnInputTime' (!1163) from 7077-testVnInputTime into dev 
Reviewed-on: verdnatura/salix-front#1163
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-16 08:24:02 +00:00
Javi Gallego 8c7747999d feat: refs #8381 add toCelsius filter and update temperature fields in entry forms and summaries 2025-01-16 09:09:05 +01:00
Alex Moreno b5a1d05ff0 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceOutCardWithVnCardBeta 2025-01-16 08:11:06 +01:00
Alex Moreno b8c8610781 feat: refs #8316 parking inside shelving 2025-01-16 08:06:16 +01:00
Jon Elias 802df02581 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup 2025-01-16 08:02:03 +01:00
Alex Moreno b41d5f19dc fix: refs #8316 translations 2025-01-16 07:37:19 +01:00
Alex Moreno 885bd631ff Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-parkingCardWithVnCardBeta 2025-01-16 07:36:20 +01:00
Alex Moreno f645e8982c Merge branch '8316-parkingCardWithVnCardBeta' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-parkingCardWithVnCardBeta 2025-01-16 07:35:27 +01:00
Robert Ferrús 8182bf7b91 feat: refs #8398 modify previous changes 2025-01-16 07:29:37 +01:00
Alex Moreno a71da3a45d Merge branch 'dev' into update_quasar_version 2025-01-16 06:25:48 +00:00
PAU ROVIRA ROSALENY 8d508c82a0 Merge branch 'dev' into 7077-testVnInputTime 2025-01-16 06:18:40 +00:00
PAU ROVIRA ROSALENY f20c1f9422 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime 2025-01-16 07:18:07 +01:00
PAU ROVIRA ROSALENY 82e6cc0790 refactor: refs #7077 removed some comments 2025-01-16 07:18:05 +01:00
PAU ROVIRA ROSALENY 4b9453380a Merge pull request 'feat: #7087 created CardSummary test' (!1197) from 7087-testCardSummary into dev 
Reviewed-on: verdnatura/salix-front#1197
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-16 06:16:45 +00:00
PAU ROVIRA ROSALENY a0f7905983 Merge branch 'dev' into 7087-testCardSummary 2025-01-16 06:15:51 +00:00
PAU ROVIRA ROSALENY ce7e529776 Merge branch 'dev' into 7077-testVnInputTime 2025-01-16 06:15:36 +00:00
Javier Segarra 1befb353a9 Merge branch 'dev' into update_quasar_version 2025-01-16 06:12:01 +00:00
Javier Segarra 0da3bcdf40 Merge branch 'dev' into 7308_warning 2025-01-15 20:10:05 +00:00
Javier Segarra 2d8dd46d15 fix: remove console 2025-01-15 20:09:56 +00:00
Jorge Penadés 21958cfdb4 fix: catch mail err 2025-01-15 16:10:33 +01:00
Jose Antonio Tubau b5bdb975b8 test: refs #7075 add TODO for handling keydown behavior in VnInput component 2025-01-15 15:41:19 +01:00
Jose Antonio Tubau 80413eef3e refactor: refs #8316 moved localizations to local locale 2025-01-15 15:19:47 +01:00
PAU ROVIRA ROSALENY 0ee3aa12a3 Merge branch 'dev' into 8258-uppercaseInputs 2025-01-15 13:42:01 +00:00
Jose Antonio Tubau 36473d979b feat: refs #7322 add address selection for ticket transfer 2025-01-15 13:38:45 +01:00
Jon Elias d1be809b76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8120-CompactSummaryPopup 2025-01-15 12:55:20 +01:00
Alex Moreno c6d7008ed5 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1149) from 8316-orderCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1149
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-15 11:41:35 +00:00
Robert Ferrús 764eef13c3 feat: refs #8398 moveTicketsFuture 2025-01-15 12:32:46 +01:00
Alex Moreno a95f6f56bd fix: refs #8316 userFilter 2025-01-15 12:17:06 +01:00
Alex Moreno 3f3e8cfe42 Merge branch 'dev' into 8316-entryCardWithVnCardBeta 2025-01-15 11:11:49 +00:00
Alex Moreno a153dd8860 fix: refs #8316 use section-searchbar 2025-01-15 12:11:10 +01:00
Alex Moreno 3cef713058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:06:17 +01:00
Alex Moreno 56e0965499 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-15 12:05:38 +01:00
Alex Moreno a15d052589 Merge pull request '8197-fix_searchbar_teleport' (!1204) from 8197-fix_searchbar_teleport into test 
Reviewed-on: verdnatura/salix-front#1204
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-15 11:05:33 +00:00
Alex Moreno 7661f9e633 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-15 11:04:39 +00:00
Alex Moreno 9765066493 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:03:02 +01:00
Jon Elias 6724818ebe Merge pull request '#8247: Fixed acls and added lost options' (!1159) from 8247-EnableAccount into dev 
Reviewed-on: verdnatura/salix-front#1159
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-15 10:53:10 +00:00
Jon Elias c193ce33f6 Merge branch 'dev' into 8247-EnableAccount 2025-01-15 10:51:33 +00:00
Alex Moreno 7e0096cf30 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 11:50:11 +01:00
Alex Moreno 4c7a35f142 refactor: refs #8316 unify router item and itemType 2025-01-15 10:38:16 +01:00
Robert Ferrús 0b9788d38b feat: refs #8387 changes 2025-01-15 10:33:49 +01:00
PAU ROVIRA ROSALENY 979353119a refactor: refs #7087 removed unused imports 2025-01-15 09:56:43 +01:00
PAU ROVIRA ROSALENY 01b6e94008 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime 2025-01-15 09:56:01 +01:00
PAU ROVIRA ROSALENY 6a88cad903 fix: refs #7077 removed unused imports 2025-01-15 09:55:59 +01:00
PAU ROVIRA ROSALENY 46bfd3b115 Merge branch 'dev' into 7077-testVnInputTime 2025-01-15 08:54:58 +00:00
Jon Elias 1f76d572ce Merge pull request 'Hotfix[CustomerDescriptor]: Fixed icons in descriptor' (!1217) from Hotfix-CustomerDescriptorIcons into master 
Reviewed-on: verdnatura/salix-front#1217
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-15 08:23:56 +00:00
Jon Elias 387c3c7649 Merge branch 'master' into Hotfix-CustomerDescriptorIcons 2025-01-15 08:22:56 +00:00
PAU ROVIRA ROSALENY 76968fe6bd fix: refs #7087 fixed some tests 2025-01-15 09:01:37 +01:00
PAU ROVIRA ROSALENY 8e4a92b6be Merge branch 'dev' into 7087-testCardSummary 2025-01-15 07:58:00 +00:00
PAU ROVIRA ROSALENY d435a44faa Merge branch '7087-testCardSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary 2025-01-15 08:55:19 +01:00
PAU ROVIRA ROSALENY 6ecbaf1a04 Merge branch '7087-testCardSummary' of https: refs #7087//gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary 2025-01-15 08:55:16 +01:00