Commit Graph

6449 Commits

Author SHA1 Message Date
Jorge Penadés 6dd9029871 fix: refs #6900 improve logic 2024-08-14 14:27:54 +02:00
Alex Moreno 793001be6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7830-customerDesplegables 2024-08-14 13:40:49 +02:00
Alex Moreno 895441a8e4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 13:40:25 +02:00
Alex Moreno c7f53635d9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 13:40:13 +02:00
Alex Moreno a8f550fcc8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-08-14 13:39:54 +02:00
Jorge Penadés e07d573788 Merge branch 'test' into 6900-addSerial
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-14 10:13:39 +00:00
Jorge Penadés 7a27b9808f Merge pull request '#7323 warmfix' (!621) from 7323-warmfix-fixErrors into test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #621
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-08-14 09:02:27 +00:00
Alex Moreno dae71dacfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7830-customerDesplegables
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 10:49:11 +02:00
Jon Elias 926fba27b8 Merge branch 'dev' into 7354_ZoneMigration_End
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 08:45:37 +00:00
Jon Elias ed4bf3cfa8 refactor: refs #7354 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 10:44:45 +02:00
Jorge Penadés 9bb67511e6 fix: refs #7323 vnsubtoolbar css
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-14 10:34:42 +02:00
Alex Moreno bd83a959f7 fix: customer credit opinion 2024-08-14 10:11:52 +02:00
Jorge Penadés d7eb3af48d fix: refs #7323 add locale
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-14 10:10:22 +02:00
Jorge Penadés 32fdec2fae feat: refs #7323 improve test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-14 10:08:31 +02:00
Javier Segarra 9eff6b56ea fix: remove print variable
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 09:48:59 +02:00
Javier Segarra 8acd008f42 feat: handle newValue
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 09:47:27 +02:00
Javier Segarra 55b9cd9ff4 feat: handle same multiple CP 2024-08-14 09:18:24 +02:00
Jorge Penadés 30cadb5697 fix: refs #7323 use workerFilter
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-14 09:11:14 +02:00
Jon Elias 71068d3e62 Merge pull request 'Hotfix: InvoiceOut List and NegativeBases' (!615) from hotfix_InvoiceOut_List&NegativeBases into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #615
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-08-14 06:56:39 +00:00
Alex Moreno 07e4dca361 refactor(invoiceOutList): create dialog
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-08-14 08:55:18 +02:00
Javier Segarra 92130b4c9c WIP: 59262019 Merge pull request '#7283 finish item card sections' (!588) from 7283-itemSectionsMigration into dev 2024-08-14 08:09:27 +02:00
Javier Segarra 3e44c6e404 Merge branch 'dev' into 7677_vnLocation_perf
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-14 08:01:26 +02:00
Pablo Natek c31aa3258f fix: refs #7830 remove console.log
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 18:15:16 +02:00
Pablo Natek 40e46f5a72 fix: refs #7830 customer credit
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 18:13:46 +02:00
Pablo Natek ffd7d98e9c feat: travel m3
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-08-13 17:56:07 +02:00
Jorge Penadés e7def05d40 feat: refs #7323 add flex-wrap
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-13 16:59:43 +02:00
Jorge Penadés e780dcda05 fix: refs #7323 load all opts
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-13 16:45:30 +02:00
Alex Moreno e9873a43b1 Merge pull request '7848-recoveryPassword' (!617) from 7848-recoveryPassword into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #617
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-08-13 14:43:46 +00:00
Alex Moreno 0a0e8be39f Merge branch 'dev' into 7848-recoveryPassword
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 14:41:23 +00:00
Alex Moreno 3cbdf25410 delete name default
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 16:40:02 +02:00
Alex Moreno fdb508de97 delete cy.logs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 16:31:34 +02:00
Carlos Satorres b5537d6ae5 Merge pull request '7355-accountMigration2' (!619) from 7355-accountMigration2 into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #619
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-08-13 13:10:39 +00:00
Jorge Penadés c8ab5b3bfd feat: refs #7663 add setWeight menu opt (wip)
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 14:57:09 +02:00
Jon Elias 0e9739f2a5 refactor: refs #7354 refactor zones section and fixed e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 14:39:50 +02:00
Carlos Satorres c6db81ddb5 Merge pull request '#7323 use global locale' (!618) from 7323-warmfix-i18nTag into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
Reviewed-on: #618
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-08-13 11:20:15 +00:00
Carlos Satorres 405092f66d fix: account subsections cards
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-08-13 13:11:23 +02:00
Carlos Satorres aae881c24a fix(account_card): redirection 2024-08-13 12:59:22 +02:00
Jorge Penadés a24caa9393 fix: refs #7323 use global locale
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-13 12:56:39 +02:00
Carlos Satorres e144f0be01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2 2024-08-13 12:52:14 +02:00
Alex Moreno e88e7fa9db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
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
Alex Moreno a46198e2d0 feat: add recover password and reset password 2024-08-13 12:25:08 +02:00
Jorge Penadés e0473b589c Merge pull request 'test to dev' (!616) from test into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #616
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-08-13 09:29:29 +00:00
Jorge Penadés ac7c939e98 Merge pull request '#7323 add my account btn & fix models log selectable' (!614) from 7323-fixWorkerLog into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #614
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-08-13 09:20:49 +00:00
Jon Elias 4401a6108f Merge branch 'master' into hotfix_InvoiceOut_List&NegativeBases
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-08-13 09:19:46 +00:00
Jon Elias de7251e16d fix: InvoiceOut List and negative bases
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-08-13 11:18:07 +02:00
Jorge Penadés d276436bb3 chore: refs #7323 fix test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-13 10:42:15 +02:00
Jorge Penadés 81c70c9511 chore: refs #7323 remove unused import
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-08-13 10:06:58 +02:00
Jorge Penadés e428da4a29 feat: refs #7323 add my account" btn & fix models log selectable
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2024-08-13 10:05:07 +02:00