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

3247 Commits

Author SHA1 Message Date
Alex Moreno c3e425590c Merge pull request '7383-testToMaster' (!370) from 7383-testToMaster into master 
Reviewed-on: verdnatura/salix-front#370
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-05-14 05:46:55 +00:00
Javier Segarra dcbf2eb837 Merge pull request 'Monitors' (!364) from hyervoni/salix-front-mindshore:feature/Monitors into dev 
Reviewed-on: verdnatura/salix-front#364
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-05-13 16:02:29 +00:00
Javier Segarra 32e715ce6b Merge branch 'dev' into feature/Monitors 2024-05-13 17:59:39 +02:00
Jorge Penadés b062474f91 fix: refs #6891 fix invoiceInDueDay test 2024-05-13 17:20:50 +02:00
Jorge Penadés 5b3ee220d4 fix: refs #6891 fix ticketDescriptor test 2024-05-13 17:07:59 +02:00
Jorge Penadés 364367d2f1 fix: refs #6891 fix invoiceInBasicData test test 2024-05-13 16:46:28 +02:00
Jorge Penadés 6a6d5b6d23 fix: refs #6891 fix workerLocker test 2024-05-13 16:22:12 +02:00
Jorge Penadés a878ad23b9 fix: refs #6891 fix invoiceInform design 2024-05-13 16:01:18 +02:00
Jorge Penadés fdd3c41c96 feat: refs #6891 update changelog 2024-05-13 15:46:48 +02:00
Jorge Penadés 07b91febb6 feat: refs #6891 unit test 2024-05-13 15:41:35 +02:00
William Buezas 7b99d2f38b re order translation 2024-05-13 10:31:11 -03:00
William Buezas 8e7b043a46 Resolve conflicts 2024-05-13 10:28:21 -03:00
Jorge Penadés d55dc638d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-13 15:23:37 +02:00
Javier Segarra 1181cd0daa Merge branch 'dev' into 7271-EndZoneMigration 2024-05-13 12:15:50 +00:00
Javier Segarra a94c1a32e1 fix: show label agency instead id 2024-05-13 14:13:41 +02:00
Jorge Penadés cde918744d Merge pull request '#5919 locker' (!338) from 5919-locker into dev 
Reviewed-on: verdnatura/salix-front#338
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-05-13 12:08:47 +00:00
Jorge Penadés 0b83d3663f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker 2024-05-13 13:20:15 +02:00
Jon Elias 14910c5899 feat: refs #7271 basicData and Log 2024-05-13 12:46:25 +02:00
Javier Segarra 4fb4cb9298 Merge pull request 'ZoneList and ZoneSummary' (!365) from hyervoni/salix-front-mindshore:feature/ZoneList into dev 
Reviewed-on: verdnatura/salix-front#365
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-13 08:00:21 +00:00
Alex Moreno 0ed3cafcab Merge branch 'dev' into feature/ZoneList 2024-05-13 07:31:17 +00:00
Alex Moreno a28d18f1e1 fix: redirection when clone and styles 2024-05-13 09:30:03 +02:00
Jorge Penadés f08a7a2e9d Merge branch '5919-locker' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker 2024-05-13 08:55:14 +02:00
Jorge Penadés ad14d2e776 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker 2024-05-13 08:55:03 +02:00
Javier Segarra 05698af75d Merge branch 'dev' into 5919-locker 2024-05-13 06:47:54 +00:00
Javier Segarra 722373fd99 Merge branch 'dev' into feature/Monitors 2024-05-13 06:47:41 +00:00
Jorge Penadés cd0dd6a735 feat: refs #5919 changeLog 2024-05-10 16:12:52 +02:00
Jorge Penadés a692ca4a18 feat: refs #5919 test & set workerFk null. 2024-05-10 16:01:32 +02:00
Jon Elias e0bb8da47f Merge pull request 'refactor: refs #6767 deleted <div class="col">' (!302) from 6767-deleteDivCol into dev 
Reviewed-on: verdnatura/salix-front#302
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-05-10 12:40:53 +00:00
Jorge Penadés 7fd4c43b8b feat: refs #5919 workerlocker 2024-05-10 13:07:58 +02:00
Jon Elias 2183385e58 Merge branch 'dev' into 6767-deleteDivCol 2024-05-10 09:39:31 +00:00
Javier Segarra daf1d4de2d style changes 2024-05-10 08:51:47 +02:00
Javier Segarra cb24ac81ff Merge branch 'dev' into feature/ZoneList 2024-05-10 08:46:00 +02:00
Javier Segarra 049564f443 fix: Descriptor 2024-05-10 08:45:38 +02:00
Javier Segarra 1100588af5 fix: minor size icons 2024-05-10 08:40:56 +02:00
Javier Segarra 2697078a55 feat: Replace CarList by Table 2024-05-10 08:40:47 +02:00
Jorge Penadés 626a369f84 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker 2024-05-10 08:35:42 +02:00
Javier Segarra 7f185c091b feat: add descriptor 2024-05-10 08:13:02 +02:00
William Buezas 7216b90a3e Fix filter panel bug 2024-05-09 15:13:45 -03:00
Javier Segarra f374fe859d Merge branch 'feature/Monitors' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/Monitors 2024-05-09 17:46:28 +02:00
Javier Segarra 104ea5b8e5 feat: refreshInterval 2024-05-09 17:46:24 +02:00
William Buezas d227d4b09b Zone create 2024-05-09 11:32:04 -03:00
William Buezas b4f983b946 Add searchbar 2024-05-09 09:15:52 -03:00
William Buezas 7cc5c0bdbd Fix client table initial request 2024-05-09 08:40:09 -03:00
Javier Segarra a6ec40beb4 fix: style second row 2024-05-09 13:32:03 +02:00
Javier Segarra 2df0c1eba9 fix: ticketsMonitor title 2024-05-09 13:26:53 +02:00
William Buezas 9b9e482fa7 Zone list and Zone summary 2024-05-09 08:21:30 -03:00
Carlos Satorres fcb6f8dd49 Merge pull request '#6877 - itemRequestMod' (!362) from 6877-itemRequestMod into dev 
Reviewed-on: verdnatura/salix-front#362
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-05-09 10:55:03 +00:00
Carlos Satorres 349a101680 Merge branch 'dev' into 6877-itemRequestMod 2024-05-09 10:53:27 +00:00
Javier Segarra e7833206e7 fix: Risk field 2024-05-09 12:10:26 +02:00
Javier Segarra 437a75da4e fix: CustomerExtendedList paginate 2024-05-09 10:25:27 +02:00