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

4511 Commits

Author SHA1 Message Date
Jorge Penadés f6f5c2c085 Merge pull request '#6449 update vnLog' (!284) from 6449-updateVnLog into dev 
Reviewed-on: verdnatura/salix-front#284
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 08:52:08 +00:00
Jorge Penadés 2156692804 Merge branch 'dev' into 6449-updateVnLog 2024-07-03 08:39:11 +00:00
Alex Moreno eeaf7d00e2 Merge pull request 'refs #7366 VnTable' (!489) from 7366-travelMigration2 into dev 
Reviewed-on: verdnatura/salix-front#489
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 08:32:57 +00:00
Alex Moreno 1463cc8904 Merge branch 'dev' into 7366-travelMigration2 2024-07-03 08:32:00 +00:00
Pablo Natek 6f21e165a2 Merge pull request '7404-add-e2e-to-route' (!516) from 7404-add-e2e-to-route into dev 
Reviewed-on: verdnatura/salix-front#516
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 08:31:37 +00:00
Carlos Satorres 27876b0bab Merge branch 'dev' into 7366-travelMigration2 2024-07-03 08:30:56 +00:00
Pablo Natek 5b98e968ed remove: refs #7404 remove comments 2024-07-03 10:27:11 +02:00
Carlos Satorres 352580270b refs #6989 fix reload 2024-07-03 10:25:21 +02:00
Pablo Natek 29c4b1bcb8 Merge branch '7404-add-e2e-to-route' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-add-e2e-to-route 2024-07-03 10:20:58 +02:00
Pablo Natek 937167ce95 remove: refs #7404 remove traductions 2024-07-03 10:19:47 +02:00
Carlos Satorres 94680a6c2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-07-03 10:07:34 +02:00
Pablo Natek f15fc0d6a7 Merge branch 'dev' into 7404-add-e2e-to-route 2024-07-03 08:07:15 +00:00
Pablo Natek 7d8f9d4072 fix: refs #7404 fix create 2024-07-03 10:06:54 +02:00
Carlos Satorres dff77277ac refs #6897 fix summary, list, inputs 2024-07-03 10:05:05 +02:00
Jon Elias cd36055ad1 Merge pull request '#7543 standardize descriptors' (!486) from 7543-StandarizeDescriptors into dev 
Reviewed-on: verdnatura/salix-front#486
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-03 07:58:55 +00:00
Jon Elias f8d263c347 Merge branch 'dev' into 7543-StandarizeDescriptors 2024-07-03 07:52:35 +00:00
Pablo Natek a192c1e994 remove: refs #7404 remove spec 2024-07-03 09:39:49 +02:00
Carlos Satorres dc9463f249 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-07-03 09:38:37 +02:00
Pablo Natek 11266b602c refactor: refs #7404 route list add table 2024-07-03 09:33:48 +02:00
Pablo Natek 61bd1eaf04 merge dev 2024-07-03 09:33:04 +02:00
Jorge Penadés 79694b9d0c Merge branch 'dev' into 6449-updateVnLog 2024-07-03 07:15:16 +00:00
Jorge Penadés 0fd53872d0 Merge pull request '#7652 fix pagination' (!503) from 7652-fixPagination into dev 
Reviewed-on: verdnatura/salix-front#503
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 07:11:27 +00:00
Jorge Penadés df55246a4a Merge branch 'dev' into 7652-fixPagination 2024-07-03 07:10:13 +00:00
Alex Moreno 9e042112ff Merge pull request '#6917 - inputDate_inpuTime' (!498) from 6917-inputDate_inpuTime into dev 
Reviewed-on: verdnatura/salix-front#498
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-03 06:52:47 +00:00
Alex Moreno 6ac4649210 Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-03 06:51:38 +00:00
Jon Elias 081d3dc3c3 Merge pull request '#6151 fixed filters' (!497) from 6151-FixOrderModule into dev 
Reviewed-on: verdnatura/salix-front#497
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-03 06:50:18 +00:00
Alex Moreno 4272990a7a Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-03 06:48:59 +00:00
Carlos Satorres b40e3f2c7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-entryMigration2 2024-07-03 08:48:33 +02:00
Jon Elias 467ec08f3e Merge branch 'dev' into 6151-FixOrderModule 2024-07-03 06:48:33 +00:00
Carlos Satorres 21d5d6b986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration2 2024-07-03 08:46:05 +02:00
Carlos Satorres ad2265fe7c refs #7366 fix travel migration 2024-07-03 08:43:23 +02:00
Javier Segarra 69a395c61f Merge pull request '7648 - CustomerView labeler' (!505) from 7648_dev_customerEntries into dev 
Reviewed-on: verdnatura/salix-front#505
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-07-03 06:39:03 +00:00
Javier Segarra f46443ee69 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:33:33 +02:00
Javier Segarra d15dc7336b Merge branch 'dev' into 7648_dev_customerEntries 2024-07-03 08:26:27 +02:00
Jon Elias e114bd7523 Merge branch '7543-StandarizeDescriptors' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 08:20:18 +02:00
Jon Elias 363abb899f fix: refs #7543 fix changed descriptors 2024-07-03 08:20:16 +02:00
Jon Elias e13f98dffb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 07:12:07 +02:00
Jon Elias 0d4ba3bf27 Merge pull request '#7030 translation proposal' (!458) from 7030-FixTranslations into dev 
Reviewed-on: verdnatura/salix-front#458
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-07-03 05:06:53 +00:00
Jon Elias d5b934a239 Merge branch 'dev' into 7030-FixTranslations 2024-07-03 05:06:01 +00:00
Javier Segarra 147d17301f remove unnussed tags 2024-07-03 01:50:45 +02:00
Javier Segarra dbbc8a4de6 test: change user 2024-07-03 01:48:06 +02:00
Javier Segarra 7e374c258e test: test:e2e 2024-07-03 01:47:14 +02:00
Javier Segarra 0dcd2a861b Merge branch 'dev' into 7543-StandarizeDescriptors 2024-07-02 18:59:43 +00:00
Javier Segarra e70162d342 Merge branch 'dev' into 6917-inputDate_inpuTime 2024-07-02 18:42:29 +00:00
Javier Segarra 5c2c9d0805 perf: change field column 2024-07-02 20:41:37 +02:00
Javier Segarra 8a94701422 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:32:08 +02:00
Jorge Penadés 1c5583f439 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-02 16:08:04 +02:00
Jorge Penadés 96a3298280 Merge branch 'dev' into 7652-fixPagination 2024-07-02 14:04:19 +00:00
Javier Segarra 07f76de8b7 Merge pull request 'feat(VnTable): add slots for columns' (!512) from 6825-vnTable-column-slots into dev 
Reviewed-on: verdnatura/salix-front#512
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-02 13:03:26 +00:00
Alex Moreno 6d12c0f00c feat(VnTable): add selected funcitionality 2024-07-02 15:01:43 +02:00