Commit Graph

4234 Commits

Author SHA1 Message Date
Vivek Sharma 817d46bb89 [Fixed: conflict resolved.] 2020-02-11 13:23:21 +05:30
Vivek Sharma fb696d27e5 [Fixed: Issue #2400 has been resolved.] 2020-02-08 18:17:52 +05:30
Vivek Sharma e78e61d989 Merge remote-tracking branch 'upstream/master' 2020-02-07 18:52:17 +05:30
Jitendra Singh 3c11496274
Merge pull request #2351 from aayush-webkul/master
Added old() function in Admin and Shop package
2020-02-07 15:53:24 +05:30
Jitendra Singh 185598e35a
Merge pull request #2363 from shaiv-webkul/master
#2180 issue fixed
2020-02-07 15:52:36 +05:30
Jitendra Singh b087be9164
Merge pull request #2374 from jitendra-webkul/1.0
Changelog updated
2020-02-07 15:52:07 +05:30
Jitendra Singh 910020a033 Changelog updated 2020-02-07 15:51:29 +05:30
shaiv-webkul f47f06de31 #2180 fixed 2020-02-07 15:48:20 +05:30
shaiv-webkul d43efc505a Merge branch 'master' of https://github.com/bagisto/bagisto 2020-02-07 15:29:52 +05:30
Jitendra Singh c24b6a5e00
Merge pull request #2372 from shubhwebkul/velocity-updated
misc. bug fixes
2020-02-07 15:28:21 +05:30
shubhammehrotra.symfony@webkul.com 79a8faa028 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-07 15:22:29 +05:30
shubhammehrotra.symfony@webkul.com 6962d4df0d misc. resolved issues 2020-02-07 15:22:05 +05:30
Jitendra Singh 88cacbf997
Merge pull request #2370 from rahulshukla-webkul/development
Development
2020-02-07 15:06:56 +05:30
rahul shukla 8e32328b52 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-07 15:04:11 +05:30
rahul shukla 3504226a6a Issue #2366 2020-02-07 15:04:00 +05:30
Jitendra Singh 88cce4b262
Merge pull request #2368 from jitendra-webkul/1.0
Issue #2360 fixed
2020-02-07 14:00:05 +05:30
Jitendra Singh 32180aee33 Issue #2360 fixed 2020-02-07 13:59:14 +05:30
Jitendra Singh 2bbdfb7c9e
Merge pull request #2367 from rahulshukla-webkul/development
Development
2020-02-07 13:53:59 +05:30
rahul shukla 40517df331 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-02-07 13:49:15 +05:30
rahul shukla 0358a84a2c Issue #2357 2020-02-07 13:49:01 +05:30
shaiv-webkul 13047f266f Merge branch 'master' of https://github.com/bagisto/bagisto 2020-02-07 13:24:16 +05:30
Jitendra Singh e94d1ad146
Merge pull request #2365 from jitendra-webkul/1.0
Issue #1977 fixed
2020-02-07 13:19:55 +05:30
Jitendra Singh e517d66e71 Issue #1977 fixed 2020-02-07 13:18:48 +05:30
shaiv-webkul 3516322e1f #2180 issue fixed 2020-02-07 13:10:03 +05:30
Jitendra Singh e8b34451ed
Merge pull request #2361 from jitendra-webkul/1.0
Issue #1977 fixed
2020-02-07 12:57:04 +05:30
Jitendra Singh cc5df27870 Issue #1977 fixed 2020-02-07 12:56:18 +05:30
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
Aayush Bhatt 7fc6fd7d3d old() function implimented in admin and shop package 2020-02-06 22:04:33 +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
Aayush Bhatt 75ef8f9b54 Duplicate old() function removed 2020-02-06 20:23:56 +05:30
Aayush Bhatt 3b74ee4129 Merge https://github.com/bagisto/bagisto 2020-02-06 20:22:38 +05:30
Aayush Bhatt d9f2f1ab3d Duplicate old() functioon fixed and working in admin panel 2020-02-06 20:07:26 +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
Vivek Sharma e1eae741e5 [Fixed: #2346 issue resolved.] 2020-02-06 19:47:00 +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