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

493 Commits

Author SHA1 Message Date
Javier Segarra a56dc7aa08 test: fix test 2024-09-13 10:33:08 +02:00
Javier Segarra 5796bc9c0a fix: emit:updateModelValue 2024-09-13 10:32:40 +02:00
Jorge Penadés 58be11df04 chore: refs #7828 fix e2e 2024-09-13 10:13:03 +02:00
Javier Segarra 025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-13 09:27:38 +02:00
Alex Moreno 0dbcc4be3d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-13 08:57:27 +02:00
Alex Moreno f731e4f1a6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-13 08:57:14 +02:00
Jon Elias ed5987630f Merge branch 'dev' into 6346-fixWagonModule 2024-09-13 06:14:05 +00:00
Jorge Penadés 5907fedcd6 fix: refs #7524 test 2024-09-12 17:49:59 +02:00
Pablo Natek e2dbe0fd38 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-12 09:09:21 +02:00
Jorge Penadés 2d5602e784 Merge branch 'dev' into 7663-setWeight 2024-09-11 07:40:36 +00:00
Pablo Natek c7e717c611 feat: refs #7404 add travel m3 to reserves form 2024-09-11 07:55:12 +02:00
Jorge Penadés f9adc49284 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-10 09:41:34 +02:00
Jorge Penadés 3fafb15eb8 refactor: refs #4074 use fn 2024-09-10 09:18:57 +02:00
Jorge Penadés f7975069d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls 2024-09-10 08:59:01 +02:00
Jon Elias b4fb9ceb2e Merge branch 'dev' into 6346-fixWagonModule 2024-09-10 06:29:51 +00:00
Alex Moreno 3164209bef Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-10 08:13:56 +02:00
Jon Elias 6790067a89 Merge branch 'dev' into 6346-fixWagonModule 2024-09-10 06:02:18 +00:00
Jon Elias 4786a0e277 Merge branch 'dev' into 7889-KeyShortcuts 2024-09-10 04:45:24 +00:00
Jorge Penadés 04aa96b798 chore: refs #4074 fix tests 2024-09-09 17:01:36 +02:00
Jorge Penadés bd00f86d74 chore: refs #4074 fix tests 2024-09-09 14:09:29 +02:00
Jon Elias f78ca3f357 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-09-09 10:04:44 +02:00
Jon Elias 2bd80b2ee7 perf: refs #7889 perf shortcut test 2024-09-09 09:45:30 +02:00
Jon Elias de08ae81a3 Merge branch '7889-KeyShortcuts' of https://gitea.verdnatura.es/verdnatura/salix-front into 7889-KeyShortcuts 2024-09-09 08:47:47 +02:00
Jon Elias ba7497f055 fix: refs #7889 fixed shortcut test 2024-09-09 08:47:44 +02:00
Jon Elias 459551b16e Merge branch 'dev' into 7889-KeyShortcuts 2024-09-09 05:30:14 +00:00
Pablo Natek e083d6a802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-08 07:54:26 +02:00
Javier Segarra 0c1cd47d38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-07 16:38:06 +02:00
Jorge Penadés 6f98f24926 chore: refs #7663 add test 2024-09-06 11:55:39 +02:00
Javier Segarra e592a76946 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices 2024-09-06 10:42:07 +02:00
Jon Elias ef98f60486 refactor: refs #7889 modified shortcut and dashboard, and added tootlip in LeftMenu 2024-09-06 10:30:32 +02:00
Jorge Penadés f0351b0417 chore: refs #7323 worker changes 2024-09-06 09:05:29 +02:00
Jorge Penadés fc5eb20dba chore: refs #7663 create test wip 2024-09-05 08:56:38 +02:00
Pablo Natek 3dc720e2d0 feat: refs #7404 add m3 and fix detail 2024-09-04 14:40:36 +02:00
Jorge Penadés a5887114ef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-hotfix-fineTunning 2024-09-03 12:50:35 +02:00
Pablo Natek 2fb974af0f Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-03 08:01:19 +02:00
Jorge Penadés b42385d7d6 refactor: refs #6900 create new expense form 2024-09-02 16:47:54 +02:00
Jon Elias 8ffbe400d5 refactor: refs #7354 modified VnInputTime 2024-09-02 14:21:58 +02:00
Jon Elias 127d5c9fd3 Merge branch '7354_ZoneMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-09-02 13:44:26 +02:00
Jon Elias ea1e82939a fix: refs #7354 e2e tests 2024-09-02 13:44:25 +02:00
Jon Elias 1af4a559fc Merge branch 'dev' into 7354_ZoneMigration_End 2024-09-02 10:50:22 +00:00
Javier Segarra fb15e90f0b Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-02 09:48:48 +02:00
Javier Segarra ceec78da17 test: ticketDescriptorMenu 2024-08-27 10:27:51 +02:00
Javier Segarra 2ae482ff8c Merge branch 'test' into dev 2024-08-27 09:38:12 +02:00
Jorge Penadés fd09a6bfbe fix: refs #7323 test 2024-08-21 16:36:45 +02:00
Javier Segarra 9086735aa1 test: fix routeList 2024-08-20 08:22:20 +02:00
Alex Moreno 93a56b036a Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-16 09:47:49 +00:00
Alex Moreno 2bea46b601 fix: test 2024-08-16 11:47:32 +02:00
Jon Elias 95cda2bad7 Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-14 13:10:25 +00:00
Alex Moreno a8f550fcc8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-14 13:39:54 +02:00
Jon Elias 926fba27b8 Merge branch 'dev' into 7354_ZoneMigration_End 2024-08-14 08:45:37 +00:00
Jorge Penadés 32fdec2fae feat: refs #7323 improve test 2024-08-14 10:08:31 +02:00
Javier Segarra 3e44c6e404 Merge branch 'dev' into 7677_vnLocation_perf 2024-08-14 08:01:26 +02:00
Alex Moreno fdb508de97 delete cy.logs 2024-08-13 16:31:34 +02:00
Jon Elias 0e9739f2a5 refactor: refs #7354 refactor zones section and fixed e2e tests 2024-08-13 14:39:50 +02:00
Alex Moreno e88e7fa9db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-13 12:25:47 +02:00
Alex Moreno b828fd35b7 test: add two factor e2e 2024-08-13 12:25:46 +02:00
Alex Moreno dc1accff7a test: add recover and reset password e2e 2024-08-13 12:25:37 +02:00
Jorge Penadés d276436bb3 chore: refs #7323 fix test 2024-08-13 10:42:15 +02:00
Jon Elias 9387082fc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-12 10:35:55 +02:00
Jorge Penadés bf11a184c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 12:34:04 +02:00
Jorge Penadés 7a2170e7c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemSectionsMigration 2024-08-09 12:12:59 +02:00
Jorge Penadés a9e8621903 chore: refs #6900 fix e2e tests 2024-08-09 10:47:15 +02:00
Alex Moreno 1512801f02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-08 12:52:55 +02:00
Alex Moreno ea8aca29a6 fix(twoFactor): unify code login and twoFactor 2024-08-08 12:33:26 +02:00
Alex Moreno ce878b5201 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-08 07:43:58 +02:00
Jorge Penadés 06eac739cd chore: refs #7323 fix test 2024-08-07 12:57:00 +02:00
Alex Moreno c2e59856df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-08-07 11:54:55 +02:00
Jorge Penadés 1411833a4c chore: refs #7283 fix e2e logout 2024-08-06 09:51:22 +02:00
Pablo Natek f2be2b4300 fea: stockBought add form and formDetail 2024-08-05 15:42:57 +02:00
Alex Moreno 2ad72c3209 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-31 08:01:44 +02:00
Alex Moreno f4347411ab test: add better test to vnLocation 2024-07-30 10:01:16 +02:00
Alex Moreno 9179e13dcd fix: vnLocation 2024-07-29 15:03:21 +02:00
Jorge Penadés a7af5d43a2 fix: refs #6891 worker tests 2024-07-29 10:10:34 +02:00
Jorge Penadés 5705904e40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-07-29 08:04:51 +02:00
Guillermo Bonet 7b13250a16 Merge branch 'test' into dev 2024-07-26 13:57:11 +02:00
Javier Segarra 6bba14cac9 test: e2e fixed 2024-07-25 14:31:31 +02:00
Jon Elias 8ceee6f182 fix: fix conflicts 2024-07-25 07:06:27 +02:00
Javier Segarra 3a0204d27b feat: vnLocation changes 2024-07-24 14:58:51 +02:00
Alex Moreno 4d8ba2bca0 Merge branch 'dev' into 6943-fixCustomer 2024-07-24 05:52:29 +00:00
Javier Segarra 6c7509856e Merge branch 'dev' into 7014-RefactorQDrawer 2024-07-23 21:08:56 +00:00
Javier Segarra 2c0b215023 Merge branch 'dev' into 6943-fixCustomer 2024-07-23 18:44:08 +00:00
Alex Moreno e6709db3a2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-23 14:46:44 +02:00
Jon Elias a7a1b7801c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-07-23 13:25:58 +02:00
Jon Elias 12370b6437 feat: refs #6346 new wagon type section 2024-07-23 13:22:54 +02:00
Jon Elias 7ce05406cc fix: refs #7014 fix tests 2024-07-23 10:55:30 +02:00
Jon Elias 67275e435e refactor: refs #7014 refactor ZoneCard, deleted ZoneMain & created basic tests for functionality 2024-07-23 10:38:45 +02:00
Jon Elias 18dac38fb2 Merge branch '7014-RefactorQDrawer' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-07-23 09:14:14 +02:00
Pablo Natek 5f0c4fea3c feat: refs #7129 add e2e 2024-07-22 13:19:41 +02: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 4495223735 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7354_ZoneMigration_End 2024-07-18 13:03:53 +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
Javier Segarra 7662e1a9a1 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-17 11:45:31 +02:00
Jon Elias 9e78d30a4c Merge branch dev of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-17 07:45:24 +02:00
Alex Moreno f01e6d74f8 test: better command if is date 2024-07-16 10:42:35 +02:00
Javier Segarra 2620fd2d94 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-07-16 09:23:18 +02:00
Alex Moreno 39bf7e55c0 fix: e2e 2024-07-15 13:11:24 +02:00
Jon Elias 94aa3bc7a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-15 12:47:59 +02:00
Jon Elias c016e96904 fix: refs #7354 fix VnSearchbar search for zone section & finished basic tests 2024-07-15 10:44:28 +02:00