Commit Graph

1435 Commits

Author SHA1 Message Date
jitendra 834ed4badc Issue #592 fixed 2019-02-20 12:06:53 +05:30
JItendra Singh f26d7155e9
Merge pull request #599 from jitendra-webkul/jitendra
Issue #598 fixed
2019-02-20 11:58:11 +05:30
jitendra 3d5e2955a4 Issue #598 fixed 2019-02-20 11:57:06 +05:30
JItendra Singh 513626cbe3
Merge pull request #595 from rahulshukla-webkul/development
Development
2019-02-19 13:03:50 +05:30
Prashant Singh 0e9e94683d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-19 11:23:28 +05:30
rahul shukla 994da4a2b3 reverting changes of view 2019-02-19 10:07:13 +05:30
rahul shukla 22b19ec277 product image 2019-02-19 09:59:50 +05:30
Prashant Singh 1f30971c63 Fixed issue #592 2019-02-18 18:39:48 +05:30
Prashant Singh 4eb752cd10 Fixed issue #304 and some more changes 2019-02-18 17:21:04 +05:30
Prashant Singh 262bfbbd06 Fixed issue #304 2019-02-18 17:19:54 +05:30
rahul shukla 1a9c3d56c2 issue #587 & css changes 2019-02-18 17:01:53 +05:30
rahul shukla b019a248cf interfaces & proxy class implemented 2019-02-18 13:00:40 +05:30
JItendra Singh 67080059a7
Merge pull request #584 from rahulshukla-webkul/development
Development
2019-02-15 20:27:54 +05:30
rahul shukla 6172692954 assests compile & merge with master 2019-02-15 20:13:02 +05:30
rahul shukla 704f6851a3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 20:10:58 +05:30
rahul shukla 36cb09bc58 address while checkout & reduces code 2019-02-15 20:10:47 +05:30
JItendra Singh 356a2ccdbe
Merge pull request #583 from jitendra-webkul/jitendra
Issue Fixed (If product visiblity is set as false than products are s…
2019-02-15 19:44:23 +05:30
jitendra 7e20684c0f Issue Fixed (If product visiblity is set as false than products are showing on new and featured section) 2019-02-15 19:43:03 +05:30
JItendra Singh c18981c094
Merge pull request #582 from jitendra-webkul/jitendra
Issue fixed (If configurable product added to cart without options)
2019-02-15 19:39:28 +05:30
jitendra d2f620bb9f Issue fixed (If configurable product added to cart without options) 2019-02-15 19:38:10 +05:30
rahul shukla d673b2a7b5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 14:58:11 +05:30
rahul shukla 0330353e08 removal of default address 2019-02-15 14:58:00 +05:30
JItendra Singh 687d28a9d0
Merge pull request #580 from prashant-webkul/development
sync with base master
2019-02-15 14:16:39 +05:30
Prashant Singh f3cd11737c sync with base master 2019-02-15 13:28:52 +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
JItendra Singh 6a71486ee2
Merge pull request #576 from rahulshukla-webkul/development
Development
2019-02-15 11:45:19 +05:30
rahul shukla 455f9442d4 conflict resolve 2019-02-15 11:35:45 +05:30
JItendra Singh bf8122a739
Merge pull request #577 from jitendra-webkul/jitendra
Jitendra
2019-02-15 11:34:01 +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
rahul shukla d7213db2c9 customer password 2019-02-15 11:28:47 +05:30
JItendra Singh da8c5869fa
Merge pull request #574 from prashant-webkul/development
Development
2019-02-15 11:25:15 +05:30
jitendra 3d0da8812d View event added on checkout payment and shipping section 2019-02-15 11:24:26 +05:30
Prashant Singh f68c4e482c Fixed bug #575 2019-02-15 09:51:38 +05:30
rahul shukla 7c72d6e3b1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-14 21:20:33 +05:30
rahul shukla 4a648f549a checkout with multiple address #210 2019-02-14 21:20:10 +05:30
Prashant Singh 550cabcbcb Translation strings for datagrid and removal of dead code and pretty syntax 2019-02-14 19:24:44 +05:30
Prashant Singh 42b929bb22 admin user intended url functionality reverted 2019-02-14 18:20:04 +05:30
JItendra Singh 03c97ca899
Merge pull request #573 from prashant-webkul/development
Development
2019-02-14 18:04:11 +05:30
Prashant Singh 621455ed48 minor fixes 2019-02-14 17:57:07 +05:30
Prashant Singh 718a5eaa20 Resolved the issue #517 and removed the intented url from admin as admin don't require 2019-02-14 17:54:46 +05:30
Prashant Singh 3d917fa512 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-14 17:49:34 +05:30
Prashant Singh 63bac873c3 adding all get all channel functions in channel repo 2019-02-14 12:07:08 +05:30
JItendra Singh 705d161d36
Merge pull request #571 from prashant-webkul/development
Confirm box implemented for datagrid actions
2019-02-13 19:11:49 +05:30
Prashant Singh b28f48cf95 Confirm box implemented for datagrid actions 2019-02-13 19:10:23 +05:30
JItendra Singh 56b1684f06
Merge pull request #570 from rahulshukla-webkul/development
Development
2019-02-13 17:49:43 +05:30