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

6518 Commits

Author SHA1 Message Date
Javier Segarra 357f3ba308 Merge pull request 'fix: refs #6943 prevent null' (!756) from 6943-warmfix-preventNull into test 
Reviewed-on: verdnatura/salix-front#756
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-25 10:26:14 +00:00
Jorge Penadés d2996f0838 fix: refs #6943 prevent null 2024-09-25 12:23:41 +02:00
Pablo Natek ca568c31ca fix: refs #7129 clone post 2024-09-25 11:51:51 +02:00
Javier Segarra 53d5d123c2 feat: i18n 2024-09-25 11:36:44 +02:00
Javier Segarra fb180f0198 fix: apply order 2024-09-25 11:31:05 +02:00
Javier Segarra 77ad96a58b fix: itemfixedPrice inputs 2024-09-25 11:30:18 +02:00
Pablo Natek 27b699ebf4 fix: refs #7129 some component styles 2024-09-25 11:16:27 +02:00
Javier Segarra a0c324c339 Merge branch '8031_notify_dataSaved' of https://gitea.verdnatura.es/verdnatura/salix-front into 8031_notify_dataSaved 2024-09-25 10:54:13 +02:00
Javier Segarra 72ddeaa90a test: refs #8031 e2e 2024-09-25 10:53:38 +02:00
Jorge Penadés 45b3ed6e17 fix: refs #7207 te2e 2024-09-25 09:53:06 +02:00
Jorge Penadés b54d358617 fix: refs #7207 use right locale 2024-09-25 09:14:35 +02:00
Javier Segarra 8c7ee3024f Merge branch 'dev' into 8031_notify_dataSaved 2024-09-25 09:12:17 +02:00
Jorge Penadés dc6acfadb7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-09-25 08:51:21 +02:00
Pablo Natek 1ee3691cc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues 2024-09-25 08:26:27 +02:00
Jon Elias a14eb53f14 Merge branch 'dev' into 7884-AddLabelerField 2024-09-25 06:02:51 +00:00
Jon Elias 4ff068aa8a Merge pull request '#7553 modified TicketExpedition & changes in ticket section' (!571) from 7553_FixTicketExpedition into dev 
Reviewed-on: verdnatura/salix-front#571
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-25 05:51:15 +00:00
Javier Segarra c1087614c6 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-25 05:50:22 +00:00
Javier Segarra e8a0d44292 Merge pull request 'feat: autofocus after clear' (!747) from vnInput_autoFocus into dev 
Reviewed-on: verdnatura/salix-front#747
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-25 05:50:04 +00:00
Jon Elias ff3ab83727 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-25 05:25:07 +00:00
Javier Segarra bc37e372f5 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-24 20:17:54 +00:00
Javier Segarra 2a64d9643e Merge branch 'dev' into vnInput_autoFocus 2024-09-24 20:16:56 +00:00
Jorge Penadés 86a82c5aad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-09-24 14:39:18 +02:00
Alex Moreno d35b40a891 fix: vnTable color 2024-09-24 14:07:04 +02:00
Alex Moreno 991ad21c77 fix: refs #7155 remove userParams in watcher 2024-09-24 13:16:34 +02:00
Pablo Natek f0c2baa60e fix: refs #7129 remove consoleLog 2024-09-24 12:56:14 +02:00
Pablo Natek 70d640dc37 fix: refs #7129 some style issues 2024-09-24 12:54:34 +02:00
Jon Elias 67a1c28670 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-24 10:51:31 +00:00
Alex Moreno 32328da370 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-24 12:25:24 +02:00
Alex Moreno c9e4ab490d build: init version 2442 2024-09-24 12:23:19 +02:00
Alex Moreno e555bd4cde Merge branch 'test' of https: refs #7155//gitea.verdnatura.es/verdnatura/salix-front into 7155-travel_daysOnward 2024-09-24 12:21:31 +02:00
Alex Moreno d85705bb39 Merge pull request '8032-devToTest_2440' (!751) from 8032-devToTest_2440 into test 
Reviewed-on: verdnatura/salix-front#751
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-09-24 10:05:32 +00:00
Jon Elias 8315eb2b4c Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-24 09:37:17 +00:00
Javier Segarra 41f168ebbe Merge pull request '#7671 - Default Table Order by Description DESC' (!745) from 7671_dense_itemFixedPrices into dev 
Reviewed-on: verdnatura/salix-front#745
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-24 09:24:45 +00:00
Javier Segarra 3affd8712c Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-24 09:22:47 +00:00
Alex Moreno 3d34d9c6bb chore: refs #7155 remove console.log 2024-09-24 10:54:17 +02:00
Jon Elias 8ac0083b9c Merge branch 'dev' into 7884-AddLabelerField 2024-09-24 08:44:15 +00:00
Jon Elias 21f7613f21 Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-24 08:36:57 +00:00
Jon Elias f34e81038e Merge branch '7553_FixTicketExpedition' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-24 10:36:02 +02:00
Jon Elias cd96003c0e refactor: refs #7553 requested changes and added keyup.enter 2024-09-24 10:35:59 +02:00
Jorge Penadés 3eb846b70c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-24 10:15:46 +02:00
Alex Moreno edb6e9ce61 feat(TravelList): add daysOnward 2024-09-24 09:57:05 +02:00
Alex Moreno 2d90a75fa0 Merge pull request 'fix: wagon tests' (!752) from FixWagonTests into dev 
Reviewed-on: verdnatura/salix-front#752
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-24 07:53:08 +00:00
Javier Segarra 6e57306026 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-24 07:39:22 +00:00
Jon Elias f2ae231efb fix: missing code 2024-09-24 09:35:34 +02:00
Jorge Penadés 42e4493fb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-09-24 09:27:38 +02:00
Jon Elias 768e15755f fix: deleted code 2024-09-24 09:18:10 +02:00
Jon Elias 2c73ce28c3 fix: fixed wagon tests 2024-09-24 09:02:35 +02:00
Pablo Natek c400929c99 fix: refs #7129 translate page title 2024-09-24 08:33:16 +02:00
Alex Moreno eaadacd332 Merge pull request '7404-fixFront' (!743) from 7404-fixFront into dev 
Reviewed-on: verdnatura/salix-front#743
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-24 06:19:58 +00:00
Alex Moreno b7ed63afc6 Merge branch 'dev' into 7404-fixFront 2024-09-24 06:18:42 +00:00