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

3692 Commits

Author SHA1 Message Date
Javier Segarra 0450986025 fix InvoiceInBasicdata 2024-05-31 12:01:18 +02:00
Javier Segarra d072fc858d Merge branch 'dev' into 6911-saveOnEnter 2024-05-31 11:59:29 +02:00
Javier Segarra 28173ddee2 Merge branch 'dev' into feature/AccountRoles 2024-05-31 10:24:37 +02:00
Javier Segarra 4268f15d30 perf: remove unnecessary submodules 2024-05-31 10:23:03 +02:00
Javier Segarra 2c9ff60399 Merge branch 'dev' into feature/ZoneCalendar 2024-05-31 09:28:48 +02:00
William Buezas 4bd78922af remove unnecesary files 2024-05-30 15:43:26 -03:00
William Buezas 05b7df9168 Role submodules 2024-05-30 15:34:37 -03:00
William Buezas 5c25c77f19 Mail aliases 2024-05-30 13:09:11 -03:00
William Buezas 0cf4f41d19 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/MailAliases 2024-05-30 08:38:23 -03:00
William Buezas ed2ba5458d Avoif filter panel from redirecting 2024-05-30 08:34:53 -03:00
Alex Moreno 5799a1121b fix: searchbar redirect 2024-05-30 10:22:13 +02:00
Alex Moreno 2cf0a717ac deploy: increase version 2024-05-30 09:23:17 +02:00
William Buezas d82de6da58 Account roles 2024-05-29 16:14:29 -03:00
William Buezas b5e72aec7c Wip 2024-05-29 08:01:37 -03:00
Alex Moreno 15223971f1 fix: defaulter icon 2024-05-29 12:53:12 +02:00
Javier Segarra 3f76aea680 fix: dashOrCurrency filter 2024-05-29 12:17:45 +02:00
Javier Segarra ed566e6ece style: increase height 2024-05-29 12:13:11 +02:00
Javier Segarra b7bc82aa3c feat: use new filter 2024-05-29 12:12:50 +02:00
Javier Segarra c5e2a40d3e feat: add router.meta.moduleName as default param 2024-05-29 12:12:40 +02:00
Javier Segarra f9fa68b0b1 feat: dashOrCurrency filter 2024-05-29 12:12:07 +02:00
Javier Segarra 532d60130d Merge branch 'dev' into feature/ZoneCalendar 2024-05-29 11:28:53 +02:00
Jorge Penadés f15e8e42b3 Merge pull request '#6942 improve invoiceIn' (!220) from 6942-improveInvoceIn into dev 
Reviewed-on: verdnatura/salix-front#220
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-29 07:03:45 +00:00
William Buezas 0659eac652 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountRoles 2024-05-28 18:38:13 -03:00
William Buezas 21879b54ab remove console.log 2024-05-28 17:41:17 -03:00
William Buezas e80b9a71c6 Hide panel when ZoneEvent view unmounts 2024-05-28 11:24:52 -03:00
William Buezas d4600a1181 resolve conflicts and adapt tree 2024-05-28 11:20:43 -03:00
William Buezas b783adfc31 several changes 2024-05-28 09:30:13 -03:00
Jorge Penadés 0de575bb6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-28 13:14:11 +02:00
Jorge Penadés 3b3e7e7e03 fix: refs #6942 tests & summary table spacing 2024-05-28 13:11:38 +02:00
Javier Segarra d98717f253 Merge pull request 'Zone Locations' (!390) from hyervoni/salix-front-mindshore:feature/ZoneLocations into dev 
Reviewed-on: verdnatura/salix-front#390
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-28 10:53:26 +00:00
Javier Segarra 909c545106 Merge branch 'dev' into feature/ZoneLocations 2024-05-28 10:46:53 +00:00
Alex Moreno c88934218a Merge pull request 'feat: refs #7494 new icons' (!409) from 7494-icons into dev 
Reviewed-on: verdnatura/salix-front#409
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-05-28 10:20:52 +00:00
Alex Moreno d15f31de03 Merge branch 'dev' into 7494-icons 2024-05-28 10:19:49 +00:00
Alex Moreno 93fb3096e0 feat: refs #7494 new icons 2024-05-28 12:17:51 +02:00
Alex Moreno 35f7a6036e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-28 12:13:06 +02:00
Alex Moreno 2c307e5f29 deploy: fix e2e after db deploy 2024-05-28 12:12:31 +02:00
Jorge Penadés 5aa3b14014 refactor: refs #6942 WIP summary layout 2024-05-28 11:39:49 +02:00
Jorge Penadés 3c0936b2ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-28 09:01:24 +02:00
Alex Moreno 9f18c12c33 feat: refs #7494 new icons 2024-05-28 08:56:59 +02:00
Alex Moreno 8304dcb0a5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-05-28 07:48:51 +02:00
Alex Moreno 75e9bc42aa Merge pull request '7489-testToMaster' (!408) from 7489-testToMaster into master 
Reviewed-on: verdnatura/salix-front#408
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-05-28 05:33:16 +00:00
William Buezas 7cd2bf2319 watch fix 2024-05-27 14:44:44 -03:00
William Buezas 8d7568d9a2 Search childs fix 2024-05-27 14:40:33 -03:00
William Buezas c4b88fae41 adapt tree 2024-05-27 14:30:36 -03:00
Javier Segarra 47248680ba test: #7489 Fix VnLocation.spec.js 2024-05-27 18:35:34 +02:00
William Buezas cff434c1a6 Add sticky form button 2024-05-27 13:20:42 -03:00
William Buezas fcaca42b1f resolve conflicts 2024-05-27 12:35:59 -03:00
William Buezas a2df7b5cf7 small fix 2024-05-27 12:32:13 -03:00
Jorge Penadés 4c3a64bfa6 refactor: refs #6942 new summary layout 2024-05-27 17:14:37 +02:00
Alex Moreno 3ae523ef04 test(WorkerList): refs #7589 fix e2e 2024-05-27 16:52:53 +02:00