Commit Graph

5738 Commits

Author SHA1 Message Date
rahul shukla 2af7c2cdc1 Issue #4392 fixed 2021-01-13 16:42:47 +05:30
rahul shukla c4c871342e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-13 12:35:35 +05:30
rahul shukla e541ce564f fixes as per comment 2021-01-13 12:34:47 +05:30
Glenn Hermans c38b2bf420
Merge pull request #4466 from devansh-webkul/spliting-request 2021-01-12 15:10:11 +01:00
devansh bawari bfce18c60e Request Splitted To Reduce Load From The Checkout Page 2021-01-12 14:06:45 +05:30
Glenn Hermans 04368520c9
Merge pull request #4462 from devansh-webkul/issue-4420 2021-01-12 09:12:20 +01:00
devansh bawari 238d46a4dd Currency Symbol Issue Fixed 2021-01-12 11:41:18 +05:30
devansh bawari 715b35c4ca Merge branch 'issue-4456' of https://github.com/devansh-webkul/bagisto into issue-4456 2021-01-11 17:54:09 +05:30
devansh bawari 70c768e21b Merge remote-tracking branch 'upstream/master' into issue-4456 2021-01-11 17:53:25 +05:30
devansh bawari f9c54383b9 Filter Added To Catalog Rule, Cart Rule And Email Template 2021-01-11 17:53:18 +05:30
Devansh 983f9c9d9d Status Exception Fixed In Content, Inventory Sources And User 2021-01-08 23:27:04 +05:30
devansh bawari e0edd790ec Fixed Some Spaces 2021-01-08 20:31:04 +05:30
devansh bawari 71abe8f4ca Arabic And Persian Support Added To DOM PDF 2021-01-08 20:23:01 +05:30
devansh bawari ca1f67df2e Filters Added 2021-01-08 19:12:19 +05:30
rahul shukla 65627ceede Issue #4459 fixed 2021-01-08 19:02:17 +05:30
rahul shukla a419661b1e Issue #4455 fixed 2021-01-08 18:48:09 +05:30
rahul shukla f8b5bee942 Issue #4457 fixed 2021-01-08 16:43:42 +05:30
rahul shukla 2dc5607cdc removed unecessary code 2021-01-08 16:11:27 +05:30
rahul shukla def1bc6896 Issue #4447 fixed 2021-01-08 16:02:15 +05:30
devansh bawari d1c83d65cf Fallback Added 2021-01-08 11:19:46 +05:30
Glenn Hermans 445d116fc0
Merge pull request #4424 from rahulshukla-webkul/development
sue #3002 fixed.
2021-01-06 08:08:25 +01:00
rahul shukla f38bc5c8a4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-01-06 12:34:36 +05:30
Jitendra Singh f35ece7ffa
Merge pull request #4438 from jitendra-webkul/master
Issue #4434 fixed
2021-01-05 18:46:15 +05:30
jitendra ea2f1c327e Issue #4434 fixed 2021-01-05 18:30:18 +05:30
Jitendra Singh e28e4eef4a
Merge pull request #4437 from jitendra-webkul/master
Issue #4431 fixed
2021-01-05 18:27:58 +05:30
jitendra c7deb7b066 Issue #4431 fixed 2021-01-05 18:19:48 +05:30
Glenn Hermans fd08d1786f
Merge pull request #4426 from devansh-webkul/issue-4423
Fixed quantity box position in RTL #4423
2021-01-05 12:49:31 +01:00
Jitendra Singh b14a16be06
Merge pull request #4429 from jitendra-webkul/master
Email marketing added
2021-01-05 11:50:53 +05:30
devansh bawari 86b30eec7f Recompiled 2021-01-05 11:23:53 +05:30
devansh bawari 64fc472953 Merge remote-tracking branch 'upstream/master' into issue-4423 2021-01-05 11:22:48 +05:30
Jitendra Singh 5020736bed
Merge pull request #4427 from devansh-webkul/issue-4425
Fixed saved billing address details which are not showing on onepage checkout #4425
2021-01-05 11:19:28 +05:30
devansh bawari 9312bf4809 Space Fixed 2021-01-05 10:26:42 +05:30
devansh bawari ba48286490 Compiled Assets 2021-01-05 10:10:41 +05:30
devansh bawari dc0b5f95db Fixed Name Issue For Both 2021-01-05 09:48:54 +05:30
jitendra 65d37fe6de Resolve conflicts 2021-01-04 21:43:35 +05:30
jitendra 642fc1b10d Email marketing added 2021-01-04 21:40:56 +05:30
devansh bawari a6bfcddf75 Default Quantity Group Layout Fixed 2021-01-04 20:52:35 +05:30
devansh bawari b392eec9cf Name Issue Fixed 2021-01-04 19:48:01 +05:30
devansh bawari a909905c0e Quantity Issue Fixed 2021-01-04 18:56:17 +05:30
devansh bawari e9f94daf5a Fixed Checkboxes And Addresses 2021-01-04 16:30:37 +05:30
devansh bawari 2f3895e66f Class Added 2021-01-04 15:47:48 +05:30
rahul shukla 203148b3f8 merge with master 2021-01-04 13:51:02 +05:30
rahul shukla 16ee78698a Issue #3002 fixed 2021-01-04 13:48:56 +05:30
Caine85 dec3757605
Fixing wrong locale in Admin notifications
Starting from Laravel 5.2, as stated in documentation (https://laravel.com/docs/5.2/upgrade#upgrade-5.2.0): 

Caching And Env
If you are using the config:cache command during deployment, you must make sure that you are only calling the env function from within your configuration files, and not from anywhere else in your application.
If you are calling env from within your application, it is strongly recommended you add proper configuration values to your configuration files and call env from that location instead, allowing you to convert your env calls to config calls.
2021-01-03 12:40:35 +01:00
devansh bawari 3fe1b76354 Merge branch 'master' into issue-4192 2020-12-31 17:30:23 +05:30
Glenn Hermans fbe8758520
Merge pull request #4410 from devansh-webkul/issue-4408
Fixed silder image not work #4408
2020-12-31 10:01:35 +01:00
devansh bawari a654fac21b Runtime Handled 2020-12-31 11:46:04 +05:30
devansh bawari 1e55a5c6b2 Query Fixed 2020-12-30 16:35:41 +05:30
devansh bawari c8d44007a3 Merge remote-tracking branch 'upstream/master' into web-vital-v1 2020-12-30 15:47:59 +05:30
Glenn Hermans 8151803342
Merge pull request #4412 from devansh-webkul/master
Test Case Fix
2020-12-30 10:00:30 +01:00