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

2258 Commits

Author SHA1 Message Date
Javier Casado d72c151d82 Merge pull request 'refs #6816 remove microsip tag' (!267) from 6816-removeMicroSip into dev 
Reviewed-on: verdnatura/salix-front#267
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-05 08:01:10 +00:00
Javier Casado 5d7fed3b32 Merge branch 'dev' into 6816-removeMicroSip 2024-04-05 07:57:21 +00:00
Alex Moreno e14993c114 minor changes 2024-04-05 09:12:49 +02:00
Jon Elias b5f721316b Merge pull request 'refactor: refs #6894 changed filter fields and checked functionality' (!269) from 6894-invoiceInChangeFilters into dev 
Reviewed-on: verdnatura/salix-front#269
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-04-04 12:33:34 +00:00
Jon Elias 59a631b19e Merge branch 'dev' into 6894-invoiceInChangeFilters 2024-04-04 12:32:40 +00:00
Jon Elias 97b7c2469a refactor: refs #6894 changed filter fields and checked functionality 2024-04-04 14:13:34 +02:00
Guillermo Bonet b21c54f20d Merge branch 'test' into dev 2024-04-04 11:31:20 +02:00
Guillermo Bonet d98e5d78ff hotfix: refs #6930 Rollback tokenMultimedia 2024-04-04 10:17:13 +02:00
jcasado d00ec3c41c refs #6816 remove microsip tag 2024-04-04 09:38:47 +02:00
Alex Moreno 06af04a043 Merge pull request '7167-testToMaster_2414' (!266) from 7167-testToMaster_2414 into master 
Reviewed-on: verdnatura/salix-front#266
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-04-04 05:35:07 +00:00
Pablo Natek ef489b74df Merge pull request '7128-copyStyles' (!265) from 7128-copyStyles into dev 
Reviewed-on: verdnatura/salix-front#265
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-04-03 19:12:23 +00:00
Pablo Natek be42593368 Merge branch 'dev' into 7128-copyStyles 2024-04-03 19:10:38 +00:00
Alex Moreno 7ed505bde8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-03 16:30:10 +02:00
Alex Moreno dec71dbf62 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-04-03 16:29:40 +02:00
Pablo Natek c0ed8da0b7 remove space 2024-04-03 15:02:31 +02:00
Pablo Natek f18cefd999 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7128-copyStyles 2024-04-02 14:12:58 +02:00
Pablo Natek c66be3c2b5 feat #7128 fix styles 2024-04-02 14:04:09 +02:00
Pablo Natek 148224344d feat(style): refs #7128 add style 2024-04-02 10:46:27 +02:00
Alex Moreno bed0b9e8e9 Merge pull request '#6951 warmfix ticketDescriptor' (!263) from 6951-warmfix_ticketDescriptor into test 
Reviewed-on: verdnatura/salix-front#263
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-28 09:09:09 +00:00
Jorge Penadés 7020fab851 fix: refs #6951 drop hook & change selector 2024-03-28 09:46:18 +01:00
Alex Moreno 87825daa8e refs #7152 deploy: init version 24.16 2024-03-28 09:23:12 +01:00
Alex Moreno 9ed8fa1bcb Merge pull request '7152-devToTest_2414' (!262) from 7152-devToTest_2414 into test 
Reviewed-on: verdnatura/salix-front#262
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-03-28 08:20:23 +00:00
Alex Moreno 2d3ddd886a Merge pull request 'feat: #6514 create supplierDms lilium' (!258) from 6514-gestDocSupplier into dev 
Reviewed-on: verdnatura/salix-front#258
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-28 07:33:19 +00:00
Jon Elias 2b1fe6fd77 Merge branch '6514-gestDocSupplier' of https://gitea.verdnatura.es/verdnatura/salix-front into 6514-gestDocSupplier 2024-03-28 08:31:57 +01:00
Jon Elias b2691a35e1 refactor: refs #6514 fixed tranlation 2024-03-28 08:31:56 +01:00
Alex Moreno 181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier 2024-03-28 07:17:28 +00:00
Javier Segarra 54b6528962 Merge pull request 'More updates to use scopedMultimedia' (!261) from 6930_scopedMultimedia into dev 
Reviewed-on: verdnatura/salix-front#261
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-28 06:38:25 +00:00
Javier Segarra da93b9cca8 updates 2024-03-28 07:20:54 +01:00
Alex Moreno f0ccb526f0 Merge pull request 'refs #7147 add value' (!260) from 7147-hotfixLanguage into master 
Reviewed-on: verdnatura/salix-front#260
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-27 12:40:35 +00:00
Carlos Satorres e651e116e7 refs #7147 add value 2024-03-27 13:36:51 +01:00
Jorge Penadés 2bec5f0e9c Merge pull request '#6893 redirect on fetch just one record' (!257) from 6893-redirectOnFetchOneRecord into dev 
Reviewed-on: verdnatura/salix-front#257
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-27 12:14:23 +00:00
Jon Elias 72e3fcb4b7 Merge pull request 'refactor: #6988 changed ticket summary view and fixed notes functionality' (!237) from 6988-SummaryRefactor into dev 
Reviewed-on: verdnatura/salix-front#237
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-27 10:51:51 +00:00
Jorge Penadés 5126b6aed8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord 2024-03-27 11:48:56 +01:00
Jorge Penadés 0d74c7f6c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord 2024-03-27 11:18:41 +01:00
Jorge Penadés 20102a89ab feat: refs #6893 improve VnSearchbar & create tests 2024-03-27 11:14:54 +01:00
Jon Elias d555f7e09e Merge branch 'dev' into 6988-SummaryRefactor 2024-03-27 10:02:18 +00:00
Jorge Penadés a9f7cfb8d4 Merge pull request '#5186 create parking section' (!197) from 5186-CreateParkingSection into dev 
Reviewed-on: verdnatura/salix-front#197
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-27 08:42:32 +00:00
Javier Segarra 27f8d5f09c Merge branch '5186-CreateParkingSection' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-27 09:36:19 +01:00
Jorge Penadés 375461abd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6893-redirectOnFetchOneRecord 2024-03-27 08:35:24 +01:00
Jorge Penadés 9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-27 08:30:37 +01:00
Jon Elias 7cfffbd2de Merge pull request 'refactor: #6993 set default QTable pagination' (!239) from 6993-HideAllPagination into dev 
Reviewed-on: verdnatura/salix-front#239
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-27 07:27:22 +00:00
Jon Elias 7072dc783b refactor: refs #6993 fix test error 2024-03-26 09:56:33 +01:00
Jon Elias 9f24f1f97c refactor: refs #6993 merged conflicts 2024-03-26 09:44:54 +01:00
Jon Elias 2c6d95336c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-26 09:35:23 +01:00
Jorge Penadés a0dcd6aee1 feat: refs #6893 replace id & redirect to Card or list 2024-03-26 09:11:53 +01:00
Jon Elias 50b116627b Merge branch '6993-HideAllPagination' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-26 09:10:00 +01:00
Jon Elias 4a7cb8fe8d refactor: refs #6993 fixed conflict 2024-03-26 09:09:58 +01:00
Jon Elias 1ec54d7664 feat: #6514 create supplierDms lilium 2024-03-26 08:55:01 +01:00
Jorge Penadés b46760116f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn 2024-03-26 08:34:15 +01:00
Jorge Penadés c450290d3c Merge pull request '#6485 not open new tab on launch' (!256) from 6485-notOpenTabOnRun into dev 
Reviewed-on: verdnatura/salix-front#256
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-26 07:23:38 +00:00