Commit Graph

3489 Commits

Author SHA1 Message Date
shubhammehrotra.symfony@webkul.com 11bdccbd88 updates by prateek 2019-12-31 12:27:32 +05:30
shubhammehrotra.symfony@webkul.com 2fcd1a4b76 Merge branch 'velocity-1' into prateek-latest1 2019-12-31 09:42:55 +05:30
shubhammehrotra.symfony@webkul.com 264212bc8d save velocity configuration 2019-12-30 21:36:55 +05:30
prateek srivastava 84b1f4102f resolved conflict 2019-12-30 20:30:06 +05:30
prateek srivastava 8296fdb6d4 initial commit 2019-12-30 20:26:13 +05:30
shubhammehrotra.symfony@webkul.com 408c9af744 updates 2019-12-30 20:18:35 +05:30
shubhammehrotra.symfony@webkul.com baae82b633 updates 2019-12-30 12:25:51 +05:30
shubhammehrotra.symfony@webkul.com ec6bafa248 merged with prateek-base 2019-12-27 18:29:50 +05:30
shubhammehrotra.symfony@webkul.com 3bea1b7e0e Misc. updates 2019-12-27 17:39:19 +05:30
shubhammehrotra.symfony@webkul.com b991069401 related products updates 2019-12-27 13:29:01 +05:30
shubhammehrotra.symfony@webkul.com fe43e6535d sidebar updates 2019-12-27 09:43:59 +05:30
shubhammehrotra.symfony@webkul.com 113c5753d7 velocity initial 2019-12-26 18:05:21 +05:30
Jitendra Singh a22b98129e
Merge pull request #1901 from HansSchouten/patch-1
Allow datagrid action to have target="_blank"
2019-12-24 13:13:16 +05:30
Jitendra Singh 3b1b3e819f
Merge pull request #1945 from rahulshukla-webkul/development
Development
2019-12-24 13:12:52 +05:30
Jitendra Singh a3aa23fcbc
Merge pull request #1902 from Haendlerbund/allow-empty-option-for-attributes
Allow empty option for attributes
2019-12-24 13:12:22 +05:30
Jitendra Singh 02b2d171b7
Merge pull request #1937 from Haendlerbund/minor-code-style-improvements
Minor code style improvement in ProductRepository
2019-12-24 13:12:12 +05:30
Jitendra Singh f77e1be2bf
Merge pull request #1961 from yegobox/master
fix: broken url sometimes when finishing installation,go to wrong address
2019-12-24 13:12:03 +05:30
Richard Mura bef5be71af fix: broken url sometimes when finishing installation,go to wrong application url 2019-12-21 21:49:14 +02:00
rahul shukla bad6665fb7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-20 19:35:15 +05:30
rahul shukla 716798458b Issue #1806 2019-12-20 19:34:56 +05:30
MonaHartdegen 6f58fc041f increase maintainability by replacing hard coded class names by <Classname>::class in ProductRepository 2019-12-20 09:56:47 +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
Hans Schouten 67ef3b0c7a
Allow datagrid action to have target="_blank" 2019-12-17 08:28:58 +01:00
MonaHartdegen 5d9923bf30 improved usage of var/let/const; fixed error on removing row 2019-12-16 15:42:32 +01:00
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
MonaHartdegen b5f0c1db79 added attribute (-related) factories; added functional test 2019-12-13 14:59:45 +01:00
MonaHartdegen 2b0385c14e Merge remote-tracking branch 'bagisto/master' into allow-empty-option-for-attributes 2019-12-13 14:12:14 +01:00
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