Javier Segarra
|
d4053d74d2
|
Merge pull request '#8006 - eslint_rules' (!1454) from 8006_eslint_rules into dev
Reviewed-on: #1454
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-04-07 10:02:42 +00:00 |
Javier Segarra
|
eb5a0956a7
|
Merge branch 'dev' into 8006_eslint_rules
|
2025-04-07 09:41:33 +00:00 |
Alex Moreno
|
830f506f5b
|
fix: adjust Cypress parallel test execution to run with a single instance
|
2025-04-07 11:06:02 +02:00 |
Alex Moreno
|
a3d828498b
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2025-04-04 11:36:25 +02:00 |
Alex Moreno
|
4f821c86c1
|
fix: warnings
|
2025-04-04 11:35:53 +02:00 |
Jon Elias
|
4857962955
|
Merge pull request 'Warmfix[CardSumary]: Use ellipsis property and fixed summary cards to flex correctly' (!1670) from Fix-SummaryCardsFlex into test
Reviewed-on: #1670
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-04-04 09:07:37 +00:00 |
Jon Elias
|
624eac7094
|
Merge branch 'Fix-SummaryCardsFlex' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-SummaryCardsFlex
|
2025-04-04 10:45:36 +02:00 |
Jon Elias
|
f50f747310
|
fix: skip failing e2e
|
2025-04-04 10:45:34 +02:00 |
Jon Elias
|
5110a46328
|
Merge branch 'test' into Fix-SummaryCardsFlex
|
2025-04-04 07:52:38 +00:00 |
Javier Segarra
|
bcee01280c
|
Merge branch 'warmfix_vnLinkPhone' into test
|
2025-04-04 09:51:46 +02:00 |
Javier Segarra
|
3c4c27889e
|
fix: correct data-cy for SendEmailNotificationDialogInput
|
2025-04-04 09:50:37 +02:00 |
Javier Segarra
|
b7625f06bd
|
Merge branch 'warmfix_ticketList_sortByShipped' into test
|
2025-04-04 09:50:02 +02:00 |
Jon Elias
|
5eee9965bf
|
Merge branch 'Fix-SummaryCardsFlex' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-SummaryCardsFlex
|
2025-04-04 08:51:03 +02:00 |
Jon Elias
|
e5f079121d
|
refactor: undo skip due to its fix in other PR
|
2025-04-04 08:51:01 +02:00 |
Jon Elias
|
a5d3babf1f
|
Merge branch 'test' into Fix-SummaryCardsFlex
|
2025-04-04 06:23:39 +00:00 |
Jon Elias
|
f32d07ccaa
|
fix: skip test
|
2025-04-04 07:44:36 +02:00 |
Jon Elias
|
1f5e4bd771
|
perf: use grid template instead of flex in card-group
|
2025-04-04 06:58:24 +02:00 |
Javier Segarra
|
1a7a8dfc95
|
fix: add 'hour' translation to English locale for ticket list
|
2025-04-03 20:10:05 +02:00 |
Javier Segarra
|
21c3384509
|
fix: use optional chaining for departmentFk in useRole composable
|
2025-04-03 20:07:54 +02:00 |
Javier Segarra
|
2992ac2d0d
|
fix: rename 'shipped' to 'shippedDate' and 'shippedHour'
|
2025-04-03 20:06:31 +02:00 |
Javier Segarra
|
9b337062c8
|
Merge branch 'test' into warmfix_vnLinkPhone
|
2025-04-03 05:38:38 +00:00 |
Alex Moreno
|
6ef3df2322
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2025-04-03 07:18:44 +02:00 |
Alex Moreno
|
e9ef1c308e
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2025-04-03 07:18:37 +02:00 |
Javier Segarra
|
e5005d08ed
|
Merge branch 'dev' into 8006_eslint_rules
|
2025-04-02 22:33:45 +00:00 |
Jon Elias
|
7ef02c8797
|
refactor: deleted unnecessary code
|
2025-04-02 16:18:48 +02:00 |
Jorge Penadés
|
20ed8001bf
|
Merge pull request 'test: refs #8441 enable invoice deletion test in invoiceInDescriptor.spec.js' (!1671) from 8441-warmfix-includeTest into test
Reviewed-on: #1671
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-04-02 14:10:26 +00:00 |
Jorge Penadés
|
c700521b37
|
Merge pull request 'fix: refs #5835 update icon for invoice button in InvoiceInDescriptor' (!1676) from 5835-hotfix-icon into master
Reviewed-on: #1676
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
|
2025-04-02 14:06:43 +00:00 |
Jorge Penadés
|
b2ce75d2f6
|
fix: refs #5835 update icon for invoice button in InvoiceInDescriptor
|
2025-04-02 15:54:55 +02:00 |
Jorge Penadés
|
a5b27b3683
|
Merge branch 'test' into 8441-warmfix-includeTest
|
2025-04-02 13:49:36 +00:00 |
Jorge Penadés
|
daa3289b58
|
Merge pull request 'refactor: refs #8326 conditionally render vn-card-content based on advancedSummary' (!1668) from 8326-warmfix-preventNull into test
Reviewed-on: #1668
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-04-02 13:26:48 +00:00 |
Jorge Penadés
|
8c132298bb
|
Merge pull request 'fix: refs #5835 update ticket references to invoices in InvoiceInDescriptor and localization files' (!1674) from 5835-hotfix-changeLocale into master
Reviewed-on: #1674
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-04-02 13:11:10 +00:00 |
Jorge Penadés
|
e444828e4e
|
Merge branch 'test' into 8326-warmfix-preventNull
|
2025-04-02 13:01:29 +00:00 |
Jorge Penadés
|
ce72c78af7
|
Merge branch 'test' into 8441-warmfix-includeTest
|
2025-04-02 13:01:15 +00:00 |
Alex Moreno
|
a472e35bcf
|
Merge pull request 'fix: refs #8449 reset pagination in VnLog and bind all attributes in AccountDescriptorProxy' (!1673) from 8449-fixes_2 into test
Reviewed-on: #1673
|
2025-04-02 13:01:01 +00:00 |
Jorge Penadés
|
832646638b
|
fix: refs #5835 update ticket references to invoices in InvoiceInDescriptor and localization files
|
2025-04-02 14:50:17 +02:00 |
Jorge Penadés
|
cf05dc0d5b
|
Merge branch 'test' into 8441-warmfix-includeTest
|
2025-04-02 12:44:13 +00:00 |
Jorge Penadés
|
5afc9ce983
|
Merge branch 'test' into 8326-warmfix-preventNull
|
2025-04-02 12:43:56 +00:00 |
Alex Moreno
|
00ed955577
|
fix: refs #8449 reset pagination in VnLog and bind all attributes in AccountDescriptorProxy
|
2025-04-02 14:39:23 +02:00 |
Javier Segarra
|
a780786a2c
|
style: select needs filled
|
2025-04-02 14:27:07 +02:00 |
Alex Moreno
|
00e1e4441c
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2025-04-02 14:21:02 +02:00 |
Alex Moreno
|
6fd01a4d09
|
fix: remove duplicate departmentFk entries in CustomerFilter.vue
|
2025-04-02 14:20:58 +02:00 |
Alex Moreno
|
a4b710352d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2025-04-02 14:18:19 +02:00 |
Alex Moreno
|
4821390f22
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2025-04-02 14:18:12 +02:00 |
Pablo Natek
|
8b24874f72
|
Merge pull request 'refactor: improve layout and styling in ExtraCommunity.vue' (!1669) from warmFixExtraComunityFieldsDisplay into test
Reviewed-on: #1669
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2025-04-02 12:18:08 +00:00 |
Alex Moreno
|
425e2adcdb
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2025-04-02 14:17:44 +02:00 |
Javier Segarra
|
d7866f9bdb
|
build: refs #8006 disable no-void off
|
2025-04-02 12:54:07 +02:00 |
Pablo Natek
|
6debb64b2b
|
test: skip VnShortcuts and WorkerList test suites
|
2025-04-02 12:52:51 +02:00 |
Javier Segarra
|
4bdd8a6494
|
build: refs #8006 disable no-void off
|
2025-04-02 12:49:49 +02:00 |
Javier Segarra
|
9989e752bc
|
build: refs #8006 disable no-void off
|
2025-04-02 12:47:51 +02:00 |
Javier Segarra
|
d3848a2343
|
build: refs #8006 disable no-void off
|
2025-04-02 12:46:09 +02:00 |