Commit Graph

325 Commits

Author SHA1 Message Date
Javier Segarra 4af2ef49a0 refs #6930: replace tokenUSer with tokenMultimedia
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-26 07:11:33 +01:00
Alex Moreno 9abac4a8fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-22 09:11:36 +01:00
Alex Moreno c184851b26 Merge branch 'dev' into 6763-vnTreeRefact
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-21 08:49:40 +00:00
William Buezas d5d8de08fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ExtraCommunityDragAndDrop
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-19 09:24:10 -03:00
Carlos Satorres 5cc2384149 refs #6763 remove
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-19 11:30:04 +01:00
Carlos Satorres 7397f07463 refs #6763 remove 2024-02-19 11:29:30 +01:00
Carlos Satorres 01850c6670 refs #6763 pointer
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-19 11:24:49 +01:00
Carlos Satorres 4eb2f1f725 Merge branch '6763-vnTreeRefact' of https://gitea.verdnatura.es/verdnatura/salix-front into 6763-vnTreeRefact
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-19 10:26:08 +01:00
Carlos Satorres 3a48d09080 refs #6763 refactor node 2024-02-19 10:26:05 +01:00
Alex Moreno e8a4dd65e2 Merge branch 'dev' into 6763-vnTreeRefact
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-19 08:35:15 +00:00
Javier Segarra fddc669729 refs #6763 feat: fix features
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-19 05:51:35 +01:00
Carlos Satorres 5f28296725 Merge branch 'dev' into 6795-claimRefact
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-16 13:06:21 +00:00
Carlos Satorres deacf0feef Merge branch 'dev' into 6787-loadingDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-16 12:50:32 +00:00
William Buezas e29801a47e General improvements and handle params changes in VnFilterPanel
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-14 22:14:44 -03:00
Carlos Satorres 926395a7e7 refs #6763 fix tree descriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-14 15:31:53 +01:00
Carlos Satorres 1e5638b487 refs #6787 fix descriptor skeleton
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-13 12:44:20 +01:00
Carlos Satorres c2675bfe56 refs #6763 fix descriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-13 11:31:33 +01:00
Alex Moreno 1db827a7c8 refs #6795 fix: claim paddings and colors
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-02-13 08:03:31 +01:00
Carlos Satorres e3e0439d7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6763-vnTreeRefact 2024-02-12 14:07:08 +01:00
Alex Moreno 34e907eb32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 09:41:21 +01:00
Carlos Satorres d13bf60ea3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6795-claimRefact 2024-02-09 09:08:56 +01:00
Carlos Satorres b3251967b8 refs #6795 fix descriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-09 09:07:54 +01:00
Carlos Satorres 2f081841f9 refs #6795 fix claims
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 13:59:37 +01:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-08 12:32:28 +01:00
Alex Moreno 76680dd715 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-08 07:26:27 +01:00
Carlos Satorres 7175c50bd6 refs #6763 popup fix click
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-06 09:50:18 +01:00
Alex Moreno 7b68f15781 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-05 12:54:58 +01:00
Carlos Satorres 760b2d5574 refs #6787 isLoading CardDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-05 10:30:23 +01:00
William Buezas 6c8e736b17 changes in entry searchbar
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-02 14:08:17 -03:00
Carlos Satorres c6a9ec5415 refs #6763 fix changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-02 09:55:38 +01:00
Carlos Satorres 5450f948a3 refs #6763 fix tree
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-02-01 12:35:20 +01:00
William Buezas 2bbd93748f merge with dev 2024-01-31 11:31:06 -03:00
Carlos Satorres 78877556cf refs #6763 click
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2024-01-31 12:52:50 +01:00
Jorge Penadés 3c67e1d51c Merge branch '6654-stickySubToolbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar
gitea/salix-front/pipeline/head This commit looks good Details
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
Alex Moreno 5b6a526932 refs #5509 feat: VnDms feat: EntryDms
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-29 15:12:30 +01:00
Carlos Satorres 979b95ff98 Merge branch 'dev' into 6339-cilpboard
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-29 13:59:51 +00:00
Jorge Penadés 1d7316dd6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-29 14:10:58 +01:00
William Buezas 5e296869a1 More improvements 2024-01-29 08:59:20 -03:00
Jorge Penadés 0edfe24a85 fix: refs #6654 fix css
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-29 10:25:59 +01: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
Jorge Penadés d86ac6f31b feat: refs #6654 sticky class
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-26 16:08:49 +01:00
William Buezas 78f37f57c4 move QList element and classes inside VnFilterPanel 2024-01-23 11:42:26 -03:00
Alex Moreno 6bccd4b24f Merge branch 'dev' into 6339-cilpboard 2024-01-22 09:22:14 +00:00
Carlos Satorres 259902a7ea refs #6339 composable
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-18 14:59:51 +01:00
Carlos Satorres 339d6609aa refs #6339 clipboard 2024-01-18 13:33:14 +01:00
William Buezas 3671a7b449 Entry descriptor 2024-01-17 10:45:58 -03:00
Javier Segarra a94fb6026a refs #6704: remove bad code 2024-01-16 12:14:48 +01:00
Javier Segarra b58f9bee2e refs #6704: fix bug 2024-01-16 11:24:28 +01:00
Javier Segarra 9daffdfa22 refs #6704: posible fix 2024-01-16 08:40:03 +01:00
Javier Segarra 972c340fad refs #6704: fix1 2024-01-15 14:44:38 +01:00
William Buezas 627226d3cd Entry list 2024-01-11 14:58:22 -03:00
Jorge Penadés ae94ff014d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6630-fixCssVnLog
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-11 15:59:04 +01:00
Javier Segarra 0f1cfc0041 Merge branch 'dev' into 6384_vnSearchbar_redirect
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-11 12:37:35 +00:00
Alex Moreno 13d24e936e Merge branch 'dev' into 6384_vnSearchbar_redirect
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-11 11:22:14 +00:00
Alex Moreno bc46435299 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-11 12:09:16 +01:00
Jorge Penadés 1bc2abdab2 fix: refs #6630 drop unused imports
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-11 11:44:53 +01:00
Jorge Penadés 3c8022ac45 feat: refs #6630 VnAvatar letter feature added
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-10 16:49:09 +01:00
Jorge Penadés cdadb57af3 fix: refs #6630 resolve conficts
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-10 15:41:00 +01:00
Jorge Penadés 0eb7d0f1b0 fix: refs #6630 resolve conficts
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-10 15:35:01 +01:00
Jorge Penadés 2555d2b2d1 feat: refs #6643 create VnUserLink
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-10 11:21:02 +01:00
Carlos Satorres b83a773278 refs #6420 fix pr
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-09 14:55:52 +01:00
Jorge Penadés 3e8744c837 fix: refs #6630 fix css
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-09 14:24:29 +01:00
Javier Segarra 8861ee038d refs #6384 fix: redirect to same path when id change 2024-01-09 10:35:39 +01:00
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
Carlos Satorres 63b1c53ca9 refs #6420 scss fix
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-08 14:17:40 +01:00
Carlos Satorres 651cc6b1ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6420-claimNotesSummary
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-08 13:46:33 +01: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
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
Carlos Satorres 7ae05f23fc refs #6420 notes
gitea/salix-front/pipeline/head This commit looks good Details
2024-01-04 14:38:33 +01: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
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
William Buezas a66b88ba8e add delete department popup translation 2024-01-03 10:59:11 -03: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
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
Kevin Martinez 606f4f0892 Implement orders catalog tag filter 2024-01-02 11:40:07 -04: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 37d1239af1 Workers WIP 2023-12-22 08:28:08 -03:00
Pablo Natek 8a36fc03b8 refactor(ticketsms): refs #6259 add vnSms create customerSms
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-21 18:59:13 +01:00
Carlos Satorres 9a4a3e846e refs #6256 remove hypens
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-20 13:28:58 +01:00
Kevin Martinez af5f87a6a1 Add catalog filter 2023-12-20 01:52:28 -04:00
Kevin Martinez ecad464366 Add search filter 2023-12-19 21:33:38 -04:00
Kevin Martinez 42c8e8c80f Merge branch 'dev' into feature/order 2023-12-19 00:59:53 -04:00
Jorge Penadés 94278e2f53 refactor: refs #5835
gitea/salix-front/pipeline/head This commit looks good Details
2023-12-18 15:36:56 +01:00
William Buezas 433823c2ac Invoice out negative bases refactor 2023-12-15 10:23:57 -03:00
Kevin Martinez c0f6906119 Merge branch 'dev' into feature/order
# Conflicts:
#	src/i18n/en/index.js
#	src/router/modules/index.js
2023-12-14 07:08:58 -04:00
William Buezas b3e0f4979a add is-outlined prop to VnInputDate and merge with dev 2023-12-13 14:31:48 -03:00
Alex Moreno 7557096af6 refs #6062 fix: migration errors
gitea/salix-front/pipeline/head There was a failure building this commit Details
2023-12-13 14:19:42 +01:00