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
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
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
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
79ce93952c
Compilation Done! 😎
2020-12-29 13:07:43 +05:30
devansh bawari
614b78d3a2
Bootstrap 4 Conversion Completed
2020-12-29 13:05:09 +05:30
devansh bawari
05d73164e9
Compiled All My CSS Work For Today
2020-12-28 19:29:20 +05:30
devansh bawari
884891c039
95 Percent Bootstrap 4 Has Been Set
2020-12-28 19:28:49 +05:30
devansh bawari
4dd4beda28
Merge branch 'master' into web-vital-v1
2020-12-24 19:54:35 +05:30
devansh bawari
ab83d5df28
Bootstrap 3 Removal In Progress
2020-12-24 19:34:08 +05:30
Glenn Hermans
aa7be4ed35
Merge pull request #4396 from devansh-webkul/exception-on-channel
...
Fixed channel exception #4380
2020-12-24 13:55:12 +01:00
rahul shukla
4d1ca8b66e
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2020-12-24 17:36:23 +05:30
rahul shukla
d09dcbf786
Issue #4386 fixed
2020-12-24 17:36:08 +05:30
devansh bawari
da5b8a4ca7
Filter Added For All
2020-12-24 17:29:10 +05:30
devansh bawari
ca2de63b48
Alias Filter Added
2020-12-24 16:50:40 +05:30
devansh bawari
4737f95410
Some Minor Fix
2020-12-24 16:09:10 +05:30
Glenn Hermans
3c49cd9fff
Merge pull request #4391 from rahulshukla-webkul/development
...
#3638 fixed
2020-12-23 14:47:20 +01:00
rahul shukla
22ba6c9534
Issue #4392
2020-12-23 18:21:31 +05:30
Glenn Hermans
7907f16243
Merge pull request #4387 from howdu/fix-recently-viewed
...
Recently view typo and use view priceHTML
2020-12-23 12:27:19 +01:00
rahul shukla
00997bfbff
#3638 fixed
2020-12-23 15:40:27 +05:30
Jitendra Singh
82d457f328
Merge pull request #4377 from howdu/fix-limit-per-page
...
Fix limit per page for datagrid
2020-12-23 15:36:49 +05:30
howdu
4a1562ddc8
Update page limit to use vue loop
2020-12-23 09:58:32 +00:00
Robin Singh
81393d9672
Administrator role typo fix
2020-12-23 14:06:00 +05:30
howdu
e3400ba302
Fix typo and use priceHTML
2020-12-22 10:47:51 +00:00
devansh bawari
86401b4ff1
Seeder Updated
2020-12-21 19:56:33 +05:30
devansh bawari
2f124c5a3f
Fixed Filter Locale & Channel List. Channel Symbol Added.
2020-12-21 19:22:31 +05:30
devansh bawari
c31037d787
Some Refactoring And Index Page Filteration Added
2020-12-21 16:10:54 +05:30
devansh bawari
5539776ab9
Channel Table Seeder And Datagrid Updated
2020-12-21 14:32:55 +05:30
devansh bawari
2b6438b567
Channel Translation Completed
2020-12-21 13:58:22 +05:30
Devansh
884b945c8b
Store And Update Channel Front End Comleted
2020-12-21 10:38:19 +05:30
howdu
7ca57d4ab3
Fix limit per page for datagrid
...
Link 'models' itemsPerPage property with datagrid
2020-12-18 17:25:47 +00:00
Glenn Hermans
803075f303
Merge pull request #4360 from devansh-webkul/issue-4350
...
Fixed taxes not applied to Shipping Cost #4350
2020-12-18 12:46:53 +01:00
devansh bawari
88782d9327
Language Translation Added 😇
2020-12-18 17:02:55 +05:30
Glenn Hermans
cd6bcadc69
Merge pull request #4375 from polarag/master
...
Fix security risk for null emails
2020-12-18 12:27:38 +01:00
polarag
c5bc5207e7
Added spaces
2020-12-18 13:13:16 +02:00
devansh bawari
96cab203e7
Value Updated In Seeder
2020-12-18 16:03:18 +05:30
devansh bawari
179c59b2de
Option Added For Tax Calculation
2020-12-18 13:00:13 +05:30
polarag
0c2e30349c
Fix security risk for null emails
...
The returned email from Facebook is sometimes null. Bagisto tries to match the returned email from Facebook against the database, which would allow logins to accounts that have a null email which may not belong to the Facebook user trying to login, and therefore such user accounts might be breached.
This commit checks for null emails first, and returns a null customer instead of the first customer with a null email.
2020-12-18 03:28:30 +02:00
Shubham Mehrotra
19f7a26f41
function used to fetch current channel
2020-12-14 19:24:30 +05:30
devansh bawari
4dd71a2e1a
Text Area Issue Fixed
2020-12-14 14:05:06 +05:30
devansh bawari
3ac25cf746
Tax On Shipping Price Also
2020-12-14 13:33:25 +05:30
Glenn Hermans
d01c57dae7
Merge pull request #4348 from darinda/patch-4
...
Make VatIdRule accept empty strings as VAT id
2020-12-14 06:12:43 +01:00
Glenn Hermans
549a658860
Merge pull request #4298 from devansh-webkul/issue-4242
...
fix #4242
2020-12-11 04:02:50 +01:00
Rene Hrdina
eb371b77c0
Make VatIdRule accept empty strings as VAT id
2020-12-10 17:24:31 +01:00
Glenn Hermans
62b3aa99df
Merge pull request #4341 from devansh-webkul/issue-4325
...
Fixed address is not saving on onepage checkout #4325
2020-12-09 17:34:56 +01:00
devansh bawari
cfa95e04b6
Address Issue Fixed
2020-12-09 14:41:23 +05:30
Glenn Hermans
80520bc8cc
Merge pull request #4342 from shubhwebkul/master
...
code enhancement
2020-12-08 16:04:44 +01:00
Glenn Hermans
b7f6af7b75
Merge pull request #4316 from devansh-webkul/issue-4283
...
Fixed zoom event which is not working when changing mouse hover from video to image #4283
2020-12-08 15:44:00 +01:00
Glenn Hermans
667f91b8ad
Merge pull request #4332 from naresh-webkul/master
...
added repository for attribute option translation
2020-12-07 18:59:24 +01:00
Glenn Hermans
b00b85c6b8
Merge pull request #4330 from naresh-webkul/4329
...
fixed issue #4329
2020-12-07 18:57:41 +01:00
Shubham Mehrotra
24ec12175e
code enhancement
2020-12-07 21:16:06 +05:30
devansh bawari
9c4c21db33
Loader Added On Save Address Only
2020-12-07 14:06:12 +05:30
devansh bawari
e49908b314
Merge branch 'master' into issue-4242
2020-12-04 20:29:07 +05:30
devansh bawari
b36027efc4
Recompiled
2020-12-04 20:26:49 +05:30
devansh bawari
d2bd499e46
Merge branch 'master' into issue-4283
2020-12-04 20:25:59 +05:30
Jaseel P V
0cd9cf2753
Image filter enable/disable issue solved
2020-12-04 18:53:37 +05:30
rahul shukla
e296d06f8e
fix for rtl
2020-12-04 15:09:43 +05:30
rahul shukla
4320f4b004
enhancement #4321 done with all required changes
2020-12-04 13:01:52 +05:30
rahul shukla
6ce2116a49
Merge branch 'development' of https://github.com/rahulcs0082/bagisto into development
2020-12-04 11:54:33 +05:30
Rene Hrdina
f168d18123
fix some german translations
2020-12-02 16:32:39 +01:00
naresh verma
7767132336
added repository for attribute option translation
2020-12-02 17:25:05 +05:30
Danijel Dedic
df8cfd56c5
Make logo an favicon nullable
2020-12-02 12:53:16 +01:00
naresh verma
3d1cb347db
fixed issue #4329
2020-12-02 17:17:59 +05:30