wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
3,803 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

3803 Commits

Author SHA1 Message Date
Jorge Penadés bd6e45d260 refactor: refs #6238 get percentage from back 2024-06-14 14:52:39 +02:00
Jorge Penadés fc54b44c7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn 2024-06-14 09:05:49 +02:00
Javier Segarra 914a9afb92 Merge pull request 'Fix worker department: Create modal did not open' (!441) from hyervoni/salix-front-mindshore:bugfix/WorkerDepartment into dev 
Reviewed-on: verdnatura/salix-front#441
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-13 12:57:40 +00:00
Javier Segarra 7d73cd0e33 Merge branch 'dev' into bugfix/WorkerDepartment 2024-06-13 14:56:34 +02:00
Javier Segarra 648546888d fix: DeleteDepartment VnConfirm 2024-06-13 14:56:19 +02:00
Pablo Natek 78042ab109 Merge pull request 'fix: refs #7499 id article' (!428) from 7499-refactorEntrys into dev 
Reviewed-on: verdnatura/salix-front#428
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-13 05:41:26 +00:00
Pablo Natek e10755d8fe Merge branch 'dev' into 7499-refactorEntrys 2024-06-13 05:39:13 +00:00
Javier Segarra ffd4109dc7 Merge branch 'dev' into bugfix/WorkerDepartment 2024-06-12 20:23:30 +00:00
Jorge Penadés 7393b82008 refactor: refs #6238 update getRate function and color logic 2024-06-12 16:46:14 +02:00
Jorge Penadés 19aa1bf01d fix; refs #6238 fix test 2024-06-12 14:48:31 +02:00
William Buezas b0e4dc99b0 Fix worker department create modal did not open 2024-06-12 08:47:32 -03:00
Jorge Penadés 2641489d83 fix: refs #6238 use .value prop 2024-06-12 13:45:17 +02:00
Jorge Penadés 1052e9eb21 fix: refs #6238 use :deep 2024-06-12 13:14:02 +02:00
Jorge Penadés a4c21c7673 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6238-addPercentageColumn 2024-06-12 12:42:23 +02:00
Jorge Penadés 51d497a1de feat: refs #6238 add percentage & summary btn 2024-06-12 12:17:52 +02:00
Guillermo Bonet 9388cb3599 Merge branch 'test' into dev 2024-06-12 12:02:12 +02:00
Guillermo Bonet 135e05b139 hotfix: refs #6636 EN i18n 2024-06-12 12:00:43 +02:00
Javier Segarra ef24a5cd2f Merge pull request '#7323 FIX default model value depends on route' (!437) from 7323_fix_workerTimeControl into dev 
Reviewed-on: verdnatura/salix-front#437
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-12 07:33:27 +00:00
Javier Segarra 11c0154c48 Merge branch 'dev' into 7323_fix_workerTimeControl 2024-06-12 07:31:51 +00:00
Alex Moreno 11d1fdd80e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-12 08:41:03 +02:00
Alex Moreno 6a19687066 Merge pull request 'feat(jenkinsfile): use build_id' (!438) from jenkinsFile_useBuildIdInVersion into master 
Reviewed-on: verdnatura/salix-front#438
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-06-12 06:21:36 +00:00
Pablo Natek b7a097fd13 Merge branch 'dev' into 7499-refactorEntrys 2024-06-12 06:16:48 +00:00
Alex Moreno 937f75ec63 feat(jenkinsfile): use build_id 2024-06-12 07:40:04 +02:00
Jon Elias 79e84175a6 Merge pull request '#7154 new item descriptor field' (!436) from 7154-ItemDescriptor into dev 
Reviewed-on: verdnatura/salix-front#436
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-12 05:05:33 +00:00
Jon Elias df364dca4a Merge branch 'dev' into 7154-ItemDescriptor 2024-06-12 05:04:16 +00:00
Javier Segarra e9051f1ee8 Merge pull request 'Account views: Accounts, Ldap, Samba' (!426) from hyervoni/salix-front-mindshore:feature/AccountFormsView into dev 
Reviewed-on: verdnatura/salix-front#426
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-11 19:14:29 +00:00
Javier Segarra d0759cb654 Merge branch 'dev' into feature/AccountFormsView 2024-06-11 21:12:13 +02:00
Pablo Natek a65f5dfe44 fix: refs #7499 use current colors 2024-06-11 16:38:12 +02:00
Jon Elias 4045a3a631 Merge branch 'dev' into 7154-ItemDescriptor 2024-06-11 12:56:52 +00:00
Javi Gallego cb0559fee8 Merge pull request '7548-ticketSummaryCollection' (!432) from 7548-ticketSummaryCollection into dev 
Reviewed-on: verdnatura/salix-front#432
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 12:53:42 +00:00
Pablo Natek 6789f3d1cb fix: refs #7499 fix style 2024-06-11 14:32:01 +02:00
Jon Elias 2d0b33c626 Merge branch '7154-ItemDescriptor' of https://gitea.verdnatura.es/verdnatura/salix-front into 7154-ItemDescriptor 2024-06-11 14:29:44 +02:00
Jon Elias de18b670ea feat: refs #7154 changed label 2024-06-11 14:29:42 +02:00
Pablo Natek be919f97b1 Merge branch '7499-refactorEntrys' of https://gitea.verdnatura.es/verdnatura/salix-front into 7499-refactorEntrys 2024-06-11 14:28:20 +02:00
Pablo Natek 80adeede81 fix: refs #7499 fix item reference 2024-06-11 14:28:19 +02:00
Javier Segarra 7ac2aed326 fix: default model value depends on route 2024-06-11 14:09:42 +02:00
Jon Elias 989ea3d82c Merge branch 'dev' into 7154-ItemDescriptor 2024-06-11 11:49:25 +00:00
Jon Elias e5a590a9f9 feat: refs #7154 new item descriptor field 2024-06-11 13:48:15 +02:00
Javier Segarra 57eadbc74e Merge pull request 'Account connections' (!424) from hyervoni/salix-front-mindshore:feature/AccountConnections into dev 
Reviewed-on: verdnatura/salix-front#424
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-11 08:53:26 +00:00
Javier Segarra fac9b6a439 Merge branch 'dev' into feature/AccountConnections 2024-06-11 07:39:41 +00:00
Javier Segarra fde004af3c Merge pull request 'Worker descriptor menu' (!433) from hyervoni/salix-front-mindshore:feature/WorkerDescriptorMenu into dev 
Reviewed-on: verdnatura/salix-front#433
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 07:39:05 +00:00
Javier Segarra adbc9dee2c Merge branch 'dev' into feature/WorkerDescriptorMenu 2024-06-11 07:37:06 +00:00
Jorge Penadés 0624f8dfb7 Merge pull request '#6243 generalize cmr section' (!349) from 6243-generalizeCmrSection into dev 
Reviewed-on: verdnatura/salix-front#349
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 07:36:38 +00:00
Jorge Penadés 11bcfb0d2d Merge branch 'dev' into 6243-generalizeCmrSection 2024-06-11 07:34:34 +00:00
Jorge Penadés 31081bd471 Merge pull request '#6598 create useAcl composable' (!345) from 6598-getUserAcl into dev 
Reviewed-on: verdnatura/salix-front#345
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-06-11 07:32:46 +00:00
Jorge Penadés 205e7d82a6 Merge branch 'dev' into 6598-getUserAcl 2024-06-11 07:31:15 +00:00
Jorge Penadés 0cfaef2520 Merge pull request '#6273 fix redirect' (!434) from 6273-fixRedirect into dev 
Reviewed-on: verdnatura/salix-front#434
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 07:18:14 +00:00
Jorge Penadés c5889b2170 Merge branch 'dev' into 6273-fixRedirect 2024-06-11 07:16:59 +00:00
Jorge Penadés 01658ee100 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl 2024-06-11 09:10:19 +02:00
Jorge Penadés f9b688fc37 Merge branch 'dev' into 6243-generalizeCmrSection 2024-06-11 07:02:37 +00:00