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

928 Commits

Author SHA1 Message Date
Jon Elias 1d41647022 Merge branch 'dev' of https: refs #7132//gitea.verdnatura.es/verdnatura/salix-front into 7132-FixTranslations 2024-10-21 12:57:32 +02:00
Jon Elias e5cd9d4b8f refactor: refs #7132 global translations files changed 2024-10-21 12:56:09 +02:00
Jorge Penadés 2b2ccbc6a1 feat: refs #7524 myTeam filter & default params 2024-10-21 12:14:54 +02:00
Jon Elias 89cb9aacec refactor: refs #7132 1st wave of changes in global translations files 2024-10-18 12:54:21 +02:00
Carlos Satorres 237b3ed4df Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-18 11:17:06 +02:00
Carlos Satorres d1c61c5aed Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-16 14:01:01 +02:00
Carlos Satorres cad3fddc3e fix: refs #7986 descriptor fix 2024-10-15 14:52:52 +02:00
Carlos Satorres b4245d05fb fix: refs #7986 crudModel 2024-10-15 13:00:01 +02:00
Carlos Satorres af830591b3 fix: refs #7986 front fixed 2024-10-15 09:44:55 +02:00
Carlos Satorres dfceb9403c fix: refs #7986 fix front 2024-10-15 07:54:52 +02:00
Jon Elias 419d3d2d45 fix: refs #6896 fixed module problems 2024-10-10 07:20:33 +02:00
Guillermo Bonet 50eed83d05 feat: refs #7893 Requested changes 2024-10-07 13:50:19 +02:00
Guillermo Bonet f98739f0ed Merge branch 'dev' into 7893-wasteRecalc 2024-10-07 08:03:26 +00:00
Guillermo Bonet 4f3e7e2630 feat: refs #7893 Added waste recalc section 2024-10-07 10:03:05 +02:00
Jorge Penadés b735ccb3a0 Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-10-04 13:37:55 +02:00
Javier Segarra 2877ef8a33 feat: refs #7346 #7346 improve form 2024-10-04 11:50:55 +02:00
Jorge Penadés 67c2e284ba feat: refs #7702 ask old pass 2024-10-04 11:45:10 +02:00
Javier Segarra 1aab0abbcd Merge branch 'dev' into 7346-manualInvoice 2024-10-04 07:45:31 +00:00
Carlos Satorres 5d8f9dbd72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-10-03 13:02:56 +02:00
Pablo Natek 05a1d0e8fb fix: refs #7129 translates from globals to module locals 2024-10-03 10:52:16 +02:00
Javi Gallego 909244a658 Merge branch 'dev' into 7346-manualInvoice 2024-10-03 08:50:46 +02:00
Javi Gallego 789e70b7a8 feat: all clients just with global series 2024-10-02 16:37:58 +02:00
Jon Elias 03a3d6bd50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField 2024-10-02 08:47:21 +02:00
Javi Gallego 4399a91e99 fix: misSpelling 2024-10-01 13:29:45 +02:00
Javi Gallego 589c672ab2 fix: show degrees 2024-10-01 13:28:49 +02:00
Carlos Satorres 06a1b3b409 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-01 06:30:19 +02:00
Javier Segarra 2302e22f11 fix: solve conflicts from master to test 2024-09-30 15:00:05 +02:00
Javier Segarra 12a452d774 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-27 18:02:24 +00:00
Jorge Penadés 7eb951ef13 fix: refs #7323 use right locale 2024-09-26 15:28:00 +02:00
Jorge Penadés 14b7654db3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-26 15:16:32 +02:00
Jorge Penadés 18ea23adf1 refactor: refs #7323 pr request 2024-09-26 15:03:22 +02:00
Javier Segarra a0b3e933a8 Merge branch 'dev' into 8031_notify_dataSaved 2024-09-26 12:17:40 +00:00
Jorge Penadés 478d4695b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-26 09:16:59 +02:00
Pablo Natek 6e6b65771a Merge branch 'dev' into 7129-fixMigrationIssues 2024-09-26 06:09:21 +00:00
Pablo Natek c388d5ab2a Merge branch 'dev' of https: refs #7129//gitea.verdnatura.es/verdnatura/salix-front into 7129-fixMigrationIssues 2024-09-26 07:57:59 +02:00
Javier Segarra 73c45b8c4a Merge branch 'dev' into 8031_notify_dataSaved 2024-09-25 12:08:40 +00:00
Javi Gallego eb0e18bf58 Merge branch 'dev' into 6722-thermograph 2024-09-25 13:48:12 +02:00
Javi Gallego bd2fa37450 feat: maxTemperature and minTemperature 2024-09-25 13:34:43 +02:00
Alex Moreno 8c13ceb3fe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-25 13:28:13 +02:00
Pablo Natek 27b699ebf4 fix: refs #7129 some component styles 2024-09-25 11:16:27 +02:00
Javier Segarra 72ddeaa90a test: refs #8031 e2e 2024-09-25 10:53:38 +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
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
Jon Elias 8315eb2b4c Merge branch 'dev' into 7553_FixTicketExpedition 2024-09-24 09:37:17 +00: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
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
Javier Segarra 6e57306026 Merge branch 'dev' into 7671_dense_itemFixedPrices 2024-09-24 07:39:22 +00:00
Pablo Natek c400929c99 fix: refs #7129 translate page title 2024-09-24 08:33:16 +02:00
Alex Moreno b7ed63afc6 Merge branch 'dev' into 7404-fixFront 2024-09-24 06:18:42 +00: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
Pablo Natek 8124a341a0 feat: refs #7129 route extended list and simplify route list 2024-09-24 07:25:17 +02:00
Javier Segarra ac8aa6bcc1 fix: table order 2024-09-23 14:21:41 +02:00
Jon Elias f025b4361e refactor: refs #7553 last requested changes 2024-09-23 10:21:30 +02:00
Pablo Natek 17bb144bce fix: refs #7404 translates and some minor style fixes 2024-09-23 10:04:45 +02:00
Jorge Penadés 37545b4cab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-23 09:29:26 +02:00
Jon Elias d7fb8bdaf5 Merge branch 'dev' into 7884-AddLabelerField 2024-09-20 08:24:39 +00:00
Carlos Satorres 45b5433206 refs #6898 fix filter 2024-09-20 09:14:11 +02:00
Jon Elias 2c15f79a2d Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-20 09:08:13 +02:00
Jon Elias 44d98865fe fix: refs #7553 requested changes 2024-09-20 09:04:31 +02:00
Alex Moreno 5ca38ca825 feat: global handler 2024-09-18 14:48:15 +02:00
Carlos Satorres 87bce8fc21 refs #7529 fix workerPit 2024-09-18 12:08:38 +02:00
Jon Elias 07cd9d5aae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-18 08:42:59 +02:00
Jon Elias 98faf22e73 Merge branch 'dev' into 7884-AddLabelerField 2024-09-18 06:24:07 +00:00
Jorge Penadés 84cf3bea95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-17 16:02:15 +02:00
Carlos Satorres ae97e32826 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-17 14:55:48 +02:00
Pablo Natek cead2c2b5e Merge branch 'dev' into 7404-stockBought 2024-09-17 11:40:42 +00:00
Jorge Penadés 47de2caed7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-09-17 13:26:48 +02:00
Carlos Satorres 8c91cb42f6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-17 11:11:57 +02:00
Javier Segarra e4adbfa9f7 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-17 07:29:00 +00:00
Jon Elias 479f2a8e53 feat: refs #7884 added new filter field 2024-09-17 08:31:02 +02:00
Jorge Penadés 1ff15da8ca fix: refs #7323 workerList 2024-09-16 16:33:09 +02:00
Carlos Satorres 70759b8a4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-16 09:28:51 +02:00
Pablo Natek c59c8127cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-16 08:59:46 +02:00
Guillermo Bonet 07e45f2051 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-16 07:17:38 +02:00
Guillermo Bonet 57b939bdd5 Merge branch 'test' into dev 2024-09-16 07:17:25 +02:00
Carlos Satorres 0fcc4fe232 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-13 13:50:01 +02:00
Javier Segarra 025436b4b8 Merge branch 'dev' into 7677_vnLocation_perf 2024-09-13 09:27:38 +02:00
Jorge Penadés dcde6a1b9d Merge branch 'test' into 7353-warmfix-fixSearchbar 2024-09-13 07:19:42 +00:00
Jon Elias 4a0b92eded Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-13 09:05:26 +02:00
Alex Moreno 0dbcc4be3d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-09-13 08:57:27 +02:00
Alex Moreno f731e4f1a6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-09-13 08:57:14 +02:00
Jon Elias ed5987630f Merge branch 'dev' into 6346-fixWagonModule 2024-09-13 06:14:05 +00:00
Javier Segarra 6e784bb290 fix: address-create i18n 2024-09-12 21:11:51 +02:00
Jon Elias 6a5f31ff1e fix: refs #7553 fixed conflicts 2024-09-12 10:14:38 +02:00
Jorge Penadés 59f6913a74 fix: refs #7323 add correct label 2024-09-12 09:43:08 +02:00
Jorge Penadés d92659289b fix: refs #7323 add correct label 2024-09-12 09:41:29 +02:00
Carlos Satorres 039a8d1d02 refs #7283 fix items 2024-09-12 09:32:41 +02:00
Pablo Natek e2dbe0fd38 Merge branch 'dev' of https: refs #7404//gitea.verdnatura.es/verdnatura/salix-front into 7404-stockBought 2024-09-12 09:09:21 +02:00
Carlos Satorres b66e66eb0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-12 07:44:35 +02:00
Carlos Satorres 04070a5a85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-09-12 07:42:55 +02:00
Javier Segarra c3108b4335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943_fix_customerSummaryTable 2024-09-11 12:48:38 +02:00
Jorge Penadés 9219fa07f5 fix: refs #7353 hide search param 2024-09-11 11:23:14 +02:00
Jon Elias d1138529b2 Merge branch 'dev' of https: refs #7553//gitea.verdnatura.es/verdnatura/salix-front into 7553_FixTicketExpedition 2024-09-11 10:26:52 +02:00
Jorge Penadés b559f2f18c refactor: refs #7353 use global locales 2024-09-11 10:18:11 +02:00
Javier Segarra bcfa67baec Merge branch 'dev' into 6943_fix_customerSummaryTable 2024-09-10 12:26:17 +02:00
Jon Elias e7a89138ba fix: refs #7553 fix conflicts 2024-09-10 11:47:38 +02:00
Jorge Penadés f9adc49284 Merge branch 'dev' of https: refs #7663//gitea.verdnatura.es/verdnatura/salix-front into 7663-setWeight 2024-09-10 09:41:34 +02:00