Commit Graph

524 Commits

Author SHA1 Message Date
rahul shukla 3ad2aec865 issue #655 2019-03-08 13:31:16 +05:30
rahul shukla b0d0e63d0d issues #656, #618, #384 & linked products changes 2019-03-07 18:21:49 +05:30
rahul shukla 95c898c4a8 up-sell, cross-sell & related-product 2019-03-05 18:32:15 +05:30
rahul shukla 24faf854c5 up-sellling completed 2019-03-05 15:16:17 +05:30
rahul shukla ab9bf8ea97 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-04 10:11:39 +05:30
rahul shukla ca39b84d0b upsell product 2019-03-04 10:11:24 +05:30
Prashant Singh 62f8cf1bad Fixed issue #642 2019-03-01 11:05:56 +05:30
Prashant Singh 543af40328 Issue in shipments grid is fixed 2019-02-28 16:29:46 +05:30
jitendra 876041aee4 Issue #639 fixed 2019-02-27 20:30:07 +05:30
jitendra cceed7d048 Shipment grid issue fixed 2019-02-27 19:17:13 +05:30
jitendra e5f1abe7a9 Product grid item per page increased to 20 2019-02-27 12:02:48 +05:30
jitendra 90540d445e Fixed swatch issue 2019-02-26 14:32:18 +05:30
rahul shukla c02d75774d rtl class removal 2019-02-26 14:18:42 +05:30
rahul shukla 724c81ffd7 conflict resolve 2019-02-26 14:13:07 +05:30
JItendra Singh 2775885b61
Merge pull request #625 from jitendra-webkul/jitendra
Added margin top on pagination
2019-02-26 13:14:59 +05:30
jitendra 71ddbacbd8 Added margin top on pagination 2019-02-26 13:14:18 +05:30
JItendra Singh 8394fc19ae
Merge pull request #623 from jitendra-webkul/jitendra
Issue #621 fixed
2019-02-26 13:00:35 +05:30
jitendra 4f420ca483 Issue #621 fixed 2019-02-26 12:59:58 +05:30
JItendra Singh 242b64afbf
Merge pull request #614 from prashant-webkul/development
Development
2019-02-26 11:56:43 +05:30
JItendra Singh c1d890ee56
Merge pull request #622 from jitendra-webkul/jitendra
Option swatches feature added
2019-02-26 11:55:42 +05:30
jitendra 0c84a9dcb2 Option swatches feature added 2019-02-26 11:55:00 +05:30
rahul shukla 35cdb1fd52 rtl css changes for admin 2019-02-25 19:05:45 +05:30
rahul shukla db0cd27c0d issue #615 2019-02-22 17:05:27 +05:30
Prashant Singh 33a58daa35 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-22 16:15:16 +05:30
rahul shukla 3aacfc6acf admin name for attribute 2019-02-22 15:55:29 +05:30
Prashant Singh 8ebb6868c5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-22 15:00:45 +05:30
rahul shukla 2da9f80bea issues #586 2019-02-21 18:40:43 +05:30
rahul shukla 19101afc18 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-21 16:36:45 +05:30
rahul shukla 59ecc0f019 guest review 2019-02-21 16:36:27 +05:30
JItendra Singh 491504a844
Merge pull request #609 from jitendra-webkul/jitendra
Issue #608 fixed
2019-02-21 15:02:49 +05:30
jitendra fd07499407 Issue #608 fixed 2019-02-21 15:01:44 +05:30
rahul shukla 2d62465d60 issues #596 and #597 2019-02-20 17:14:14 +05:30
rahul shukla be1de2d1ab assests compile 2019-02-20 14:46:44 +05:30
Prashant Singh 1f13298b65 base sync with master 2019-02-20 13:02:59 +05:30
jitendra 5e4ab5dd8f Webpack mix files updated and assets compiled for production 2019-02-20 12:38:09 +05:30
jitendra cb4f1ce65a rtl added to body tag if locale code is ar 2019-02-20 12:17:40 +05:30
jitendra 37e605e489 Issue #585 fixed 2019-02-20 12:10:02 +05:30
jitendra 834ed4badc Issue #592 fixed 2019-02-20 12:06:53 +05:30
Prashant Singh 0e9e94683d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-19 11:23:28 +05:30
Prashant Singh 1f30971c63 Fixed issue #592 2019-02-18 18:39:48 +05:30
Prashant Singh 262bfbbd06 Fixed issue #304 2019-02-18 17:19:54 +05:30
rahul shukla 6172692954 assests compile & merge with master 2019-02-15 20:13:02 +05:30
JItendra Singh 78cb14d0dd
Merge pull request #579 from jitendra-webkul/jitendra
Fixed view event issues
2019-02-15 13:07:59 +05:30
jitendra a03e5dc132 Fixed view event issues 2019-02-15 13:07:02 +05:30
JItendra Singh 62d3f4c9df
Merge pull request #578 from jitendra-webkul/jitendra
View event added to catalog pages
2019-02-15 12:54:24 +05:30
jitendra dda8b0bc92 View event added to catalog pages 2019-02-15 12:52:26 +05:30
rahul shukla 455f9442d4 conflict resolve 2019-02-15 11:35:45 +05:30
rahul shukla 05d3318cc8 assests compile 2019-02-15 11:32:00 +05:30
jitendra 15fe87d72c Assets compiled for production 2019-02-15 11:31:19 +05:30
rahul shukla 0b0f425bf4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 11:29:05 +05:30