Commit Graph

7513 Commits

Author SHA1 Message Date
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
jitendra c61872cbe6 Fixed failed newsletter test 2021-01-05 11:26:16 +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
Glenn Hermans 050ea2ceee
Merge pull request #4417 from ghermans/webinstall 2021-01-05 02:36:14 +01:00
Glenn Hermans 6262ee9f46 fix #4417 2021-01-05 02:27:37 +01:00
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
Jitendra Singh 31a5256ae1
Merge pull request #4419 from Caine85/patch-1
Fixing wrong locale in Admin notifications
2021-01-04 12:55:22 +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
Glenn Hermans 33ca72554d
Merge pull request #4 from bagisto/master
Update branch
2020-12-31 19:28:41 +01:00
Glenn Hermans c401313f4d
Merge pull request #4416 from devansh-webkul/issue-4192
Fixed database connection which is failing at first time when setup using bagisto:install #4192
2020-12-31 19:27:13 +01:00
ghermans cd0e16ebb8 minor changes 2020-12-31 18:45:33 +01:00
ghermans f745f48860 Added admin url suffix 2020-12-31 18:44:36 +01:00
ghermans 73796be56a Possible fix for #4371 2020-12-31 18:43:16 +01:00
Glenn Hermans 475d5cccf4
Merge pull request #3 from bagisto/master 2020-12-31 16:16:48 +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
Glenn Hermans 124a547756
Merge pull request #4409 from devansh-webkul/web-vital-v1
Bootstrap 3 version removed completely from velocity theme
2020-12-30 12:36:51 +01:00
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
devansh bawari 926c17554b Fixed Some Layouts 2020-12-30 13:31:24 +05:30
Jitendra Singh dfe8374f63
Merge pull request #4411 from rahulshukla-webkul/development
added removed condtion for multiselect serach
2020-12-30 13:06:51 +05:30
devansh bawari 7863fcfbfb Merge remote-tracking branch 'upstream/master' into web-vital-v1 2020-12-30 10:13:29 +05:30
devansh bawari 507403c4cc Some Comments Updated 2020-12-30 09:56:06 +05:30
devansh bawari a0143da28d Some Changes Done For Test Case 2020-12-30 09:53:08 +05:30
Glenn Hermans 7ea7eadfb6
Merge pull request #4363 from shubhwebkul/master
core's function is used to fetch current channel code
2020-12-30 03:20:25 +01:00
rahul shukla 73fc888ab5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-12-29 20:44:41 +05:30
rahul shukla 53ea1f2abf added removed condtion for multiselect serach 2020-12-29 20:39:17 +05:30
rahul shukla fec96337c0 added removed condtion for multiselect serach 2020-12-29 20:35:37 +05:30
devansh bawari b6f1fed10d Translation Added 2020-12-29 19:53:54 +05:30
devansh bawari 995f1d3149 Merge branch 'master' into web-vital-v1 2020-12-29 17:29:49 +05:30
Jitendra Singh 4f92ca602f
Merge pull request #4397 from rahulshukla-webkul/development
Issue #4386 fixed.
2020-12-29 16:44:38 +05:30
rahul shukla e723eb0872 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-12-29 15:53:57 +05:30
rahul shukla 759ca310f4 Issue #4369 fixed 2020-12-29 15:53:39 +05:30
devansh bawari f61bd28407 Merge remote-tracking branch 'upstream/master' into web-vital-v1 2020-12-29 13:38:26 +05:30