Commit Graph

476 Commits

Author SHA1 Message Date
Alex Moreno 9d3c427579 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-09 07:47:55 +01:00
Alex Moreno bc8b9501c0 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-branch-PR-2 2024-01-09 07:43:29 +01:00
Kevin Martinez fbd5abb330 Fix fallowing feedback 2024-01-08 10:00:04 -04:00
Alex Moreno 94e4bb383a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-08 12:02:00 +01:00
Alex Moreno dcedc314f7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-08 12:01:38 +01:00
Pablo Natek ad2844d88d fix(workerDescriptor): refs #6611 fix workerpopUp
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-08 08:37:36 +01:00
Kevin Martinez 8a6e78a143 Merge branch 'dev' into feature/order-catalog-filter
# Conflicts:
#	src/components/ui/VnFilterPanel.vue
#	src/pages/Order/Card/OrderCatalogFilter.vue
#	src/pages/Order/OrderCatalog.vue
2024-01-05 13:13:03 -04:00
Kevin Martinez c997d19a5e Implement tag filter 2024-01-05 13:04:06 -04:00
William Buezas 27616b9bd4 improve TableVisibleColumns code 2024-01-05 10:57:43 -03:00
William Buezas 8cb6ed136a mover clase de selector de css para añadir * a inputs requeridos a archivo de css global 2024-01-04 19:37:46 -03:00
William Buezas e8fa564bc2 Agregar * a inputs de campos required via css 2024-01-04 18:13:31 -03:00
Pablo Natek 11a37b7716 Merge branch 'dev' into 6259-ticketSmsToClientSms
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-04 14:47:46 +00:00
William Buezas 3ba4e56204 merge with dev 2024-01-04 11:19:40 -03:00
William Buezas cfac9acbe8 Small corrections 2024-01-04 09:58:37 -03:00
William Buezas de8996d596 Fixes PR 2024-01-04 09:34:24 -03:00
William Buezas bdbc3209f4 Merge pull request 'feature/ms-114-ImproveExtendedListFilters' (#53) from feature/ms-114-ImproveExtendedListFilters into dev
Reviewed-on: hyervoni/salix-front-mindshore#53
2024-01-03 19:58:24 +00:00
William Buezas aee4696bb2 Merge branch 'branch-PR-2' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into branch-PR-2 2024-01-03 16:56:11 -03:00
William Buezas 8fc7a5ea12 Aplicar clases a close-icon en el css 2024-01-03 16:55:48 -03: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 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
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-03 14:09:29 +01:00
Carlos Satorres 3c98d099b3 refs #6618 component Cards
gitea/salix-front/pipeline/head This commit looks good Details
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
Carlos Satorres 6b23c988b3 refs #6618 component vnSubToolBar
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-03 11:06:03 +01:00
Javier Segarra 6a6e38bb60 Merge branch '6098_lilium_token_copy' of https://gitea.verdnatura.es/verdnatura/salix-front into 6098_lilium_token_copy
gitea/salix-front/pipeline/head This commit looks good Details
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
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-03 08:22:20 +00:00
Javier Segarra b00b2941c7 refs #6098 perf: define locale equivalences in i18n folder
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-03 09:18:35 +01:00
Javier Segarra 899ccc097a refs #6098 perf: remove import.meta.glob 2024-01-03 09:18:13 +01:00
Carlos Satorres be02a1f47a Merge branch 'dev' into 6256-breakWord
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-03 08:16:56 +00:00
Pablo Natek 660906fa0e Merge branch 'dev' into 6259-ticketSmsToClientSms
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-02 17:35:31 +00:00
Kevin Martinez a5cbc55a7e Fix form model feedback 2024-01-02 12:36:09 -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
Kevin Martinez 606f4f0892 Implement orders catalog tag filter 2024-01-02 11:40:07 -04:00
William Buezas 219bacaebc merge with branch branch-PR2 2024-01-02 10:35:48 -03:00
Jorge Penadés 34e71c1900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-02 12:48:03 +01:00
William Buezas 9b9ac4dfe1 PR fixes 2024-01-02 08:47:38 -03:00
William Buezas 1ab31a1e51 Extended List big modifications and column add column filter component 2023-12-29 11:08:11 -03:00
William Buezas 59e2e20827 Merge pull request 'feature/ms-68-WorkersDepartments' (#45) from feature/ms-68-WorkersDepartments into dev
Reviewed-on: hyervoni/salix-front-mindshore#45
2023-12-28 15:07:33 +00:00
William Buezas 893b1bb4c8 Add department basic data 2023-12-26 16:15:46 -03:00
Carlos Satorres 191114cf85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6256-breakWord
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-26 11:54:51 +01:00
Pablo Natek f9b2faf918 feat(VnSms): refs #6259 unify ticket and customer sms 2023-12-26 09:53:47 +01:00
William Buezas 2e09fbd968 Department tree and summary view 2023-12-25 20:38:13 -03:00
William Buezas 465b595a92 correct qicon sizes 2023-12-22 08:32:49 -03:00