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

3687 Commits

Author SHA1 Message Date
Jon Elias eb91c0b1c2 Merge branch 'dev' into 6425-translationProposal 2024-04-10 12:53:44 +02:00
Jon Elias 81d0e397f0 Merge pull request '#7186 - tabIndexVATExpenses' (!277) from 7186-tabIndexVATExpenses into dev 
Reviewed-on: verdnatura/salix-front#277
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-10 07:37:01 +00:00
Jon Elias e3e6c74afa Merge branch 'dev' into 7186-tabIndexVATExpenses 2024-04-10 07:36:17 +00:00
jcasado c640ba1298 fix set 2024-04-10 09:31:38 +02:00
jcasado 70c9f1dea4 refs #7179 changes pr 2024-04-10 09:29:26 +02:00
Jon Elias 09ceefb7c5 style: refs #7186 fixed style 2024-04-10 08:49:54 +02:00
Jorge Penadés a153146f82 Merge pull request '#6992 add URL params' (!273) from 6992-addQueryParamsUrl into dev 
Reviewed-on: verdnatura/salix-front#273
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-10 06:45:14 +00:00
Jon Elias f9de26933a refactor: refs #7186 fill-icon change 2024-04-10 08:00:36 +02:00
William Buezas e88194eb88 Update worker dms model prop 2024-04-09 16:00:12 -03:00
William Buezas fc4a69b2c6 resolve conflicts in worker routes 2024-04-09 15:28:11 -03:00
William Buezas c3835dfd7a resolve conflicts 2024-04-09 15:23:05 -03:00
William Buezas 9bffc9bb25 classes and size improvements 2024-04-09 15:20:29 -03:00
William Buezas faa8d05313 Change saturday and sunday days color 2024-04-09 14:48:51 -03:00
William Buezas c573019038 Sizes and spacings 2024-04-09 14:13:40 -03:00
William Buezas 9ea0a62046 Add border and change background color 2024-04-09 14:03:18 -03:00
William Buezas dfcf6e35d5 Change WorkerEventLabels separations 2024-04-09 11:06:07 -03:00
William Buezas 3e5a5dfe1c remove import 2024-04-09 10:53:07 -03:00
William Buezas 9c3407846b Fix translation 2024-04-09 10:30:40 -03:00
Jorge Penadés 83bf8183f0 fix: refs #6992 warning console & formModel hook 2024-04-09 15:12:54 +02:00
Jorge Penadés 6349a3e790 feat: refs #6992 comments 2024-04-09 15:08:54 +02:00
jcasado d8ef199b14 refs #7179 remove code 2024-04-09 14:55:27 +02:00
William Buezas 881c6e2f7f Improve translations 2024-04-09 09:54:23 -03:00
William Buezas fb4f35a378 Rename WorkerDateLabel and change colors 2024-04-09 09:21:35 -03:00
William Buezas 0941d74d52 Move default value assignment 2024-04-09 09:14:41 -03:00
William Buezas 196679b9e9 Change v-if variable 2024-04-09 09:07:46 -03:00
William Buezas e4166c85fa Move add absences text to a i18n variable 2024-04-09 09:05:15 -03:00
William Buezas b05c28f571 Add chaining to holiday detail and holiday type 2024-04-09 08:57:39 -03:00
William Buezas 0144aab7a5 Mini fix 2024-04-09 08:51:00 -03:00
Jon Elias 15d4b54dda refactor: refs #7186 fixed changes 2024-04-09 13:34:45 +02:00
jcasado 97ad1c7579 refs #7179 changes customer proxy and client Id 2024-04-09 13:32:01 +02:00
William Buezas f6e140e369 Apply workerDms changes 2024-04-09 08:28:00 -03:00
William Buezas e51ea9996b Item list view 2024-04-09 08:18:18 -03:00
Jon Elias 65626446fd refactor: refs #7186 fixed style and tab 2024-04-09 13:01:29 +02:00
Jon Elias c217e8a1a7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7186-tabIndexVATExpenses 2024-04-09 11:44:11 +02:00
Jorge Penadés 50bce40613 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl 2024-04-09 10:09:41 +02:00
Guillermo Bonet be9dd8b2b7 Merge pull request 'feat: refs #6636 Added pickup in claim' (!268) from 6636-pickup into dev 
Reviewed-on: verdnatura/salix-front#268
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-09 08:04:58 +00:00
Guillermo Bonet 4b9e69625b Merge branch 'dev' into 6636-pickup 2024-04-09 08:02:30 +00:00
Jorge Penadés fdfa99c718 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6992-addQueryParamsUrl 2024-04-09 09:55:44 +02:00
Robert Ferrús cd3024c0a1 feat: refs #6679 add icon 2024-04-09 09:17:49 +02:00
Jon Elias f1c67a9775 Merge pull request 'refactor: refs #6973 updated label and updated cypress test' (!275) from 6973-UpdateVnLocationLabel into dev 
Reviewed-on: verdnatura/salix-front#275
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-09 06:48:49 +00:00
Jon Elias f988923b4b Merge branch 'dev' into 6973-UpdateVnLocationLabel 2024-04-09 06:48:06 +00:00
Jon Elias 0e064b3305 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899-endInvoiceOutMigration 2024-04-09 08:45:12 +02:00
Jon Elias b7788512bc refactor: refs #6973 fix requested changes 2024-04-09 08:41:44 +02:00
Jon Elias 3bededcd94 refactor: refs #6973 updated label and updated cypress test 2024-04-09 07:47:40 +02:00
William Buezas 64ff5e4446 Add pagination and table actions 2024-04-08 11:40:44 -03:00
Jorge Penadés 16548dadef feat: refs #6992 add test 2024-04-08 16:38:36 +02:00
Jorge Penadés 8de3ea16a6 fix: refs #6992 add queryParams 2024-04-08 15:15:18 +02:00
William Buezas 4da540fc9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemsList 2024-04-08 08:47:56 -03:00
William Buezas f12ec3c0c9 Add redirection to summary and open summary action 2024-04-08 08:47:29 -03:00
Carlos Satorres f60670cb87 refs #7172 change vnselectfilter 2024-04-08 10:49:53 +02:00