Commit Graph

7307 Commits

Author SHA1 Message Date
Jorge Penadés 04aa96b798 chore: refs #4074 fix tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 17:01:36 +02:00
Jorge Penadés 26c7dfde35 chore: refs #4074 fix tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 16:44:43 +02:00
Javier Segarra 67b2cd3a0b feat: stateGroupedFilter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 14:58:26 +02:00
Javier Segarra eed844aeb5 Merge pull request '#7671 - ItemFixedPrices dense rows' (!527) from 7671_dense_itemFixedPrices into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #527
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-09 12:33:11 +00:00
Javier Segarra b3f305a3fd Merge branch 'dev' into 7671_dense_itemFixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 12:17:59 +00:00
Jorge Penadés bd00f86d74 chore: refs #4074 fix tests
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 14:09:29 +02:00
Jorge Penadés ee62f85250 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 13:59:13 +02:00
Jon Elias 8f8462db94 Merge branch 'dev' into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 11:53:41 +00:00
Jon Elias 6248a4117d refactor: refs #7553 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 13:52:41 +02:00
Jorge Penadés 7fe5923ee2 Merge pull request 'fix: refs #7909 add originFk' (!691) from 7909-hotfix-rollbackScroll into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #691
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-09 11:44:40 +00:00
Jorge Penadés ac421344d0 fix: refs #7909 add originFk
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-09 13:41:04 +02:00
Jorge Penadés 28b4bac761 Merge branch '7909-hotfix-rollbackScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-rollbackScroll
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-09 13:38:51 +02:00
Jorge Penadés 803c02b80d fix: refs #7909 rollback scroll 2024-09-09 13:38:27 +02:00
Javi Gallego 7c22a5d0ac feat: fix refund parameters
gitea/salix-front/pipeline/head This commit looks good Details
2024-09-09 13:18:51 +02:00
Jorge Penadés 9506ed695b fix: refs #7909 rollback scroll
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-09 13:17:38 +02:00
Javier Segarra 52d8ff8ae2 fix: isFullMovable checkbox 2024-09-09 13:15:45 +02:00
Javier Segarra 7bc288ad71 fix: state cell 2024-09-09 13:15:37 +02:00
Jorge Penadés 132501e4a4 Merge pull request 'feat: refs #7909 add scroll' (!659) from 7909-hotfix-addScroll into master
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #659
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-09 11:11:26 +00:00
Alex Moreno 9e94cb2d36 Merge pull request 'feat(AccountConnections): use VnToken' (!471) from 7547-accessToken-security into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #471
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-09-09 11:05:07 +00:00
Jorge Penadés 6f2018271e Merge branch '7909-hotfix-addScroll' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-addScroll
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-09 13:04:11 +02:00
Jorge Penadés 5ce3ef8bea Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7909-hotfix-addScroll 2024-09-09 13:03:39 +02:00
Jorge Penadés 381b236a18 refactor: refs #4074 use acl & drop useless roles
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 12:56:37 +02:00
Alex Moreno 070f0da757 Merge branch 'dev' into 7547-accessToken-security
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 10:55:22 +00:00
Javier Segarra 83d3246377 Merge branch 'dev' into 6156-advanceTicketsNewField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 10:48:44 +00:00
Carlos Satorres 9be8accb27 Merge pull request '#7283 - fixItemDescriptor' (!680) from 7283-fixItemDescriptor into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #680
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-09 10:40:41 +00:00
Carlos Satorres 15a764d1cf refs #7283 fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 12:35:47 +02:00
Carlos Satorres 49071e52ef Merge branch '7283-fixItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor
gitea/salix-front/pipeline/pr-dev Build queued... Details
2024-09-09 12:35:39 +02:00
Jorge Penadés 6438f36eca refactor: refs #4074 accept array
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 12:28:14 +02:00
Javier Segarra 2667d3afae feat: show preparation field
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 12:07:22 +02:00
Carlos Satorres 92afbc5c86 Merge branch 'dev' into 7283-fixItemDescriptor
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 10:06:10 +00:00
Carlos Satorres 6c78fb1bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-fixItemDescriptor 2024-09-09 12:06:01 +02:00
Carlos Satorres 3004d77d34 refs #7283 fix ItemDescriptor warehouse
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 12:05:08 +02:00
Jorge Penadés 803ce3b909 refactor: refs #4074 rollback
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 11:53:59 +02:00
Jorge Penadés c978cca8c5 refactor: refs #4074 useAcl in navigationStore & router
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2024-09-09 11:35:49 +02:00
Jon Elias e702e9d1a1 Merge branch '6346-fixWagonModule' of https://gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 10:04:48 +02:00
Jon Elias f78ca3f357 Merge branch 'dev' of https: refs #6346//gitea.verdnatura.es/verdnatura/salix-front into 6346-fixWagonModule 2024-09-09 10:04:44 +02:00
Jorge Penadés bef9b05b45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4074-useAcls
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 10:03:51 +02:00
Jon Elias 5f546a47bf Merge branch 'dev' into 7500_ChangeEntryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 08:02:17 +00:00
Alex Moreno 684215fc46 feat(AccountBasicData): add twoFactorFk
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 09:59:22 +02:00
Jon Elias 6a96b252b4 Merge branch 'dev' into 7889-KeyShortcuts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 07:47:40 +00:00
Jon Elias 2bd80b2ee7 perf: refs #7889 perf shortcut test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 09:45:30 +02:00
Jorge Penadés b4ef1e297a Merge pull request 'refactor: refs #7323 drop useless code' (!687) from 7323-fixWorkerDescritor into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #687
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-09 07:05:08 +00:00
Jon Elias de08ae81a3 Merge branch '7889-KeyShortcuts' of https://gitea.verdnatura.es/verdnatura/salix-front into 7889-KeyShortcuts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 08:47:47 +02:00
Jon Elias ba7497f055 fix: refs #7889 fixed shortcut test 2024-09-09 08:47:44 +02:00
Jon Elias 0b961050a0 refactor: refs #7553 rollback ticket advance due to slot problems
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 08:14:53 +02:00
Jon Elias 94ae74ca7f Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 08:10:06 +02:00
Jon Elias 4630496361 refactor: refs #7553 changed fields in ticket component & ticket filter 2024-09-09 08:10:05 +02:00
Jon Elias 459551b16e Merge branch 'dev' into 7889-KeyShortcuts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 05:30:14 +00:00
Jon Elias b61e2a5c28 Merge branch 'dev' into 7500_ChangeEntryDms
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-09 05:27:53 +00:00
Javier Segarra 6de4d5f123 Merge branch '7671_dense_itemFixedPrices' of https://gitea.verdnatura.es/verdnatura/salix-front into 7671_dense_itemFixedPrices
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-08 12:56:47 +02:00