Commit Graph

3465 Commits

Author SHA1 Message Date
David Große e962dbc988 allow defaultCountry also in edit.blade 2020-01-08 14:56:22 +01:00
David Große c346770ab1 introduce default_country application configuration key 2019-12-23 14:28:54 +01:00
Jitendra Singh 619b922ba4
Merge pull request #1922 from rahulshukla-webkul/development
Issue 1802.
2019-12-20 12:38:53 +05:30
rahul shukla 642d99a63c Issue #1792 2019-12-19 17:42:12 +05:30
rahul shukla 370480572f Issue 1802. 2019-12-19 17:21:40 +05:30
Jitendra Singh 3c0de30400
Merge pull request #1921 from rahulshukla-webkul/development
Development
2019-12-19 16:49:47 +05:30
rahul shukla 2f0338bda3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-19 16:47:20 +05:30
rahul shukla 10d4613446 Issue #1879 and #1880 2019-12-19 16:47:00 +05:30
Jitendra Singh 8ef4c64d01
Merge pull request #1920 from shubhwebkul/master
Throw exception when user is not is session
2019-12-19 16:05:46 +05:30
shubhammehrotra.symfony@webkul.com 992d09e8d5 check guest customer configuration 2019-12-19 16:04:55 +05:30
shubhammehrotra.symfony@webkul.com cf837ba290 throw exception when session user is not available on product review page 2019-12-19 15:53:01 +05:30
Jitendra Singh d74e8e863c
Merge pull request #1907 from KevinLaveto/patch-1
The {length} didn't get properly formatted
2019-12-19 12:53:50 +05:30
Jitendra Singh 61ab18dd32
Merge pull request #1914 from Haendlerbund/two-more-events
add two events to profile index blade view
2019-12-19 10:29:24 +05:30
David Große d667263313 add two events to profile index blade view 2019-12-18 16:26:38 +01:00
Jitendra Singh 3e3cab6bf2
Merge pull request #1909 from KevinLaveto/patch-2
Multiple type file error
2019-12-18 15:59:36 +05:30
KevinLaveto 02d42d6186
Multiple type file error 2019-12-18 11:18:57 +01:00
KevinLaveto 37ca3d6586
The {length} didn't get properly formatted
I don't know if this is completely correct since I don't know this language, but for my language it said
```
Veld "Wachtwoord" moet ten minste {length} tekens bevatten
```
So the length didn't get replaced. 

I think the locales.js needs to change
2019-12-18 10:16:35 +01:00
Jitendra Singh 068b688e7c
Merge pull request #1785 from Haendlerbund/1244-url-structure-for-products-and-categories
1244 url structure for products and categories (SEO improvements)
2019-12-18 12:38:53 +05:30
Jitendra Singh c26bf6c820
Merge pull request #1701 from MattApril/env-fix
Replace env() function usage with config() function, when outside of config file context
2019-12-18 12:38:00 +05:30
Jitendra Singh 56a486d281
Merge pull request #1899 from rahulshukla-webkul/development
Development
2019-12-18 11:46:56 +05:30
rahul shukla b033901678 Issue #1897, added configuartion for live account in paypal 2019-12-18 11:42:07 +05:30
rahul shukla b6493a590b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-16 18:56:37 +05:30
rahul shukla 2f8e319fb0 Issue #1232, default item in perpage and label of perpage 2019-12-16 18:56:02 +05:30
Jitendra Singh 54c06a94b1
Merge pull request #1894 from Haendlerbund/move-test
move tests/OrderRepositoryCest.php
2019-12-16 15:08:27 +05:30
David Große b679f543db move tests/OrderRepositoryCest.php into brand new shiny fancy codeception tests/ folder 2019-12-13 14:10:44 +01:00
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
Jitendra Singh 3dc905331b
Merge pull request #1892 from rahulshukla-webkul/development
Issue #1877
2019-12-13 17:19:12 +05:30
rahul shukla 2d1afb988a Issue #1877 2019-12-13 17:12:03 +05:30
Jitendra Singh 94cfc5a9d5
Merge pull request #1891 from rahulshukla-webkul/development
Issue #1848
2019-12-13 17:08:07 +05:30
rahul shukla 6af302fa95 Issue #1848 2019-12-13 17:06:32 +05:30
Jitendra Singh 70db4ef8c5
Merge pull request #1886 from Haendlerbund/slacken-condition-to-save-downloadable-purchased-link
slackened condition to save downloadable purchase link
2019-12-13 15:44:27 +05:30
Jitendra Singh 9486f00987
Merge pull request #1789 from bosix/1754-add-codeception
#1745 - add codeception and example tests
2019-12-13 15:30:51 +05:30
Jitendra Singh 9f5c82068e
Merge pull request #1889 from rahulshukla-webkul/development
Issue #1808
2019-12-13 14:39:54 +05:30
rahul shukla 84feb1760f Issue #1232, option to select the number of data to be shown per pages for all data grids 2019-12-13 14:34:32 +05:30
rahul shukla dc890cedc7 Issue #1270 2019-12-13 10:56:38 +05:30
rahul shukla dade205e81 Issue #1808 2019-12-12 20:10:12 +05:30
Jitendra Singh 88963dc1cf
Merge pull request #1888 from rahulshukla-webkul/development
Issue #1821, price at review page
2019-12-12 19:46:52 +05:30
rahul shukla 7321a2fc74 Issue #1821, price at review page 2019-12-12 19:44:54 +05:30
Jitendra Singh e750145403
Merge pull request #1887 from rahulshukla-webkul/development
Issue #1844, Mass Action Crashes the system
2019-12-12 19:07:49 +05:30
rahul shukla 1125bac079 Issue #1844, Mass Action Crashes the system 2019-12-12 19:04:54 +05:30
Jitendra Singh 0b0e8aadbe
Merge pull request #1885 from Haendlerbund/remove-laravel-web-console-completely
Removed remnants of laravel-web-console
2019-12-12 18:37:14 +05:30
Annika Wolff 85d3c2b64a slackened condition to save downloadable purchase link 2019-12-12 13:39:33 +01:00
MonaHartdegen 2feb9114bd removed remnants of laravel-web-console from development view and language files 2019-12-12 13:23:52 +01:00
Jitendra Singh feb2ee0ad1
Merge pull request #1884 from rahulshukla-webkul/development
Issue #1463
2019-12-12 17:23:31 +05:30
rahul shukla 90fd1d45e5 Issue #1463 2019-12-12 17:09:50 +05:30
Jitendra Singh 2a6ba89999
Merge pull request #1774 from rahulshukla-webkul/development
completed step chaneges in checkout page
2019-12-12 16:28:29 +05:30
rahul shukla b67b389d91 Issue #1594, export information limit by search 2019-12-12 16:26:52 +05:30
rahul shukla e8f0802b9f Issue #1878 2019-12-12 15:23:30 +05:30
rahul shukla c6553ed238 conflict resolve 2019-12-12 14:20:17 +05:30
Jitendra Singh 9e30025575
Merge pull request #1853 from naresh-webkul/master
resolve table prefix issue
2019-12-12 13:49:46 +05:30