Commit Graph

1088 Commits

Author SHA1 Message Date
rahul shukla c2f24d47cb merge with master 2019-03-27 14:26:52 +05:30
rahul shukla a3b9ef427e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-27 14:25:21 +05:30
Jitendra Singh 5a2a3c1988
Merge pull request #744 from cagartner/feature/default-laravel-translations
Created default laravel translation for pt_BR
2019-03-27 09:10:16 +05:30
Carlos Augusto Gartner cbfe9a53dd Created default laravel translation for pt_BR 2019-03-26 15:17:45 -03:00
rahul shukla d4d93739dc product zoom functionality added 2019-03-25 16:32:13 +05:30
rahul shukla 2a57530184 issue #735 & minor config changes for select 2019-03-22 14:54:46 +05:30
rahul shukla e41445e802 issues #729 and #731 2019-03-22 12:54:38 +05:30
rahul shukla e052276907 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-22 11:58:28 +05:30
rahul shukla dca138ae85 issue #724 2019-03-22 11:58:11 +05:30
rahul shukla dc08bbc06e installer issue 2019-03-20 15:09:24 +05:30
Prashant Singh c84e76646e Fixed issue #720 2019-03-20 10:13:27 +05:30
Prashant Singh b4c7bc550c Fixed issue #712 2019-03-20 09:39:49 +05:30
Prashant Singh 8d486f336c Fixed issue #708 2019-03-20 09:34:08 +05:30
Prashant Singh 8b85452097 changed the add to buttons in bagisto 2019-03-19 18:18:59 +05:30
Prashant Singh b59c25bfb8 Bug fix 2019-03-19 16:19:41 +05:30
Prashant Singh 7ad8d567b1 Arabic translations added 2019-03-19 14:28:35 +05:30
Prashant Singh 2b17cdb7fd fixed issue #713 2019-03-19 13:24:28 +05:30
Prashant Singh 97da404216 default channel now getting checked with admin 2019-03-19 13:22:06 +05:30
Jitendra Singh 7a0d470c20
Merge pull request #715 from rahulshukla-webkul/development
Development
2019-03-19 12:17:06 +05:30
Jitendra Singh a34a2f2ba4
Merge pull request #714 from prashant-webkul/development
Development
2019-03-19 12:16:54 +05:30
Prashant Singh 40a0fa8cb0 Fixed issues #710 #709 2019-03-19 12:13:17 +05:30
rahul shukla a9d1794547 changes in cross sell 2019-03-18 19:01:10 +05:30
rahul shukla f54f8989dc Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-18 16:36:00 +05:30
rahul shukla 10f40c90ec strict mode error 2019-03-18 16:35:41 +05:30
jitendra 41217e525f Assets compiled for production 2019-03-15 19:31:23 +05:30
Jitendra Singh 947c1ab526
Merge pull request #702 from jitendra-webkul/jitendra
Jitendra
2019-03-15 19:07:55 +05:30
jitendra 94dfe8dc69 Fixed resource controller issue 2019-03-15 19:00:44 +05:30
jitendra 2123260387 Added formated price key in product api 2019-03-15 18:48:51 +05:30
Jitendra Singh a222b221bf
Merge pull request #701 from jitendra-webkul/jitendra
Jitendra
2019-03-15 17:57:58 +05:30
jitendra ef988b093f Product base image property added in prodcut api 2019-03-15 17:47:54 +05:30
Prashant Singh 0a4fd97a0c fixed issues with rtl 2019-03-15 17:14:13 +05:30
Prashant Singh 8b430988c4 assets compiled for production 2019-03-15 16:46:02 +05:30
Prashant Singh d4f292490b more probable solution for admin menu scrolling 2019-03-15 13:28:55 +05:30
Jitendra Singh 1759392af5
Merge pull request #698 from jitendra-webkul/jitendra
Category display mode feature added
2019-03-15 13:09:19 +05:30
jitendra 2e9f58917f Category display mode feature added 2019-03-15 13:08:21 +05:30
Jitendra Singh b615303003
Merge pull request #697 from jitendra-webkul/jitendra
Category Repository issue fixed
2019-03-15 12:01:17 +05:30
jitendra 340b621b1a Category Repository issue fixed 2019-03-15 12:00:33 +05:30
Jitendra Singh c23343377f
Merge pull request #696 from jitendra-webkul/jitendra
Sorting added in ResourceController
2019-03-15 10:37:20 +05:30
jitendra 4ca1095265 Sorting added in ResourceController 2019-03-15 10:36:27 +05:30
Jitendra Singh c19e062cfd
Merge pull request #695 from jitendra-webkul/jitendra
Added getCurrentLocale function in Core.php
2019-03-14 18:24:40 +05:30
jitendra 218ef7a85f Added getCurrentLocale function in Core.php 2019-03-14 18:24:02 +05:30
rahul shukla a887cf8b92 slider controller name issue 2019-03-14 17:05:18 +05:30
Prashant Singh 319e4edeb1 some more logic is required for proper scrolling of menu bar 2019-03-14 15:50:24 +05:30
rahul shukla 4ed551c008 removing zoom 2019-03-14 14:41:21 +05:30
rahul shukla 4ab95b1464 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-14 14:34:46 +05:30
rahul shukla ebf96ad9d6 installer isuue & product page changes 2019-03-14 14:34:32 +05:30
Prashant Singh 556dd64327 removed some dead code 2019-03-14 12:06:51 +05:30
jitendra c38e107515 Added api for single lavel child categories 2019-03-14 11:32:47 +05:30
Prashant Singh 5fc85dffe4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-14 11:01:04 +05:30
Prashant Singh 31eab00df7 added disbaled state to the new radio button used on checkout pages 2019-03-14 10:59:35 +05:30