Commit Graph

8169 Commits

Author SHA1 Message Date
rahul shukla e96ea332d2 Merge branch 'master' of https://github.com/bagisto/bagisto into 3477 2021-03-19 14:23:01 +05:30
rahul shukla eade4b3910 Resize of image done 2021-03-19 14:22:53 +05:30
Jitendra Singh 25fec09081
Merge pull request #4731 from devansh-webkul/issue-4730
Product Deletion Code Removed #4730
2021-03-17 19:38:19 +05:30
Glenn Hermans b39f2dcae2
Merge pull request #4742 from devansh-webkul/shop-provider-update
Shop Provider Publisher's Update
2021-03-17 12:40:16 +01:00
devansh bawari 190336eb84 Merge branch 'master' into shop-provider-update 2021-03-17 16:39:23 +05:30
devansh bawari 1f7fa4ef66 Merge branch 'master' into issue-4730 2021-03-17 16:38:00 +05:30
Glenn Hermans a58d7561d1
Merge pull request #4684 from devansh-webkul/laravel-8-support
Laravel 8 Support
2021-03-17 11:21:51 +01:00
devansh bawari dd5effeb2b Shop Provider Update 2021-03-16 10:33:42 +05:30
Glenn Hermans e9c1e0e0d4
Merge pull request #4711 from danispiri/spanish-language
Spanish language
2021-03-16 01:20:13 +01:00
Daniel Spiridonoff 2315f2da5a
Merge branch 'master' into spanish-language 2021-03-15 14:50:34 -03:00
Jitendra Singh a373e0cf33
Merge pull request #4713 from devansh-webkul/s-6
Paypal IPN Issue Fixed - SA6
2021-03-15 21:07:16 +05:30
Jitendra Singh a1d22dd543
Merge pull request #4740 from rahulshukla-webkul/development
Translation added for all lang for transaction and align en lang
2021-03-15 20:10:27 +05:30
rahul shukla c47e3c8c3f Order transaction for paypal standard 2021-03-15 19:57:39 +05:30
rahul shukla 809d2556d0 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-03-15 15:05:47 +05:30
rahul shukla 5aa2ea7455 Translation added for all lang for transaction and align en lang 2021-03-15 15:05:31 +05:30
devansh bawari 000f5b4703 Merge branch 'master' into s-6 2021-03-15 11:52:06 +05:30
devansh bawari f9a77ebb3b Merge remote-tracking branch 'upstream/master' into laravel-8-support 2021-03-15 11:44:07 +05:30
devansh bawari ce6af93d72 Merge branch 'master' into issue-4730 2021-03-15 11:37:25 +05:30
devansh bawari 3652d1a4bb Model Instance Given To Events 2021-03-15 11:36:42 +05:30
Daniel Spiridonoff 033d6b23f7 Update spanish translation for Admin module 2021-03-13 13:07:25 -03:00
Daniel Spiridonoff 5a89b10795 Spanish language seeder added for channels 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff a1f85814da Corrected format 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff b3aed5f6fe Update spanish translation for states 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 6a13758273 Spanish translation for states 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff ac219bf80d Spanish language added 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 16560c8ea4 Spanish translation for countries 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 8c0f8728cc Upgrade spanish translation for Admin and Shop modules 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 599e629b22 Spanish translation for BookingProduct, Core, Customer, SocialLogin, Ui and Velocity modules 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 131162c5f7 Spanish translations for laravel 2021-03-13 12:57:30 -03:00
Jitendra Singh 830f586650
Merge pull request #4734 from rahulshukla-webkul/development
Order Transaction added for paypal smart button
2021-03-12 19:41:21 +05:30
devansh bawari 7e8892c22d Merge branch 'master' into s-6 2021-03-12 19:26:04 +05:30
devansh bawari 47722198b3 Merge branch 'master' into issue-4730 2021-03-12 19:25:09 +05:30
devansh bawari 2b239d1a2f Merge remote-tracking branch 'upstream/master' into laravel-8-support 2021-03-12 19:24:03 +05:30
rahul shukla 5997bbd940 Order Transaction added for paypal smart button 2021-03-12 19:11:06 +05:30
rahul shukla 14bf78a195 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-03-12 19:07:45 +05:30
rahul shukla 7282bcabfc Order Transaction added for paypal smart button 2021-03-12 19:07:08 +05:30
Glenn Hermans 3bda725b26
Merge pull request #4733 from devansh-webkul/dashboard-exception-handled
Some Exception Handled On Dashboard Page
2021-03-12 14:31:36 +01:00
devansh bawari b9cf2a6544 Some Exception Handled On Dashboard Page 2021-03-12 18:48:55 +05:30
devansh bawari 57c2b20ac9 Merge remote-tracking branch 'upstream/master' into issue-4730 2021-03-12 18:29:17 +05:30
Glenn Hermans 0d10ddb8f9
Merge pull request #4721 from devansh-webkul/responsive-admin
Enhancement Completed Responsive Admin #4295
2021-03-12 13:49:50 +01:00
devansh bawari 76e3bbe4a2 Product Deletion Code Removed 2021-03-12 18:10:52 +05:30
Jitendra Singh 12e81a36f0
Merge pull request #4706 from devansh-webkul/issue-4698
Fixed category slug which is not translation based #4698
2021-03-12 16:42:39 +05:30
Jitendra Singh a81a0bd8cd
Merge pull request #4700 from devansh-webkul/s-4
Cancel Order Check Added - SA4
2021-03-12 15:12:20 +05:30
devansh bawari a0ad610a69 Merge remote-tracking branch 'upstream/master' into responsive-admin 2021-03-12 13:45:35 +05:30
devansh bawari 74633a6ee5 Merge branch 'master' into responsive-admin 2021-03-12 13:44:47 +05:30
devansh bawari cc208d6000 Merge remote-tracking branch 'upstream/master' into laravel-8-support 2021-03-12 13:40:01 +05:30
devansh bawari 09b67455c3 Merge branch 'master' into issue-4698 2021-03-12 13:34:20 +05:30
devansh bawari e8189013e0 Merge branch 'master' into s-6 2021-03-12 13:33:13 +05:30
devansh bawari 45ddd14798 Merge branch 'master' into s-4 2021-03-12 13:31:35 +05:30
Jitendra Singh 40915dcbfb
Merge pull request #4728 from devansh-webkul/issue-4727
Fixed error `addToCartHtml` which is not defined on the compare page #4727
2021-03-12 12:54:16 +05:30