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

5186 Commits

Author SHA1 Message Date
Pablo Natek b7a097fd13 Merge branch 'dev' into 7499-refactorEntrys 2024-06-12 06:16:48 +00:00
Alex Moreno c3409a9d5c Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-12 07:50:41 +02:00
Alex Moreno 937f75ec63 feat(jenkinsfile): use build_id 2024-06-12 07:40:04 +02:00
Alex Moreno 048685277f Merge branch 'dev' into 6825-vnTable 2024-06-12 05:31:31 +00: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
William Buezas 89f6873b03 WIP 2024-06-11 22:40:07 -03: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
Carlos Satorres a7b805a4ab stash departmentFilter 2024-06-11 16:24:07 +02:00
Alex Moreno 3dfe3226ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-11 15:00:52 +02:00
Alex Moreno 00da1c2808 feat: adapt tu VnTable → CrudModel 2024-06-11 15:00:43 +02:00
Alex Moreno 14e27f193e feat: adapt tu VnTable → CrudModel 2024-06-11 15:00:03 +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
Alex Moreno 59e72dcd50 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-11 12:53:50 +02:00
Javier Segarra 25f4d1f654 fix: point 3 2024-06-11 11:58:27 +02:00
Javier Segarra fe2412f6d9 fix: point 1 2024-06-11 11:58:20 +02:00
Javier Segarra 4e2358d722 fix: point 3 2024-06-11 11:58:06 +02:00
Alex Moreno f753eddc43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-11 11:40:58 +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
Carlos Satorres ba0364e799 refs #6897 fix BasicData 2024-06-11 10:30:42 +02: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
Carlos Satorres 31afa22de8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration 2024-06-11 09:20:23 +02: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
Carlos Satorres 8e9656f96a refs #7366 remove warning 2024-06-11 09:10:25 +02: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
Carlos Satorres 313395ef7c refs #7366 fix travelMigration 2024-06-11 09:06:09 +02:00
Jorge Penadés f9b688fc37 Merge branch 'dev' into 6243-generalizeCmrSection 2024-06-11 07:02:37 +00:00
Alex Moreno 9cfdbb3a8b hotFix: increase version 2024-06-11 08:54:30 +02:00
Carlos Satorres b07f7b0003 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration 2024-06-11 08:35:35 +02:00
Alex Moreno 92531216d1 Merge pull request '7565-testToMaster' (!431) from 7565-testToMaster into master 
Reviewed-on: verdnatura/salix-front#431
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-06-11 06:32:59 +00:00
Alex Moreno 0289c167ee refactor: unnecessary computed 2024-06-11 08:30:18 +02:00
Alex Moreno 5e7ef68439 feat: simplify html 2024-06-11 08:22:26 +02:00