Commit Graph

5758 Commits

Author SHA1 Message Date
mohd asif 4c84e9c328 production css 2020-07-09 10:28:23 +05:30
mohd asif f5b892e47c Merge branch 'master' of https://github.com/bagisto/bagisto into newissue 2020-07-09 10:00:39 +05:30
mohd asif f81e56ce2f moved css to sass 2020-07-09 09:57:25 +05:30
Jitendra Singh e2b941ff71
Merge pull request #3449 from rahulcs0082/development
Issue #3444 fixded
2020-07-08 17:27:09 +05:30
rahulshukla-home e19daf97c6 Issue #3444 fixded 2020-07-08 17:13:49 +05:30
Jitendra Singh 101414b59e
Merge pull request #3442 from jitendra-webkul/1.0
Issue #3423 fixed
2020-07-08 11:21:04 +05:30
Jitendra Singh 3428a242bd
Merge pull request #3441 from rahulcs0082/development
Issue #3313 fixed
2020-07-08 11:18:44 +05:30
jitendra e1c7506035 Issue #3423 fixed 2020-07-08 11:15:11 +05:30
rahulshukla-home 95f6526c5a Issue #3313 fixed 2020-07-08 11:11:30 +05:30
Jitendra Singh 011b96445f
Merge pull request #3438 from rahulcs0082/development
Issue #3313 fixed
2020-07-07 18:35:50 +05:30
rahulshukla-home 7b5f2a6d0a Issue #3313 fixed 2020-07-07 17:30:40 +05:30
Jitendra Singh d53249ef9f
Merge pull request #3437 from rahulcs0082/development
Development
2020-07-07 16:35:48 +05:30
rahulshukla-home a1fadbfda4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-07-07 15:40:27 +05:30
rahulshukla-home 2b9651fd77 Issue #3310 fixed 2020-07-07 15:39:58 +05:30
Jitendra Singh cfdd95a074
Merge pull request #3436 from jitendra-webkul/1.0
Issue #3423 fixed
2020-07-07 14:19:18 +05:30
jitendra ec3a7c368b Resolved conflicts 2020-07-07 13:38:52 +05:30
jitendra 1eb2873588 Issue #3423 fixed 2020-07-07 13:36:14 +05:30
Jitendra Singh ce0ec932cd
Merge pull request #3435 from jitendra-webkul/1.0
Fixed issue in order view page if customer group is null
2020-07-07 12:38:59 +05:30
jitendra fdb214ec22 Fixed issue in order view page if customer group is null 2020-07-07 12:20:51 +05:30
mohammad asif 88483f1731 Merge branch 'master' of https://github.com/bagisto/bagisto into newissue 2020-07-06 21:16:24 +05:30
mohammad asif 426717ba94 Merge branch 'master' of https://github.com/asif-webkul/bagisto into newissue 2020-07-06 21:14:45 +05:30
mohammad asif e734420174 fixed issue #3399 2020-07-06 21:14:03 +05:30
Jitendra Singh 15a46adf46
Merge pull request #3431 from Haendlerbund/properly-pass-data-into-checkout-order-save-before-event
properly pass the data array into the 'checkout.order.save.before' event
2020-07-06 18:25:09 +05:30
Herbert Maschke ef99a1e981 properly pass the data array into the 'checkout.order.safe.before' event 2020-07-06 14:46:19 +02:00
Jitendra Singh 1b7b6f91bd
Merge pull request #3430 from rahulcs0082/development
Issue #3409 fixed
2020-07-06 17:02:19 +05:30
mohd asif 5c268863c2 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-07-06 17:01:34 +05:30
mohd asif 366876e8e1 fixed compare page ui issue #3400 2020-07-06 16:56:53 +05:30
rahulshukla-home 4c76fb27e9 Issue #3409 fixed 2020-07-06 16:54:16 +05:30
Jitendra Singh 644dd975cf
Merge pull request #3429 from jitendra-webkul/1.0
Issue #3425 fixed
2020-07-06 13:35:27 +05:30
jitendra fa05bc8f0a Issue #3425 fixed 2020-07-06 13:22:46 +05:30
Jitendra Singh 0c557203e6
Merge pull request #3427 from rahulcs0082/development
issue #3426 fixed
2020-07-06 11:47:18 +05:30
rahulshukla-home 99f71f1224 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-07-06 11:28:11 +05:30
rahulshukla-home b53e0055e0 Issue #3423 2020-07-06 11:27:57 +05:30
rahulshukla-home 6d7df0616b issue #3426 fixed 2020-07-06 11:16:35 +05:30
Jitendra Singh 7eaac16846
Merge pull request #3421 from rahulcs0082/development
Issue #3417 fixed
2020-07-03 15:50:12 +05:30
rahulshukla-home 2dc3eba431 Issue #3417 fixed 2020-07-03 15:43:30 +05:30
Jitendra Singh 75a3cfef7d
Merge pull request #3419 from jitendra-webkul/1.0
Inlcuded storage/cache/data folder
2020-07-03 14:20:11 +05:30
jitendra f5ebce4619 Inlcuded storage/cache/data folder 2020-07-03 14:03:32 +05:30
Jitendra Singh 1c1cb4bc03
Merge pull request #3416 from rahulcs0082/development
Issue #3411 fixed
2020-07-03 13:22:03 +05:30
rahulshukla-home e14772377f Issue #3411 fixed 2020-07-03 13:13:25 +05:30
Jitendra Singh c5c539be69
Merge pull request #3414 from shubhwebkul/master
badge-design in rtl
2020-07-03 12:27:58 +05:30
Shubham Mehrotra 28f8b369d8 Merge branch 'master' of https://github.com/bagisto/bagisto 2020-07-03 12:15:34 +05:30
Shubham Mehrotra 9e03cd121b badge-design in rtl 2020-07-03 12:08:20 +05:30
Jitendra Singh 210c705ff0
Merge pull request #3410 from rahulcs0082/development
Issue #3394
2020-07-03 11:41:25 +05:30
Jitendra Singh 2b8a7003be
Merge pull request #3403 from asif-webkul/master
fixed issue #3381 and #3311
2020-07-03 11:41:02 +05:30
Jitendra Singh 2dde970fb7
Merge pull request #3408 from ghermans/3381
Fixed #3381
2020-07-03 11:40:44 +05:30
rahulshukla-home 8c779883aa Issue #3394 2020-07-03 11:13:42 +05:30
ghermans 105d6fd566 fixed #3381 2020-07-02 22:13:35 +02:00
Glenn Hermans a7ec8a03a2
Merge pull request #24 from bagisto/master 2020-07-02 21:31:51 +02:00
Jitendra Singh 63d3c7b554
Merge pull request #3405 from jitendra-webkul/1.0
Added support for search with algolia and elasticsearch
2020-07-02 17:25:24 +05:30