Commit Graph

3152 Commits

Author SHA1 Message Date
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
rahul shukla 77b9083d47 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-13 17:42:18 +05:30
rahul shukla e4bdf11a7d lang added 2019-02-13 17:42:07 +05:30
jitendra 77618d23f8 Assets compiled for production 2019-02-13 15:29:55 +05:30
JItendra Singh 5584fe14cb
Merge pull request #569 from prashant-webkul/development
Development
2019-02-13 15:21:40 +05:30
Prashant Singh 3d9d61fafe UI fix in accordian 2019-02-13 15:18:21 +05:30
Prashant Singh 510ee89aad language meta tag added for storefront 2019-02-13 15:05:56 +05:30
Prashant Singh a745596ac8 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-13 14:53:44 +05:30
JItendra Singh 5de2145a4c
Merge pull request #567 from jitendra-webkul/jitendra
Added config field infomation option
2019-02-13 14:52:38 +05:30
jitendra 35d0030633 Added config field infomation option 2019-02-13 14:51:51 +05:30
JItendra Singh 51f3c87902
Merge pull request #566 from jitendra-webkul/jitendra
Fixed configuration repository select field issue
2019-02-13 13:19:28 +05:30
jitendra 5c4ab00f83 Fixed configuration repository select field issue 2019-02-13 13:11:31 +05:30
Prashant Singh 3758c0c26d
Merge pull request #14 from bagisto/master
base sync with master
2019-02-13 11:45:50 +05:30
Prashant Singh 616d1bf160 merged with master 2019-02-13 11:40:56 +05:30
JItendra Singh 468004eb8b
Merge pull request #565 from jitendra-webkul/jitendra
Assets compiled for production
2019-02-12 20:12:45 +05:30
jitendra 98f3edc199 Assets compiled for production 2019-02-12 20:11:44 +05:30
JItendra Singh c2f0e2015d
Merge pull request #564 from rahulshukla-webkul/development
Development
2019-02-12 19:08:10 +05:30
rahul shukla 8b9edf9e7d marketplace responsive & installer 2019-02-12 16:46:55 +05:30
rahul shukla 5879874d67 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-12 16:17:48 +05:30
rahul shukla 024e78540e issue #546 2019-02-12 16:17:29 +05:30
Prashant Singh 5ea84dff76 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-12 14:57:12 +05:30
Prashant Singh f38472d26b Accordian component's UX changed slightly according to new design guidelines 2019-02-12 14:56:56 +05:30
JItendra Singh 64c06760a6
Merge pull request #563 from jitendra-webkul/jitendra
Jitendra
2019-02-12 13:20:15 +05:30
jitendra b979fc19e0 Assets compiled for production 2019-02-12 13:19:29 +05:30
JItendra Singh 50e0204c79
Merge pull request #562 from rahulshukla-webkul/development
Development
2019-02-11 18:28:46 +05:30
rahul shukla e824f4741b assests compile 2019-02-11 18:12:06 +05:30
rahul shukla 15ae803407 merge with master 2019-02-11 17:18:06 +05:30
rahul shukla 1c16e2f2a9 validation for upload 2019-02-11 17:15:22 +05:30
jitendra 8c201f1bbb Issue #545 fixed 2019-02-11 15:35:02 +05:30
JItendra Singh 69ca02540b
Merge pull request #561 from jitendra-webkul/jitendra
Jitendra
2019-02-11 15:20:54 +05:30
jitendra 7bfb216bb0 Dashboard sql issue fixed 2019-02-11 15:13:38 +05:30
jitendra b32cff2359 Installer issue fixed 2019-02-11 15:10:47 +05:30
JItendra Singh 802e52c30f
Merge pull request #559 from prashant-webkul/development
Development
2019-02-11 15:05:44 +05:30
jitendra 2b382df075 Issue #532 fixed 2019-02-11 15:02:34 +05:30