Commit Graph

1731 Commits

Author SHA1 Message Date
jitendra f9e174ea70 Fixed urldecode issue in search temm 2019-04-18 17:16:36 +05:30
jitendra 7e826bef00 Issue #840 fixed 2019-04-18 15:50:03 +05:30
jitendra 580d3ddf65 Resolve conflict 2019-04-18 12:56:36 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
Jitendra Singh 8a25502798
Merge pull request #839 from rahulshukla-webkul/development
Development
2019-04-17 19:24:24 +05:30
rahul shukla fc6d4df8c4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-17 19:20:21 +05:30
rahul shukla 439652699e issue #836 2019-04-17 19:20:07 +05:30
Jitendra Singh 182c0849d1
Merge pull request #837 from rahulshukla-webkul/development
Development
2019-04-17 18:13:08 +05:30
rahul shukla 13ac4a9571 issue #824 2019-04-17 15:21:48 +05:30
rahul shukla 58ddc68520 issues 2019-04-17 12:56:33 +05:30
rahul shukla 2ca95609e7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 20:15:42 +05:30
rahul shukla ad6acfa7e0 issue #824 2019-04-16 20:15:28 +05:30
Jitendra Singh dac81a73ce
Merge pull request #833 from rahulshukla-webkul/development
Development
2019-04-16 19:40:08 +05:30
rahul shukla ae6d498f4c merge with master 2019-04-16 19:22:49 +05:30
rahul shukla 3e97bacf91 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 19:19:26 +05:30
rahul shukla 095c045c58 change table of product datagrid to product_flat 2019-04-16 18:59:29 +05:30
Jitendra Singh 69e181a3aa
Merge pull request #832 from jitendra-webkul/jitendra
Added product id attribute to model
2019-04-16 16:38:41 +05:30
jitendra 7fc68c56ae Added product id attribute to model 2019-04-16 16:37:52 +05:30
Jitendra Singh c908ceb17a
Merge pull request #831 from jitendra-webkul/jitendra
Jitendra
2019-04-16 16:33:45 +05:30
jitendra dd90e63ade Fixed add to cart issue 2019-04-16 16:32:30 +05:30
jitendra 1dd23a5a39 Changed varaible name productFlat to product in product card page 2019-04-16 16:02:04 +05:30
rahul shukla 4e56374c70 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 16:01:37 +05:30
Jitendra Singh abb709bb3e
Merge pull request #830 from jitendra-webkul/jitendra
added related products and up sells to the product view page
2019-04-16 15:58:42 +05:30
jitendra 700a2951e6 added related products and up sells to the product view page 2019-04-16 15:57:38 +05:30
rahul shukla a4bb5a036b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 15:55:42 +05:30
Jitendra Singh 3984d92fad
Merge pull request #828 from prashant-webkul/development
Development
2019-04-16 15:46:32 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
rahul shukla d568ea4bbe merge with master 2019-04-16 15:35:54 +05:30
Prashant Singh 53ebbf5a1e Removed product grid events, product grid table is now obselete and maybe used in future for someother purposes. In result we will have a faster product creation and a new grid will be added with product flat table 2019-04-16 14:47:28 +05:30
Prashant Singh 1aa9bf78aa Removed unforced controller file from attribute package's Repositories directory 2019-04-16 14:41:12 +05:30
Prashant Singh af88e8951a Unnecessary Tax models removed from core, were originally moved from core to Tax module 2019-04-16 14:39:30 +05:30
Jitendra Singh 32a97a9b4b
Merge pull request #823 from prashant-webkul/development
Development
2019-04-15 16:42:11 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +05:30
Prashant Singh 36f6c425c2 Assets compiled for production 2019-04-15 15:14:32 +05:30
Jitendra Singh 810e57f092
Merge pull request #821 from prashant-webkul/development
Development
2019-04-15 15:02:09 +05:30
Prashant Singh feaaaa89a5 fixed some style issues 2019-04-14 15:30:43 +05:30
Prashant Singh 492ef9a988 added test for dusk customer login 2019-04-13 11:59:54 +05:30
Prashant Singh f35e9a48d8 corrected composer.json provider path for UI package 2019-04-13 10:33:23 +05:30
Prashant Singh 520c21a4cd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-13 10:32:42 +05:30
rahul shukla 44c898824e removed duplicate entry in product linking 2019-04-12 18:43:42 +05:30
Prashant Singh 3fe8152758 added php tooltip.js dependency and laravel dusk for browser tests profiling 2019-04-12 18:20:33 +05:30
rahul shukla 5a3fc9de67 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-12 16:41:35 +05:30
rahul shukla ee889cc259 upgrade code of zoom 2019-04-12 16:40:45 +05:30
rahul shukla 1caa3eb4f6 image zoom in rtl 2019-04-12 14:11:05 +05:30
rahul shukla 07b6ac6903 limit for up_sell, cross_sell & related product 2019-04-12 13:05:45 +05:30
Jitendra Singh 72305acff6
Merge pull request #819 from rahulshukla-webkul/development
Development
2019-04-10 18:11:22 +05:30
rahul shukla f1c263805c issues #815 2019-04-10 16:45:52 +05:30
rahul shukla 2a859b7e23 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 15:08:15 +05:30
rahul shukla b99b0ad8b5 product attribute & category menu 2019-04-10 15:08:01 +05:30