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

1329 Commits

Author SHA1 Message Date
carlosfonseca ead8bb4992 Se definen los iconos de las tarjetas en summary y se organiza cabeceras de tablas 2024-01-03 14:53:01 -05:00
William Buezas 142bac7a43 agregar data por default en tabla extended list 2024-01-03 13:49:08 -03:00
Kevin Martinez 467f32d9e0 Merge remote-tracking branch 'origin/branch-PR-2' into branch-PR-2 2024-01-03 10:50:42 -04:00
Kevin Martinez 2af176a502 Fix catalog filter 2024-01-03 10:50:26 -04:00
Kevin Martinez 54d77c9851 Fix Icon sizing 2024-01-03 10:02:14 -04:00
William Buezas a66b88ba8e add delete department popup translation 2024-01-03 10:59:11 -03:00
William Buezas 24fdc1ff97 wip 2024-01-03 10:56:13 -03:00
Alex Moreno b62a317a66 refs #6595 fix: customerExtendedListFilter 2024-01-03 14:17:09 +01:00
Alex Moreno 5994b4e08e Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2 2024-01-03 14:16:26 +01:00
Carlos Satorres 9cd20439a6 refs #6618 fix name 2024-01-03 14:09:29 +01:00
Carlos Satorres 9a9bb2fa44 refs #6618 invoiceOut fix 2024-01-03 13:24:49 +01:00
Carlos Satorres 3c98d099b3 refs #6618 component Cards 2024-01-03 13:00:45 +01:00
Carlos Satorres 92127b766b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6618-vnSubToolBar 2024-01-03 13:00:25 +01:00
Kevin Martinez 134f1e0195 Merge pull request 'Create order lines' (#46) from feature/order into dev 
Reviewed-on: hyervoni/salix-front-mindshore#46
 2024-01-03 10:52:20 +00:00
Kevin Martinez 733baa1310 Merge branch 'dev' into feature/order 
# Conflicts:
#	src/i18n/en/index.js
 2024-01-03 06:51:38 -04:00
Javier Segarra 8bde0073f0 Merge pull request '#6098 - Show Toast when copy token' (!141) from 6098_lilium_token_copy into dev 
Reviewed-on: verdnatura/salix-front#141
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-01-03 10:44:26 +00:00
Carlos Satorres 6b23c988b3 refs #6618 component vnSubToolBar 2024-01-03 11:06:03 +01:00
Carlos Satorres 3acc4b0d58 vn qtoolbar 2024-01-03 09:59:27 +01:00
Javier Segarra 6a6e38bb60 Merge branch '6098_lilium_token_copy' of https://gitea.verdnatura.es/verdnatura/salix-front into 6098_lilium_token_copy 2024-01-03 09:39:31 +01:00
Javier Segarra c4cf9842cb refs #6098 perf: add vite-ignore 2024-01-03 09:39:28 +01:00
Javier Segarra e05a49e7b7 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-03 08:22:20 +00:00
Javier Segarra b00b2941c7 refs #6098 perf: define locale equivalences in i18n folder 2024-01-03 09:18:35 +01:00
Carlos Satorres 013a00d653 Merge pull request 'refs #6256 lv breakword' (!104) from 6256-breakWord into dev 
Reviewed-on: verdnatura/salix-front#104
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-03 08:18:14 +00:00
Javier Segarra 899ccc097a refs #6098 perf: remove import.meta.glob 2024-01-03 09:18:13 +01:00
Javier Segarra ac660fadd7 refs #6098 feat: add translate for copyToken 2024-01-03 09:17:28 +01:00
Carlos Satorres be02a1f47a Merge branch 'dev' into 6256-breakWord 2024-01-03 08:16:56 +00:00
Jorge Penadés e711040876 Merge pull request 'refactor: refs #5835' (!129) from 5835-fixListAndSummary into dev 
Reviewed-on: verdnatura/salix-front#129
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-01-03 08:04:37 +00:00
Alex Moreno 09cd5464fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-03 09:00:42 +01:00
Alex Moreno 0a44c43715 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-03 09:00:39 +01:00
Alex Moreno ba0b3f260f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-01-03 09:00:13 +01:00
Jorge Penadés a93ffda59b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-03 08:59:09 +01:00
Carlos Satorres 9f4962750f Merge pull request 'refs #6578 order claimState' (!133) from 6578-orderClaim into dev 
Reviewed-on: verdnatura/salix-front#133
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-03 07:55:34 +00:00
Carlos Satorres f2c29baeb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-amountClaimLines 2024-01-03 08:20:40 +01:00
Carlos Satorres de57e6400b Merge pull request 'refs #6584 hotfix await' (!132) from 6584-hotfixRegularize into master 
Reviewed-on: verdnatura/salix-front#132
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-03 07:10:46 +00:00
Alex Moreno 046b69d89e warmFix(ticketSummary): change this. → .value 2024-01-03 07:47:38 +01:00
Alex Moreno 41066387f9 Merge branch 'dev' into 6578-orderClaim 2024-01-03 06:45:19 +00:00
Pablo Natek 660906fa0e Merge branch 'dev' into 6259-ticketSmsToClientSms 2024-01-02 17:35:31 +00:00
Kevin Martinez a5cbc55a7e Fix form model feedback 2024-01-02 12:36:09 -04:00
Kevin Martinez c29586632c Fix order feedback 2024-01-02 12:29:34 -04:00
William Buezas 36ae5ab538 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2 2024-01-02 12:57:35 -03:00
William Buezas 49bb222343 create form popup reutilizable component 2024-01-02 12:57:13 -03:00
Carlos Fonseca 74a9d8dbb9 Merge pull request 'Se hacen maquetado general de menu izquierdo en summary de clientes' (#52) from features/ms_93_items_left_menu into dev 
Reviewed-on: hyervoni/salix-front-mindshore#52
 2024-01-02 15:44:15 +00:00
Kevin Martinez 606f4f0892 Implement orders catalog tag filter 2024-01-02 11:40:07 -04:00
Carlos Fonseca 3118d64d5d Merge pull request 'Solucion comentario' (#51) from fixes/issuecomment_37214 into branch-PR-2 
Reviewed-on: hyervoni/salix-front-mindshore#51
 2024-01-02 15:30:32 +00:00
carlosfonseca b0b8205b52 Solucion comentario 2024-01-02 10:28:52 -05:00
Carlos Fonseca 73128cbf99 Merge pull request 'fixes-pr-2' (#50) from fixes-pr-2 into branch-PR-2 
Reviewed-on: hyervoni/salix-front-mindshore#50
 2024-01-02 13:38:17 +00:00
William Buezas 219bacaebc merge with branch branch-PR2 2024-01-02 10:35:48 -03:00
carlosfonseca bf259b5fad Correcciones a branch pr 2 2024-01-02 08:12:44 -05:00
carlosfonseca 677660f5cc Se hacen maquetado general de menu izquierdo en summary de clientes 2024-01-02 06:54:15 -05:00
Jorge Penadés c6f8bbd616 Merge pull request 'add filter: refs #6606' (!140) from 6606-fixExportBtn into dev 
Reviewed-on: verdnatura/salix-front#140
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-02 11:49:20 +00:00