Commit Graph

4311 Commits

Author SHA1 Message Date
Vivek Sharma 31b7db34cb [Fixed: layout issue regarding #2399 resolved.] 2020-02-11 18:59:35 +05:30
Jitendra Singh 13a5b3a116
Merge pull request #2429 from shubhwebkul/velocity-updated
minor bug fixes
2020-02-11 18:33:57 +05:30
shubhammehrotra.symfony@webkul.com 4323637bf9 minor bugs 2020-02-11 18:15:06 +05:30
Jitendra Singh c042ef5d90
Merge pull request #2428 from jitendra-webkul/1.0
Converted checkbox into switch
2020-02-11 18:00:41 +05:30
Jitendra Singh 0621def0dc
Merge pull request #2427 from shubhwebkul/velocity-updated
WIP: misc. bug fixes
2020-02-11 17:57:01 +05:30
Jitendra Singh 300feaec0f Converted checkbox into switch 2020-02-11 17:56:25 +05:30
shubhammehrotra.symfony@webkul.com afa4ea627c Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-11 17:50:03 +05:30
shubhammehrotra.symfony@webkul.com d331c36bd8 misc. bug fixes 2020-02-11 17:49:48 +05:30
Jitendra Singh f960fbe33c
Merge pull request #2426 from jitendra-webkul/1.0
Issue #2398 fixed
2020-02-11 17:20:54 +05:30
Jitendra Singh fe911cc2dc Issue #2398 fixed 2020-02-11 17:16:10 +05:30
Jitendra Singh 3c7eea6b04
Merge pull request #2425 from jitendra-webkul/1.0
Issue #2424 fixed
2020-02-11 16:40:29 +05:30
Jitendra Singh 0caa8010d2 Issue #2424 fixed 2020-02-11 16:37:10 +05:30
Jitendra Singh 9e710f365d
Merge pull request #2423 from jitendra-webkul/1.0
Issue #2416 fixed
2020-02-11 15:19:24 +05:30
Jitendra Singh df88b605be Issue #2416 fixed 2020-02-11 15:18:33 +05:30
Jitendra Singh 04a6758e11
Merge pull request #2422 from jitendra-webkul/1.0
Issue #2417 fixed
2020-02-11 15:09:38 +05:30
Jitendra Singh 37d99c526f Issue #2417 fixed 2020-02-11 15:08:41 +05:30
Jitendra Singh c58eba14f8
Merge pull request #2421 from jitendra-webkul/1.0
Issue #2417 fixed
2020-02-11 15:05:48 +05:30
Jitendra Singh 002a977e22 Issue #2417 fixed 2020-02-11 15:02:04 +05:30
Jitendra Singh 66f29937e9
Merge pull request #2405 from vivek-webkul/patch-23
[Fixed: issue #2322 has been resolved.]
2020-02-11 13:54:12 +05:30
Jitendra Singh b2b90d566a
Merge pull request #2380 from shaiv-webkul/master
#2364 issue fixed
2020-02-11 13:43:55 +05:30
Vivek Sharma 52ac7f8aaa [resolved conflict.] 2020-02-11 13:42:04 +05:30
Jitendra Singh 9888304038
Merge pull request #2420 from shubhwebkul/velocity-updated
publishables assets issue resolved.
2020-02-11 13:41:07 +05:30
Vivek Sharma b3b830e094 [Saved.] 2020-02-11 13:40:12 +05:30
Vivek Sharma 1fa7f93c2d [Saved.] 2020-02-11 13:38:03 +05:30
Vivek Sharma 424a0a1595 [Saved.] 2020-02-11 13:36:38 +05:30
shubhammehrotra.symfony@webkul.com 081a90d3d0 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-11 13:34:48 +05:30
Jitendra Singh b9b7ef0a73
Merge pull request #2408 from vivek-webkul/patch-26
[Fixed: Issue #2400 has been resolved.]
2020-02-11 13:34:33 +05:30
shubhammehrotra.symfony@webkul.com 77e63a51b5 publishable assets issue resolved 2020-02-11 13:34:31 +05:30
Vivek Sharma 4c574a26ff [Fixed: changes card blade file.] 2020-02-11 13:30:54 +05:30
Vivek Sharma 213a622fec [Saved] 2020-02-11 13:29:22 +05:30
Vivek Sharma 817d46bb89 [Fixed: conflict resolved.] 2020-02-11 13:23:21 +05:30
Jitendra Singh 0a4fae72dd
Merge pull request #2419 from jitendra-webkul/1.0
Issue #2395 fixed
2020-02-11 13:13:58 +05:30
Jitendra Singh 5ec6559a07 Issue #2395 fixed 2020-02-11 13:10:14 +05:30
Jitendra Singh 3f3962681b
Merge pull request #2385 from vivek-webkul/patch-17
[Fixed: issue #2378 has been resolved.]
2020-02-11 12:35:17 +05:30
Jitendra Singh 0c054e2ef6
Merge pull request #2406 from vivek-webkul/patch-24
[Fixed: Issue #2403 has been resolved.]
2020-02-11 12:35:03 +05:30
Vivek Sharma 7ad61082c3 [Fixed: changes added.] 2020-02-11 12:31:18 +05:30
Vivek Sharma b2463a6af5 [Revert changes] 2020-02-11 12:29:33 +05:30
Vivek Sharma 0f03c184b4 [Saved] 2020-02-11 12:14:53 +05:30
Vivek Sharma bb9e6d5e5a [Fixed: conflict resolved.] 2020-02-11 11:58:44 +05:30
Vivek Sharma c880879f5f [Fixed: conflict resolved.] 2020-02-11 11:38:42 +05:30
Jitendra Singh 3d9eb5f91f
Merge pull request #2414 from vivek-webkul/patch-29
[Fixed: Issue #2397 has been resolved.]
2020-02-11 11:10:11 +05:30
Jitendra Singh 2fce1383ce
Merge pull request #2413 from vivek-webkul/patch-28
[Fixed: Issue #2410 has been resolved.]
2020-02-11 11:09:58 +05:30
Jitendra Singh f8ef2d85e8
Merge pull request #2409 from vivek-webkul/patch-27
[Fixed: Issue #2399 has been resolved.]
2020-02-11 11:09:32 +05:30
Jitendra Singh f2666c4c8f
Merge pull request #2407 from vivek-webkul/patch-25
[Fixed: Issue #2402 has been resolved.]
2020-02-11 11:09:11 +05:30
Jitendra Singh 86e86db559
Merge pull request #2404 from vivek-webkul/patch-22
[Fixed: issue #2381 has been resolved.]
2020-02-11 11:08:17 +05:30
Jitendra Singh 6204d5ad42
Merge pull request #2401 from vivek-webkul/patch-21
[Fixed: issue #2386 has been resolved.]
2020-02-11 11:07:48 +05:30
Jitendra Singh 25b0973a4d
Merge pull request #2396 from vivek-webkul/patch-20
[Fixed: issue #2391 has been fixed.]
2020-02-11 11:07:22 +05:30
Jitendra Singh 66e398817d
Merge pull request #2394 from vivek-webkul/patch-19
[Fixed: #2390 and #2389 have been resolved.]
2020-02-11 11:06:44 +05:30
Jitendra Singh ca864b2d8a
Merge pull request #2383 from vivek-webkul/patch-16
[Fixed: issue #2329 has been resolved.]
2020-02-11 11:05:59 +05:30
Jitendra Singh b7537d9578
Merge pull request #2376 from shubhwebkul/velocity-updated
misc. bug fixes
2020-02-11 11:05:00 +05:30