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

3143 Commits

Author SHA1 Message Date
Javier Segarra ccc6885172 Fix: minor bugs, layout & vnlocation 2024-04-25 04:41:44 +00:00
William Buezas 969087a347 Remove unused things 2024-04-24 17:48:47 -03:00
William Buezas 84a9dc8319 Fix ItemDescriptor labels 2024-04-24 17:30:53 -03:00
William Buezas a6ebe9cf19 Item barcode 2024-04-24 12:54:38 -03:00
William Buezas 726699bbc5 Item log 2024-04-24 10:38:00 -03:00
William Buezas 934db32973 WIP 2024-04-24 10:31:33 -03:00
Javier Segarra e1f50f5daf fix: minorchanges 2024-04-24 15:05:10 +02:00
Javier Segarra dcb06918dd Merge remote-tracking branch 'mindshore/feature/ItemRequests' into feature/ItemFamily 2024-04-24 14:35:20 +02:00
Javier Segarra e6c9a692f5 feat moduleName 2024-04-24 14:33:10 +02:00
Javier Segarra 51b432dfd0 fix icon 2024-04-24 14:28:20 +02:00
Javier Segarra e65ffb63c9 Merge remote-tracking branch 'mindshore/feature/ItemsSummary' into feature/ItemRequests 2024-04-24 14:26:12 +02:00
Javier Segarra 299838bfa5 Merge branch 'dev' into feature/ItemsSummary 2024-04-24 14:23:49 +02:00
Javier Segarra f4eb14f487 feat: i18n Clone 2024-04-24 14:22:14 +02:00
Jon Elias 60a1f35fb1 Merge pull request 'FR Translations' (!321) from 7239_FR_smsTranslations into master 
Reviewed-on: verdnatura/salix-front#321
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-24 11:56:34 +00:00
Carlos Satorres 6961a048e5 refs #6905 fix bank select 2024-04-24 13:29:32 +02:00
Carlos Satorres 391ca36764 fix conflicts 2024-04-24 12:47:56 +02:00
Javier Segarra 1c3660050b Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-24 12:15:34 +02:00
Javier Segarra a555d11663 fix: #7190 test 2024-04-24 12:15:12 +02:00
jcasado c9ab98471e refs #6697 fix changes 2024-04-24 12:01:55 +02:00
jcasado 5103b5b365 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6697-changeClaimQuantity 2024-04-24 12:01:15 +02:00
Jon Elias 82300fd292 refactor: refs #7239 changed french translations 2024-04-24 11:31:37 +02:00
jcasado 6391ed1360 refs #6697 changes claim 2024-04-24 11:26:32 +02:00
Javier Segarra 331484dbc7 Merge pull request 'Item Fixed prices' (!307) from hyervoni/salix-front-mindshore:feature/FixedPrices into dev 
Reviewed-on: verdnatura/salix-front#307
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-24 07:39:22 +00:00
Javier Segarra 8bb3d48c81 Merge branch 'dev' into feature/FixedPrices 2024-04-24 07:37:39 +00:00
Jon Elias bda232f1c3 Merge pull request 'refactor: refs #6899 corrected Lilium styles and functionalities' (!304) from 6899-endInvoiceOutMigration into dev 
Reviewed-on: verdnatura/salix-front#304
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-24 07:36:51 +00:00
Javier Segarra de91364ee8 Merge remote-tracking branch 'origin/dev' into feature/FixedPrices 2024-04-24 09:33:34 +02:00
Jon Elias 39685c222f refactor: refs #6899 fixed css and minor changes 2024-04-24 09:14:35 +02:00
Jon Elias ca3b280dcb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6899-endInvoiceOutMigration 2024-04-24 09:06:24 +02:00
Jorge Penadés 77798cbae4 Merge pull request '#6480 improve Card' (!271) from 6480-improveCard into dev 
Reviewed-on: verdnatura/salix-front#271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-24 06:57:38 +00:00
Jorge Penadés d93963e2c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-24 08:48:43 +02:00
Javier Segarra bf08ca7655 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-24 06:25:14 +00:00
Alex Moreno 1206cc2292 warmFix: duplicated button after merge min 2024-04-24 08:11:33 +02:00
jcasado 716dd4e28f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter 2024-04-24 08:02:19 +02:00
Javier Segarra 1ea74d0639 fix: minor updates 2024-04-24 07:55:01 +02:00
Javier Segarra 861e4385bb Merge branch 'dev' into feature/ItemsSummary 2024-04-24 07:34:49 +02:00
Javier Segarra 5dc41f8236 Merge branch 'dev' into feature/ItemFamily 2024-04-24 07:01:46 +02:00
William Buezas 42fe189e9f Add module name in Item router file 2024-04-23 16:45:28 -03:00
William Buezas f3b5bf7f4b Item list filter 2024-04-23 15:34:52 -03:00
Alex Moreno 7dd8835716 Merge pull request 'refs #6551 feature/WorkerTimeControl' (!254) from hyervoni/salix-front-mindshore:feature/WorkerTimeControl into dev 
Reviewed-on: verdnatura/salix-front#254
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-23 13:12:51 +00:00
Javier Segarra e259a38214 Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests 2024-04-23 14:23:28 +02:00
William Buezas 672bc9ca9d Change form model popup buttons order 2024-04-23 09:18:28 -03:00
Javier Segarra dc1444641d Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests 2024-04-23 14:13:19 +02:00
William Buezas 4396f7d6ba Fill thumb_down icon on hover 2024-04-23 09:13:10 -03:00
Javier Segarra 4f475a045d Merge branch 'feature/ItemRequests' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/ItemRequests 2024-04-23 14:12:15 +02:00
William Buezas 81a630d6cd Add more translations 2024-04-23 09:10:28 -03:00
William Buezas b7ba664e45 WIP 2024-04-23 09:05:34 -03:00
Javier Segarra f959b5dc37 Merge branch 'dev' into 7190_renewTokenMultimedia 2024-04-23 11:57:22 +00:00
Javier Segarra 9a78b8ac3b Merge branch 'dev' into feature/ItemRequests 2024-04-23 13:55:43 +02:00
Javier Segarra bfb7dfb472 Merge branch 'dev' into feature/WorkerTimeControl 2024-04-23 13:31:41 +02:00
jcasado c621ccb5a6 refs #7113 fix test 2024-04-23 13:19:21 +02:00