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

7360 Commits

Author SHA1 Message Date
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
Alex Moreno 8760781660 fix: merge in dev 2024-09-24 08:15:44 +02:00
Alex Moreno 98a3b03be7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-24 07:48:58 +02:00
Alex Moreno 1f9850f520 Merge pull request 'fix: Options VnSelect properties' (!746) from 6943_fix_customer_module into dev 
Reviewed-on: verdnatura/salix-front#746
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-24 05:41:49 +00:00
Alex Moreno 5fc306e11e Merge branch 'dev' into 6943_fix_customer_module 2024-09-24 05:38:47 +00:00
Alex Moreno 96edfd4b6e Merge pull request 'feat: change label because its more natural' (!749) from 5888_format_location_label into dev 
Reviewed-on: verdnatura/salix-front#749
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-09-24 05:36:09 +00:00
Pablo Natek 8124a341a0 feat: refs #7129 route extended list and simplify route list 2024-09-24 07:25:17 +02:00
Javier Segarra a5c6d628ca feat: enable notify positive when user update self data 2024-09-23 18:48:58 +00:00
Javier Segarra 55e017b0cc Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-23 18:39:09 +00:00
Javier Segarra 3ede256dc5 feat: change label because its more natural 2024-09-23 18:30:14 +00:00
Jorge Penadés 2cb9899de1 feat: refs #7207 show queue 2024-09-23 15:38:54 +02:00
Javier Segarra b4b31c0c92 fix: enable autofocus 2024-09-23 15:21:07 +02:00
Javier Segarra e9e2caee85 feat: autofocus after clear 2024-09-23 13:18:14 +00:00
Javier Segarra 27a3e36b58 fix: comments 2024-09-23 14:56:34 +02:00