Commit Graph

4219 Commits

Author SHA1 Message Date
Steffen Mahler b94fc9fc8c merge master and resolve conflicts 2020-02-07 10:44:04 +01:00
Jitendra Singh abc7548cd2
Merge pull request #2356 from rahulshukla-webkul/development
Development
2020-02-07 11:11:28 +05:30
rahul shukla 2ad1ab3f79 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-07 11:06:06 +05:30
rahul shukla 84f8c9fb71 Issue #2328 2020-02-07 11:03:28 +05:30
Jitendra Singh 90ee4070a1
Merge pull request #2353 from shubhwebkul/velocity-updated
misc. bug fixes
2020-02-07 10:35:37 +05:30
shubhammehrotra.symfony@webkul.com d6e6419c9c reset password page updates 2020-02-07 10:26:47 +05:30
shubhammehrotra.symfony@webkul.com cde599c7a2 reset-password page updates 2020-02-06 21:23:58 +05:30
shubhammehrotra.symfony@webkul.com 5cbb6fc23e #2249 2020-02-06 21:17:59 +05:30
shubhammehrotra.symfony@webkul.com 9681fdd106 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-06 21:13:17 +05:30
shubhammehrotra.symfony@webkul.com f7bea02c4e misc. bug fixes 2020-02-06 21:13:02 +05:30
Jitendra Singh d6d3462476
Merge pull request #2350 from shubhwebkul/velocity-updated
misc.bug fixes
2020-02-06 20:00:17 +05:30
shubhammehrotra.symfony@webkul.com 8ee5d3db83 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-06 19:57:30 +05:30
Jitendra Singh e703bd7e2c
Merge pull request #2349 from vivek-webkul/patch-15
[Fixed: issue #2346 resolved.]
2020-02-06 19:57:15 +05:30
shubhammehrotra.symfony@webkul.com 64692f6e3c misc. bug fixes 2020-02-06 19:57:13 +05:30
Vivek Sharma ba775a14e5 [Fixed: issue #2346 resolved.] 2020-02-06 19:56:21 +05:30
Jitendra Singh 9b42d0cecd
Merge pull request #2348 from jitendra-webkul/1.0
Issue #2307 fixed
2020-02-06 19:30:09 +05:30
Jitendra Singh d75374c610 Issue #2307 fixed 2020-02-06 19:29:18 +05:30
Jitendra Singh 4568703be2
Merge pull request #2347 from jitendra-webkul/1.0
Issue #2335 fixed
2020-02-06 19:22:18 +05:30
Jitendra Singh be79142a7b Issue #2335 fixed 2020-02-06 19:21:24 +05:30
Jitendra Singh 8bf70ecbc9
Merge pull request #2345 from jitendra-webkul/1.0
Issue #2339 fixed
2020-02-06 19:17:13 +05:30
Jitendra Singh 1a3bc44a88 Issue #2339 fixed 2020-02-06 19:16:22 +05:30
Jitendra Singh 156eb5a130
Merge pull request #2344 from jitendra-webkul/1.0
Issue #2340 fixed
2020-02-06 19:08:19 +05:30
Jitendra Singh 543a229c9d Issue #2340 fixed 2020-02-06 19:07:36 +05:30
Jitendra Singh 204a3148c5
Merge pull request #2342 from rahulshukla-webkul/development
Development
2020-02-06 18:48:47 +05:30
Jitendra Singh b7d9caad2e
Merge pull request #2327 from shivam-webkul/master
#2274 #2275 #2282 solved
2020-02-06 18:48:23 +05:30
rahul shukla 0467995267 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-06 18:35:02 +05:30
rahul shukla 59ea3941ee Issue #2328 2020-02-06 18:34:43 +05:30
shivam kumar 3c093a603a resolved conflicts 2020-02-06 18:12:43 +05:30
shivam kumar a19736b936 resolved conflicts 2020-02-06 18:09:41 +05:30
shivam kumar 6aaca3f693 updates 2020-02-06 18:08:43 +05:30
shivam kumar 17fe108512 Merge branch 'master' of https://github.com/shivam-webkul/bagisto 2020-02-06 18:06:56 +05:30
shivam kumar 7f4cfab440 resolved issues 2020-02-06 18:06:00 +05:30
Jitendra Singh c3959328b1
Merge pull request #2338 from jitendra-webkul/1.0
Move to wishlist issues fixed if product is already in wishlist
2020-02-06 17:50:21 +05:30
Jitendra Singh e06a35b282 Move to wishlist issues fixed if product is already in wishlist 2020-02-06 17:49:23 +05:30
Jitendra Singh 322468e200
Merge pull request #2333 from jitendra-webkul/1.0
Issue #2142 fixed
2020-02-06 17:19:45 +05:30
Jitendra Singh 4f71d4727b Issue #2142 fixed 2020-02-06 17:18:51 +05:30
Jitendra Singh e18027c612
Merge pull request #2332 from jitendra-webkul/1.0
Issue #2126 fixed
2020-02-06 17:13:13 +05:30
Jitendra Singh 9f80cff693 Issue #2126 fixed 2020-02-06 17:12:41 +05:30
Jitendra Singh 3b2543b472
Merge pull request #2331 from shubhwebkul/velocity-updated
misc. bug fixes
2020-02-06 17:02:25 +05:30
shubhammehrotra.symfony@webkul.com ff72440c76 resolved issues 2020-02-06 17:01:00 +05:30
shubhammehrotra.symfony@webkul.com ea4341341d resolved issues 2020-02-06 16:29:20 +05:30
shivam kumar 89ebcf9917 #2274 #2275 solved 2020-02-06 16:14:31 +05:30
Jitendra Singh b464c70b02
Merge pull request #2326 from rahulshukla-webkul/development
Development
2020-02-06 16:00:22 +05:30
shivam kumar dec0c8208a Merge branch 'master' of https://github.com/bagisto/bagisto
commit
2020-02-06 15:58:02 +05:30
rahul shukla 7f7a8bc1cd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-06 15:57:50 +05:30
rahul shukla 0bd6096e26 Issue #2189 2020-02-06 15:57:31 +05:30
Jitendra Singh 79f4f95f08
Merge pull request #2324 from vivek-webkul/patch-14
[Fixed: issue #2322 layout and icon issue resolved.]
2020-02-06 15:44:12 +05:30
Vivek Sharma 3b40adb199 [Fixed: issue #2320 resolved.] 2020-02-06 15:39:58 +05:30
shivam kumar 3c0b804d3e Merge branch 'master' of https://github.com/bagisto/bagisto 2020-02-06 15:32:06 +05:30
Vivek Sharma 9118eff851 Merge remote-tracking branch 'upstream/master' 2020-02-06 15:22:05 +05:30