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

3904 Commits

Author SHA1 Message Date
Carlos Satorres 31afa22de8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration 2024-06-11 09:20:23 +02:00
Jorge Penadés 0cfaef2520 Merge pull request '#6273 fix redirect' (!434) from 6273-fixRedirect into dev 
Reviewed-on: verdnatura/salix-front#434
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 07:18:14 +00:00
Jorge Penadés c5889b2170 Merge branch 'dev' into 6273-fixRedirect 2024-06-11 07:16:59 +00:00
Carlos Satorres 8e9656f96a refs #7366 remove warning 2024-06-11 09:10:25 +02:00
Jorge Penadés 01658ee100 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl 2024-06-11 09:10:19 +02:00
Carlos Satorres 313395ef7c refs #7366 fix travelMigration 2024-06-11 09:06:09 +02:00
Jorge Penadés f9b688fc37 Merge branch 'dev' into 6243-generalizeCmrSection 2024-06-11 07:02:37 +00:00
Alex Moreno 9cfdbb3a8b hotFix: increase version 2024-06-11 08:54:30 +02:00
Carlos Satorres b07f7b0003 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration 2024-06-11 08:35:35 +02:00
Alex Moreno 92531216d1 Merge pull request '7565-testToMaster' (!431) from 7565-testToMaster into master 
Reviewed-on: verdnatura/salix-front#431
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-06-11 06:32:59 +00:00
Alex Moreno 0289c167ee refactor: unnecessary computed 2024-06-11 08:30:18 +02:00
Alex Moreno 5e7ef68439 feat: simplify html 2024-06-11 08:22:26 +02:00
Javi Gallego b83285000b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-11 08:03:41 +02:00
Javi Gallego d847b33def minor change 2024-06-11 08:03:35 +02:00
Javier Segarra fbecbd0c08 Merge remote-tracking branch 'origin/dev' into feature/WorkerDescriptorMenu 2024-06-10 17:10:05 +02:00
Jorge Penadés 992249c638 fix: refs #6273 redirect 2024-06-10 17:06:28 +02:00
William Buezas c1df20a09b Worker descriptor menu 2024-06-10 11:21:23 -03:00
Alex Moreno 1b82ca9243 feat: add changelog 2024-06-10 15:55:22 +02:00
Jorge Penadés 348310bc34 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection 2024-06-10 15:37:08 +02:00
Jorge Penadés 9bcfd5c58a Merge pull request '#6273 create freelance form option' (!347) from 6273-createFreelanceFormOpt into dev 
Reviewed-on: verdnatura/salix-front#347
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-10 13:34:59 +00:00
Jorge Penadés a5b71ecebc feat: refs #6273 delete prop 2024-06-10 15:32:38 +02:00
Jorge Penadés a64cd6fa73 refactor: refs #6273 update locale 2024-06-10 15:21:28 +02:00
Javi Gallego 3f94eabc3d feat: refs #7548 añado link grafana 2024-06-10 14:47:43 +02:00
Jorge Penadés 9c72597c2c fix: refs #6273 tests 2024-06-10 14:42:41 +02:00
Jorge Penadés 9eed6e55be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt 2024-06-10 14:24:25 +02:00
Jorge Penadés 5869ad220c feat: refs #6273 wip: add locale 2024-06-10 14:17:22 +02:00
Jorge Penadés 5e96ed3bd3 fix: refs #6273 fix arrayData changed 2024-06-10 14:03:57 +02:00
Jorge Penadés d81ce9fe95 feat: refs #6273 add test & improve form 2024-06-10 13:54:02 +02:00
Alex Moreno ed07b4d620 fix(url): redirect 2024-06-10 13:14:24 +02:00
Alex Moreno 128904970b fix(url): filter 2024-06-10 11:53:47 +02:00
Javi Gallego 0e0e351805 Merge branch 'dev' into 7548-ticketSummaryCollection 2024-06-10 10:53:33 +02:00
Javi Gallego 911ff376fd Merge pull request '#4560 - gastos-reparto' (!421) from 4560-gastos-reparto into dev 
Reviewed-on: verdnatura/salix-front#421
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-10 08:16:57 +00:00
Alex Moreno bbf847e1a0 feat(url): sepate filters 2024-06-10 09:19:42 +02:00
Jorge Penadés 049783b16c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt 2024-06-10 08:58:10 +02:00
Jon Elias deca90c7ea Merge pull request '#7003 new data order in section' (!398) from 7003-fixedPriceOrder into dev 
Reviewed-on: verdnatura/salix-front#398
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-10 05:14:53 +00:00
Jon Elias f3a28edb5e Merge branch 'dev' into 7003-fixedPriceOrder 2024-06-10 05:12:28 +00:00
Jorge Penadés b68547ac1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt 2024-06-07 15:43:17 +02:00
William Buezas bf3c146317 resolve conflicts 2024-06-07 10:24:11 -03:00
Alex Moreno 2bdfc90241 build: increase version 2024-06-07 14:56:39 +02:00
William Buezas fa4a18fbbb make account samba work again 2024-06-07 09:46:04 -03:00
William Buezas 1e67a0feca Make AccountLdap work again 2024-06-07 09:35:36 -03:00
Jorge Penadés 695dd36c1f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt 2024-06-07 14:23:26 +02:00
Jorge Penadés 59b85f24ea fix: refs #6273 console error 2024-06-07 14:19:10 +02:00
Jorge Penadés 8d89fc2d90 feat: refs #6273 set payMethod to 0 2024-06-07 14:08:18 +02:00
William Buezas 4c84fd9326 resolve conflicts 2024-06-07 09:03:41 -03:00
Javier Segarra 301a62aa9d Merge pull request 'Mail aliases' (!418) from hyervoni/salix-front-mindshore:feature/MailAliases into dev 
Reviewed-on: verdnatura/salix-front#418
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-07 10:54:36 +00:00
Javier Segarra 21a412f688 Merge branch 'dev' into feature/MailAliases 2024-06-07 10:53:17 +00:00
Alex Moreno dce95824be fix(AccountAlias): fix and optimization 2024-06-07 12:51:38 +02:00
Jon Elias deb6b448fb Merge branch 'dev' into 7003-fixedPriceOrder 2024-06-07 10:48:09 +00:00
Jon Elias d6bd3de971 refactor: refs #7003 fixed order param 2024-06-07 12:47:18 +02:00