Commit Graph

3152 Commits

Author SHA1 Message Date
jitendra e18fd4e5c4 Issue #855 fixed 2019-04-23 11:03:05 +05:30
Jitendra Singh 025a34d99f
Merge pull request #857 from jitendra-webkul/jitendra
Issue #840 fixed
2019-04-23 10:33:58 +05:30
jitendra c585186a88 Issue #840 fixed 2019-04-23 10:33:10 +05:30
rahul shukla 560d1fb0bc issue #856 2019-04-22 20:52:36 +05:30
Prashant Singh e9d6d5bf5a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-22 19:24:46 +05:30
Prashant Singh a1a62abb80 base sync 2019-04-22 19:24:35 +05:30
rahul shukla 0239b7ec0b issue #846 2019-04-18 20:22:37 +05:30
rahul shukla 148f942c4a issue #848 2019-04-18 19:15:14 +05:30
rahul shukla 600bf55f1f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-18 17:18:15 +05:30
Jitendra Singh d2868f6316
Merge pull request #849 from jitendra-webkul/jitendra
Fixed urldecode issue in search temm
2019-04-18 17:17:55 +05:30
jitendra f9e174ea70 Fixed urldecode issue in search temm 2019-04-18 17:16:36 +05:30
rahul shukla 26bd9f4283 issue #845 2019-04-18 17:16:07 +05:30
Jitendra Singh 7cd5bfe445
Merge pull request #847 from jitendra-webkul/jitendra
Issue #840 fixed
2019-04-18 15:51:53 +05:30
jitendra 7e826bef00 Issue #840 fixed 2019-04-18 15:50:03 +05:30
Jitendra Singh a46c90a715
Merge pull request #844 from prateek-webkul/development
Development
2019-04-18 13:07:03 +05:30
prateek srivastava 5b01493d26 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-18 13:04:10 +05:30
prateek srivastava 16b2b2a01f scroller fixed 2019-04-18 12:58:35 +05:30
Jitendra Singh d0f8a45f29
Merge pull request #843 from jitendra-webkul/jitendra
Issue #834 fixed
2019-04-18 12:57:09 +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
prateek srivastava df8f54597a scroller code removed 2019-04-17 12:30:50 +05:30
prateek srivastava eb5bad16ff removed code for scroller 2019-04-17 12:24:41 +05:30
Prashant Singh 283922a44c Some syntax issue fixes 2019-04-17 11:20:48 +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
prateek srivastava 558b416bb6 Merge branch 'development' of https://github.com/prateek-webkul/bagisto into development 2019-04-16 19:22:03 +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