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

3899 Commits

Author SHA1 Message Date
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
Javier Segarra b370fe673b updates 2024-06-10 17:06:20 +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
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
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
Jon Elias 290325b677 refactor: refs #7003 changed order filter 2024-06-07 12:45:22 +02:00
Jorge Penadés 213ba4ba52 chore: refs #6273 Add default pay method for internal 2024-06-07 12:24:48 +02:00
Jorge Penadés 8b93dbc57d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt 2024-06-07 12:15:04 +02:00
Jorge Penadés 6368342be1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection 2024-06-07 12:04:00 +02:00
Jorge Penadés d35f9c9468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection 2024-06-07 12:03:52 +02:00
Alex Moreno c392b44195 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-07 12:03:41 +02:00
Javi Gallego 9ceac32d89 feat: refs #7548 grafana 2024-06-07 11:59:26 +02:00
Jorge Penadés 45998a972b Merge pull request '#7542 use right panel' (!427) from 7542-warmfix-fixRightPanel into test 
Reviewed-on: verdnatura/salix-front#427
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-07 09:56:20 +00:00
Jorge Penadés bd7b3c2d06 feat: refs #7542 drop space 2024-06-07 11:54:26 +02:00
Jorge Penadés 5922838fcd feat: refs #7542 empty 2024-06-07 11:54:06 +02:00
Carlos Satorres 6a9bba287b Merge pull request 'refs #6905 fix userPanel' (!423) from 6905-fixUserPanelLocal into dev 
Reviewed-on: verdnatura/salix-front#423
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-07 09:50:24 +00:00
Carlos Satorres 3729817c2b Merge branch 'dev' into 6905-fixUserPanelLocal 2024-06-07 09:47:48 +00:00
Javier Segarra 5551077c92 fix: roles 2024-06-07 11:16:15 +02:00
Javier Segarra 6053d42442 fix: descriptor and i18n 2024-06-07 11:09:46 +02:00