Pablo Natek
|
af6a20729b
|
fix: refs #7129 fixFilters
|
2024-07-22 09:12:56 +02:00 |
Guillermo Bonet
|
0a431ef5cb
|
Merge branch 'test' into dev
|
2024-07-22 08:20:16 +02:00 |
Guillermo Bonet
|
580777af65
|
Deleted repeated labeler i18n
|
2024-07-22 08:20:08 +02:00 |
Jon Elias
|
02e1de083a
|
fix: duplicate key
|
2024-07-19 15:00:05 +02:00 |
Jon Elias
|
eb2df02ad6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7717_fixOrderCatalog
|
2024-07-19 14:55:09 +02:00 |
Jon Elias
|
7f376c8ea4
|
fix: refs #7717 fix catalog filter, searchbar redirect and search
|
2024-07-19 14:53:44 +02:00 |
Guillermo Bonet
|
76517d102d
|
Merge branch 'test' into dev
|
2024-07-19 13:09:19 +02:00 |
Guillermo Bonet
|
c5903e29e8
|
Merge branch 'master' into test
|
2024-07-19 13:08:41 +02:00 |
Guillermo Bonet
|
50c8b3c672
|
fix: refs #7648 Fix order property
|
2024-07-19 13:07:30 +02:00 |
Javier Segarra
|
a0350fe5e4
|
Merge pull request '7648_myEntries' (!555) from 7648_myEntries into master
Reviewed-on: verdnatura/salix-front#555
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-07-19 10:28:36 +00:00 |
Javier Segarra
|
569b86c2c1
|
Merge branch 'master' into 7648_myEntries
|
2024-07-19 10:27:57 +00:00 |
Jon Elias
|
1589e51a4f
|
Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End
|
2024-07-19 12:11:01 +02:00 |
Jon Elias
|
e60f846464
|
refactor: refs #7354 fix tableFilters
|
2024-07-19 12:11:00 +02:00 |
Alex Moreno
|
1de9462003
|
Merge branch 'dev' into 7547-accessToken-security
|
2024-07-19 07:50:06 +00:00 |
Javier Segarra
|
bcde62afb5
|
Merge branch 'dev' into 6943-fixCustomer
|
2024-07-19 07:41:55 +00:00 |
Jon Elias
|
daa4a41f09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End
|
2024-07-19 09:25:28 +02:00 |
Jon Elias
|
30dbfc88b3
|
Merge pull request '#7323 End Worker migration' (!535) from 7323_WorkerMigration_End into dev
Reviewed-on: verdnatura/salix-front#535
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-07-19 07:22:42 +00:00 |
Javier Segarra
|
55c8de78fc
|
perf: VnFilterPanel
|
2024-07-19 09:20:33 +02:00 |
Jon Elias
|
89aa987c58
|
Merge branch 'dev' into 7323_WorkerMigration_End
|
2024-07-19 06:20:57 +00:00 |
Jon Elias
|
26cdae2384
|
refactor: refs #7323 hidden column filter proposal
|
2024-07-19 08:18:41 +02:00 |
Alex Moreno
|
dbe56fa3a0
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-07-19 08:02:58 +02:00 |
Alex Moreno
|
bcf4f34862
|
Merge pull request '6825-fix_vnSelectCache_and_autoload' (!557) from 6825-fix_vnSelectCache_and_autoload into test
Reviewed-on: verdnatura/salix-front#557
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-07-19 06:01:56 +00:00 |
Alex Moreno
|
9b1636355d
|
fix: customerNotifications filter
|
2024-07-19 07:58:34 +02:00 |
Jon Elias
|
6f6ab74220
|
Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End
|
2024-07-19 07:42:59 +02:00 |
Jon Elias
|
f171774605
|
fix: refs #7323 fixed left filter
|
2024-07-19 07:42:58 +02:00 |
Javier Segarra
|
7cbc52d700
|
Merge branch 'dev' into 7671_dense_itemFixedPrices
|
2024-07-18 15:21:01 +02:00 |
Javier Segarra
|
7cbdf0d98b
|
feat: fix bugs and filters
|
2024-07-18 15:20:44 +02:00 |
Alex Moreno
|
3fe566796b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer
|
2024-07-18 14:01:28 +02:00 |
Alex Moreno
|
f8026dd3f6
|
feat: improve VnSelectCache add find by Object
|
2024-07-18 13:54:22 +02:00 |
Alex Moreno
|
5833b4d856
|
fix(VnTable): autoload when has url parameters
|
2024-07-18 13:53:57 +02:00 |
Jon Elias
|
4495223735
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End
|
2024-07-18 13:03:53 +02:00 |
Jon Elias
|
f4fa9b3c1f
|
Merge branch 'dev' into 7323_WorkerMigration_End
|
2024-07-18 10:14:26 +00:00 |
Jon Elias
|
4a544b0b6c
|
Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End
|
2024-07-18 12:13:39 +02:00 |
Jon Elias
|
901a9e1f6d
|
fix: refs #7323 fix department & email table filter
|
2024-07-18 12:13:38 +02:00 |
Jon Elias
|
81121833c6
|
Merge pull request '#7356 End Tickets migration' (!556) from 7356_TicketMigration_End into dev
Reviewed-on: verdnatura/salix-front#556
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-07-18 10:10:37 +00:00 |
Jon Elias
|
108375bb69
|
perf: refs #7356 TicketList state column
|
2024-07-18 12:05:10 +02:00 |
Jon Elias
|
c36e2cd3c9
|
Merge branch '7356_TicketMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End
|
2024-07-18 10:53:46 +02:00 |
Jon Elias
|
78e074d2fb
|
refactor: refs #7356 requested changes
|
2024-07-18 10:53:44 +02:00 |
Javier Segarra
|
b24c7b0352
|
Merge branch 'dev' into 7671_dense_itemFixedPrices
|
2024-07-18 10:21:42 +02:00 |
Alex Moreno
|
b2520a238e
|
Merge branch '6943-fixCustomer' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer
|
2024-07-18 08:31:24 +02:00 |
Alex Moreno
|
08e170bc17
|
unnecessary test
|
2024-07-18 08:31:23 +02:00 |
Alex Moreno
|
71d6e57ea5
|
Merge branch 'dev' into 6943-fixCustomer
|
2024-07-18 06:26:19 +00:00 |
Alex Moreno
|
83596daf76
|
fix: customerDefaulter correct functionality
|
2024-07-18 08:19:08 +02:00 |
Javier Segarra
|
ac89c4f328
|
Merge branch 'dev' into 7323_WorkerMigration_End
|
2024-07-18 05:49:58 +00:00 |
Javier Segarra
|
359c44dc08
|
Merge branch 'dev' into 7356_TicketMigration_End
|
2024-07-17 18:59:36 +00:00 |
Javier Segarra
|
beb3eb96e6
|
Merge branch 'dev' into 7354_ZoneMigration_End
|
2024-07-17 18:57:34 +00:00 |
Javier Segarra
|
ebf329bfc6
|
feat: addRow withour dialog
|
2024-07-17 20:33:55 +02:00 |
Jon Elias
|
b2b613a1d4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End
|
2024-07-17 14:58:25 +02:00 |
Alex Moreno
|
ea5fef9d7f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
|
2024-07-17 14:19:25 +02:00 |
Alex Moreno
|
1c006a278e
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
|
2024-07-17 14:19:08 +02:00 |