Commit Graph

6439 Commits

Author SHA1 Message Date
Javier Segarra c987a1151c Merge pull request 'Improve ZoneLocationTree height' (!786) from fix_height_zoneLocationTree into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #786
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-02 07:36:09 +00: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
Javier Segarra 6b38bdf868 style: improve ZoneLocationTree height
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 19:26:03 +00:00
Pablo Natek c0fd5a1c21 fix: refs #7404 fix style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 16:12:18 +02:00
Javi Gallego 38599be9bd Merge pull request '6722-showDegrees' (!782) from 6722-showDegrees into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #782
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-01 14:05:36 +00:00
Javi Gallego 36457f704d Merge branch 'dev' into 6722-showDegrees
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 14:04:18 +00:00
Javi Gallego 2f5358d439 Merge pull request '#7356 - transfer ticket method' (!784) from 7356_ticket_migration into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #784
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-01 13:27:38 +00:00
Javier Segarra 2ca99a51ae fix: refs #7356 transfer ticket method
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 15:12:22 +02:00
Jon Elias 209c88884f Merge branch 'dev' into 7884-AddLabelerField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 13:10:28 +00:00
Carlos Satorres d69336c82a refs #7366 make travelFilter, travelList
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 14:15:18 +02:00
Javi Gallego 4399a91e99 fix: misSpelling
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 13:29:45 +02:00
Javi Gallego 589c672ab2 fix: show degrees 2024-10-01 13:28:49 +02:00
Javier Segarra ea7c799909 Merge pull request 'Fix: deleted code in sales' (!781) from FixSales into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
Reviewed-on: #781
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-01 10:36:30 +00:00
Jon Elias 7b63bb38f2 fix: deleted code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 12:34:39 +02:00
Jon Elias 21edf4b5d9 Merge pull request 'fix: duplicate call' (!775) from Fix-TicketSale into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #775
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-10-01 09:54:30 +00:00
Javier Segarra 6e4677848f Merge branch 'dev' into Fix-TicketSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 09:53:34 +00:00
Alex Moreno ddffd5b1c7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-01 11:47:55 +02:00
Alex Moreno 9b90487b6a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-10-01 11:47:43 +02:00
Alex Moreno 2e9a8d9205 fix(WorkerList): add type email
gitea/salix-front/pipeline/head This commit looks good Details
2024-10-01 11:47:31 +02:00
Alex Moreno 7ae90908c4 Merge pull request 'fix: solve conflicts from test to dev' (!780) from fixConflicts_testToDev into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #780
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-10-01 09:47:05 +00:00
Javier Segarra 696c9ca9b3 fix: solve conflicts with stockBought
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 11:40:29 +02:00
Javier Segarra 27b2d0232c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into fixConflicts_testToDev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 11:35:14 +02:00
Jon Elias 90ce9b2cd3 Merge branch '7884-AddLabelerField' of https://gitea.verdnatura.es/verdnatura/salix-front into 7884-AddLabelerField
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 11:32:17 +02:00
Jon Elias de01dda2ed refactor: refs #7884 modified icon color 2024-10-01 11:32:15 +02:00
Carlos Satorres e64e6eefe3 refs #7355 add role 2024-10-01 10:35:31 +02:00
Javier Segarra 8fa82c818d fix: remove limit
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 10:04:56 +02:00
Javier Segarra 30767b110f Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 10:03:42 +02:00
Javier Segarra d6efd21db6 style: remove space between value and label 2024-10-01 10:03:39 +02:00
Javier Segarra e9364f69d4 feat: #7679 show tooltips 2024-10-01 10:03:14 +02:00
Javier Segarra 778e6299ce fix: solve conflicts from test to dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 08:57:04 +02:00
Jon Elias 86ab9f9540 Merge branch 'Fix-TicketSale' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-TicketSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 06:52:21 +02:00
Jon Elias 10bada7463 fix: deleted useless button 2024-10-01 06:52:19 +02:00
Javier Segarra 41acf0e1e2 feat: #7679 show country provinces
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-10-01 00:24:34 +02:00
Javier Segarra e7a2d3aa85 fix: refs #7354 ZonLocation filter 2024-09-30 20:20:51 +02:00
Alex Moreno 90853396ba Merge pull request 'fix #6898 SupplierFiscalData show fields' (!778) from hotfix_supplierFiscalData into master
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
Reviewed-on: #778
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-30 13:16:11 +00:00
Javier Segarra 03450a86fb fix: SupplierFiscalData show data printing
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-30 13:13:35 +00:00
Javier Segarra 4d4554a6ca fix(lilium): #6898 SupplierFiscalData show fields
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-30 15:11:22 +02:00
Alex Moreno 732bb0943c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-30 15:03:11 +02:00
Alex Moreno 35179695c3 Merge pull request 'fix: solve conflicts from master to test' (!777) from mergeConflicts into test
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #777
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-30 13:02:14 +00:00
Javier Segarra 2302e22f11 fix: solve conflicts from master to test
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-09-30 15:00:05 +02:00
Jon Elias 3c5a5c3905 Merge branch 'dev' into Fix-TicketSale
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-30 12:36:19 +00:00
Jon Elias 76a77dcee9 fix: duplicate call
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-30 14:35:10 +02:00
Pablo Natek 6014ccebb4 Merge pull request '7404-fixSomeStyleIssues' (!774) from 7404-fixSomeStyleIssues into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #774
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-30 12:27:42 +00:00
Pablo Natek deb608cc96 Merge branch 'dev' into 7404-fixSomeStyleIssues
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-30 12:26:37 +00:00
Javier Segarra 2d9dbbd23d Merge pull request '#8031 - Enable notify positive when user update self data' (!750) from 8031_notify_dataSaved into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #750
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-30 11:35:18 +00:00
Javier Segarra 7001a707b9 Merge branch 'dev' into 8031_notify_dataSaved
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-30 11:34:38 +00:00
Javier Segarra da78edb6d2 Merge branch '7404-fixSomeStyleIssues' of https://gitea.verdnatura.es/verdnatura/salix-front into 7404-fixSomeStyleIssues
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-09-30 13:34:21 +02:00
Javier Segarra 48b7b879f2 Merge pull request 'Imrpove VnLocation to show less fields' (!738) from fix_8018 into master
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
Reviewed-on: #738
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-30 11:14:30 +00:00
Javier Segarra 2812e6f456 Merge branch 'master' into fix_8018
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-09-30 11:13:20 +00:00
Javier Segarra d4dc12ebe3 Merge pull request '#8018 - Show fields instead null/undefined' (!737) from 8018_location_label into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #737
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-09-30 10:55:04 +00:00