0
0
Fork 0
Commit Graph

4192 Commits

Author SHA1 Message Date
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
Carlos Satorres 264d887fb4 refs #7406 fix Tb components create 2024-05-28 12:09:03 +02:00
Jorge Penadés 5aa3b14014 refactor: refs #6942 WIP summary layout 2024-05-28 11:39:49 +02:00
Carlos Satorres ffe15da7cf refs #7406 fix VnTable columns 2024-05-28 10:41:24 +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 a4db4bd2a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-28 07:51:21 +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 0f1c91d36c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-05-28 07:42:15 +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
Carlos Satorres d8512e2033 refs #7406 fix trad 2024-05-27 18:23:33 +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
Alex Moreno f7a6e3d471 test(ClaimPhoto): refs #7589 fix e2e 2024-05-27 16:13:40 +02:00
William Buezas f2df252a94 improvement 2024-05-27 10:32:10 -03:00
Jorge Penadés df6e6c66a9 fix: refs #6942 import 2024-05-27 14:53:50 +02:00
Jorge Penadés 90cebb85fe reafactor: refs #6942 use meta moduleName 2024-05-27 14:51:23 +02:00
Carlos Satorres 947496e0a1 refs #7406 fix components 2024-05-27 14:43:03 +02:00
Jorge Penadés 332e96f184 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-27 14:36:57 +02:00
Alex Moreno a4baa88cb4 fix(VnTable): refs #6825 VnInputDate 2024-05-27 14:36:50 +02:00
Carlos Satorres ff251fbb85 Merge pull request 'refs #7391 fix textarea' (!402) from 7391-defaulterMods into dev
Reviewed-on: verdnatura/salix-front#402
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-27 11:59:10 +00:00
Carlos Satorres 4162e040cc Merge branch 'dev' into 7391-defaulterMods 2024-05-27 11:58:11 +00:00
Jorge Penadés 30cec965e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-05-27 13:36:34 +02:00
Jorge Penadés ef9f8b8705 refactor: refs #6942 store key & actions 2024-05-27 13:36:16 +02:00
Juan Ferrer 24c0a62edf Merge branch 'test' into dev 2024-05-27 13:32:19 +02:00
Juan Ferrer 3a2b0e757a ci: refs #7442 Kubernetes deploy 2024-05-27 13:31:40 +02:00
William Buezas b408e0daaf remove on selected 2024-05-27 08:29:52 -03:00
William Buezas c304c68c9e Zone tree abstraction 2024-05-27 08:29:24 -03:00
Carlos Satorres d207482e3a refs #7406 fix url 2024-05-27 11:27:33 +02:00
Carlos Satorres ef52c9b0c0 refs #7406 routes trad 2024-05-27 10:42:47 +02:00
Carlos Satorres e6ff13c09c Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-05-27 10:07:49 +02:00
Carlos Satorres c865bc2ed4 refs #7406 fix props 2024-05-27 10:07:32 +02:00
Carlos Satorres d4fbd99473 refs #7406 table formation 2024-05-27 09:40:48 +02:00