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

1513 Commits

Author SHA1 Message Date
Javier Segarra 289516a599 Merge pull request 'Refs #6694 fix: VnLocation placeholder i18n' (!178) from 6694_fix_placeholder into test 
Reviewed-on: verdnatura/salix-front#178
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-05 06:08:46 +00:00
Javier Segarra d49a82d10c Refs #6694 fix: VnLocation placeholder i18n 2024-02-04 15:51:54 +00:00
Carlos Satorres 6a87510396 Merge pull request '#5888 - FiscalData Field location' (!174) from 5888_fiscalData_field_location into test 
Reviewed-on: verdnatura/salix-front#174
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-02-02 13:54:31 +00:00
Javier Segarra 76c98c59b9 refs #5888 test: improve tests 2024-02-02 14:52:19 +01:00
Javier Segarra 1c7ad7946e refs #5888 feat: change layout 2024-02-02 14:41:59 +01:00
Javier Segarra fd56f0744b refs #5888 feat: change model variable 2024-02-02 09:52:36 +01:00
Javier Segarra 13504be081 refs #5888 feat: change layout 2024-02-02 09:52:29 +01:00
Alex Moreno 6bfa710864 fix(VnLog): option-value 2024-02-01 14:20:46 +01:00
Alex Moreno f325e3d735 refs #6783 fix: correct version 2024-02-01 12:28:52 +01:00
Carlos Satorres e6e3cafe5a Merge pull request 'refs #6677 VnSelectFilter add url prop' (!164) from 6677-urlSelectFilter into dev 
Reviewed-on: verdnatura/salix-front#164
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-31 14:42:42 +00:00
Javier Segarra a9ee2b7cb6 Merge branch 'dev' into 6677-urlSelectFilter 2024-01-31 08:12:50 +00:00
Jorge Penadés bcfe5098d8 Merge pull request '#6654 sticky class' (!165) from 6654-stickySubToolbar into dev 
Reviewed-on: verdnatura/salix-front#165
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-31 07:50:58 +00:00
Carlos Satorres 021d851655 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6677-urlSelectFilter 2024-01-30 13:34:57 +01:00
Carlos Satorres adac3bc895 refs #6677 fix code 2024-01-30 13:34:05 +01:00
Jorge Penadés 3c67e1d51c Merge branch '6654-stickySubToolbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar 2024-01-30 10:30:09 +01:00
Jorge Penadés 66e119adc3 fix: refs #6654 btn responsive & replace toolbars 2024-01-30 10:30:07 +01:00
Javier Segarra 8200b19238 Merge branch 'dev' into 6654-stickySubToolbar 2024-01-30 08:25:24 +00:00
Carlos Satorres fac4e0f9ca Merge pull request 'refs #6339 clipboard' (!159) from 6339-cilpboard into dev 
Reviewed-on: verdnatura/salix-front#159
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-29 14:09:02 +00:00
Carlos Satorres 979b95ff98 Merge branch 'dev' into 6339-cilpboard 2024-01-29 13:59:51 +00:00
Carlos Satorres a2c884cb1f Merge pull request 'refs #6733 remove alert' (!161) from 6733-workerCreate into dev 
Reviewed-on: verdnatura/salix-front#161
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-29 13:58:33 +00:00
Carlos Satorres 53da9406d0 Merge branch 'dev' into 6733-workerCreate 2024-01-29 13:55:24 +00:00
Javier Segarra c5290339a1 Merge pull request 'refs #6694 VnLocation' (!154) from 6280_vnLocation into dev 
Reviewed-on: verdnatura/salix-front#154
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-29 13:23:01 +00:00
Javier Segarra b0083544f0 Merge branch 'dev' into 6280_vnLocation 2024-01-29 13:14:20 +00:00
Jorge Penadés 1d7316dd6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar 2024-01-29 14:10:58 +01:00
Carlos Satorres 5c87cfc671 refs #6677 fix e2e 2024-01-29 13:54:41 +01:00
Carlos Satorres 510d9d1731 Merge pull request 'refs #6664 popup' (!153) from 6664-portesClaim into dev 
Reviewed-on: verdnatura/salix-front#153
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-29 11:36:42 +00:00
Alex Moreno 05c6825141 Merge branch 'dev' into 6664-portesClaim 2024-01-29 11:32:06 +00:00
Carlos Satorres afcfd645ce Merge branch '6664-portesClaim' of https://gitea.verdnatura.es/verdnatura/salix-front into 6664-portesClaim 2024-01-29 11:48:20 +01:00
Carlos Satorres 324d6da3a3 refs #6664 claimfix 2024-01-29 11:48:18 +01:00
Carlos Satorres a89748827f refs #6677 url 2024-01-29 11:42:08 +01:00
Jorge Penadés 0edfe24a85 fix: refs #6654 fix css 2024-01-29 10:25:59 +01:00
Javier Segarra 81527ce95c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6280_vnLocation 2024-01-29 10:05:47 +01:00
Alex Moreno a51b539189 Merge branch 'dev' into 6733-workerCreate 2024-01-29 08:49:58 +00:00
Alex Moreno f715c615d2 Merge pull request 'refs #6681 - PR3 - Resolve conflicts' (!166) from hyervoni-PR-3 into dev 
Reviewed-on: verdnatura/salix-front#166
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-01-29 08:29:43 +00:00
Alex Moreno 935211a71f refs #6681 try fix jenkins 2024-01-29 08:41:38 +01:00
Alex Moreno 70e912fc92 refs #6681 try fix jenkins 2024-01-29 08:38:55 +01:00
Alex Moreno 30ff6e52cc Empty commit 2024-01-29 08:30:41 +01:00
Javier Segarra a02b534cfa refs #6280 test: remove comments 2024-01-29 07:20:40 +00:00
Javier Segarra 8c9db8b3ae refs #6280 test: remove comments 2024-01-29 07:16:39 +00:00
Alex Moreno f8e7ba4dac Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-PR-3 2024-01-29 08:15:25 +01:00
carlosfonseca 9a23bb2ed2 Se corrige comentario 39968 2024-01-26 11:08:45 -05:00
Jorge Penadés d86ac6f31b feat: refs #6654 sticky class 2024-01-26 16:08:49 +01:00
Carlos Satorres b3cb67f217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6677-urlSelectFilter 2024-01-26 09:41:13 +01:00
Javier Segarra c731b5b989 refs #6280: replace function event 2024-01-26 08:04:08 +00:00
Javier Segarra 9f9835b7ab refs #6280: remove related code to filter-rules 2024-01-26 07:56:41 +00:00
Carlos Satorres 2fd0cef161 Merge branch 'dev' into 6664-portesClaim 2024-01-25 14:07:04 +00:00
Carlos Satorres 67d95f9ad0 refs #6664 vnConfirm og 2024-01-25 14:44:41 +01:00
Carlos Satorres 35aa0ba20a refs #6664 claimPortes 2024-01-25 13:48:42 +01:00
Carlos Satorres 33332a5c04 refs #6677 url 2024-01-25 12:21:41 +01:00
Alex Moreno 55916deaab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-25 08:59:41 +01:00