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

3542 Commits

Author SHA1 Message Date
Javier Segarra c87629f2ec fix: accountBasicData after update 2024-06-05 11:35:48 +02:00
Javier Segarra 3227d299e9 updates 2024-06-05 10:57:12 +02:00
Javier Segarra 0bb6498061 fix: minor i18n 2024-06-04 20:33:24 +02:00
William Buezas ddc149b6fc adapt account privileges to new formModel changes 2024-06-04 09:25:03 -03:00
William Buezas c574af9e9b resolve conflicts 2024-06-04 09:15:55 -03:00
William Buezas 253b54379c Add submodules routes again 2024-06-04 09:14:48 -03:00
William Buezas 37a8956f86 Merge branch 'feature/AccountList' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/AccountList 2024-06-04 09:11:37 -03:00
William Buezas 84ad1745e2 several changes 2024-06-04 09:10:40 -03:00
Alex Moreno 26ddb483f6 build: add new version 2024-06-04 10:08:49 +02:00
William Buezas 02d8254df9 rest of submodules 2024-06-03 08:47:32 -03:00
Jorge Penadés 76f858ba7e Merge pull request '#6600 create photo comment' (!416) from 6600-itemPhotoComment into dev 
Reviewed-on: verdnatura/salix-front#416
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-03 08:07:44 +00:00
Jorge Penadés d2180c67f7 refactor: refs #6600 replace QInput to VnInput 2024-06-03 09:35:59 +02:00
Jorge Penadés f58b072964 feat: refs #6600 Add option to add comment for photo motivation 2024-06-03 09:30:37 +02:00
William Buezas 8e1f7c24a4 submodules WIP 2024-06-02 13:26:46 -03:00
Javier Segarra c2dd7831d1 perf: remove unnecessary components 2024-05-31 10:17:44 +02:00
Javier Segarra 67b3888f8c feat: AccountForm as dialog 2024-05-31 10:10:15 +02:00
Javier Segarra 5b9d64128b fix: AccountFilter 2024-05-31 09:45:01 +02: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 56dd5e0a76 change fn name 2024-05-29 16:27:44 -03:00
William Buezas 1414b93633 Account create 2024-05-29 11:53:11 -03:00
William Buezas e47bda0afc small changes 2024-05-29 08:47:33 -03:00
William Buezas 6c34a250db Remove more unnecesary files 2024-05-29 08:28:17 -03:00
William Buezas 5c9f62bd59 Remove unnecesary files 2024-05-29 08:26:07 -03:00
Alex Moreno 15223971f1 fix: defaulter icon 2024-05-29 12:53:12 +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 fd7f46cbe2 several changes 2024-05-28 18:33:18 -03:00
William Buezas 062de82bca Account list 2024-05-28 17:30:39 -03:00
William Buezas 4292804922 Merge branch '7311_boilerplate_users' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/AccountList 2024-05-28 11:30:10 -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 8d7568d9a2 Search childs fix 2024-05-27 14:40:33 -03:00
Javier Segarra 47248680ba test: #7489 Fix VnLocation.spec.js 2024-05-27 18:35:34 +02: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