Commit Graph

1057 Commits

Author SHA1 Message Date
David Große 3ca5c99f27 introduce company_name column to customer_addresses 2020-01-10 11:05:09 +01:00
Jitendra Singh 01833962a9
Merge pull request #2023 from jitendra-webkul/1.0
Issue #1842 fixed
2020-01-10 14:05:25 +05:30
Jitendra Singh 8db495446a Issue #1842 fixed 2020-01-10 14:00:11 +05:30
Jitendra Singh a8d8580f89
Merge pull request #2022 from jitendra-webkul/1.0
Issue #1845 fixed
2020-01-10 13:54:04 +05:30
Jitendra Singh 9faef742d7 Issue #1845 fixed 2020-01-10 13:53:11 +05:30
Jitendra Singh 3a52d63ac9
Merge pull request #1985 from rabol/master
Make it possible to specify timezone in .env
2020-01-10 13:32:30 +05:30
rahul shukla b5b00bb4f8 Issue 2012 2020-01-09 11:33:54 +05:30
Jitendra Singh ebddf578b1
Merge pull request #1843 from Haendlerbund/feature/update-npm-assets
update npm assets
2020-01-07 15:34:29 +05:30
Jitendra Singh d438d1b4ed
Merge pull request #2006 from jitendra-webkul/1.0
Catalog rule and cart rule implemented for all product types
2020-01-06 17:52:30 +05:30
Jitendra Singh ab5464641b
Merge pull request #2003 from Haendlerbund/make-api-routes-accessable
Make API routes accessable
2020-01-03 18:08:20 +05:30
rahul shukla 7f3e3001b5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-03 18:05:24 +05:30
rahul shukla 97c63ad035 review missing variavle and admin footer text 2020-01-03 18:05:14 +05:30
MonaHartdegen d52ef533c7 replace wildcard route for products and categories with fallback route 2020-01-03 13:09:06 +01:00
rahul shukla 9b120a978d foter text change 2020-01-03 15:57:43 +05:30
rahul shukla 297165859f foter text change 2020-01-03 15:35:56 +05:30
MonaHartdegen dc89cd6511 fixed product links in two views (replaced hard coded link with route) 2020-01-02 13:14:53 +01:00
peternuernberger af28c35bf7 Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets 2019-12-30 09:32:49 +01:00
rabol 029971e9cf Fix bug that prevent user from signing up for newsletter 2019-12-28 15:36:40 +01:00
jitendra 7aba45486f Indexes created for all product types 2019-12-25 19:57:05 +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 795561ea58 Made all changes for discount packages 2019-12-21 16:00:22 +05:30
jitendra 2d0b26d78a Added changes on core packages for discount 2019-12-21 13:01:16 +05:30
rahul shukla 716798458b Issue #1806 2019-12-20 19:34:56 +05:30
rahul shukla 370480572f Issue 1802. 2019-12-19 17:21:40 +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
David Große d667263313 add two events to profile index blade view 2019-12-18 16:26:38 +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
peternuernberger d92bb0ea72 Merge branch 'bagisto/master' into feature/update-npm-assets 2019-12-18 09:41:40 +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
rahul shukla 2f8e319fb0 Issue #1232, default item in perpage and label of perpage 2019-12-16 18:56:02 +05:30
MonaHartdegen 2b0385c14e Merge remote-tracking branch 'bagisto/master' into allow-empty-option-for-attributes 2019-12-13 14:12:14 +01:00
MonaHartdegen f90bb1d7fd merge bagisto/master; resolved conflicts; added unit tests for database logic 2019-12-13 13:43:22 +01:00
rahul shukla 7321a2fc74 Issue #1821, price at review page 2019-12-12 19:44:54 +05:30
rahul shukla 90fd1d45e5 Issue #1463 2019-12-12 17:09:50 +05:30
rahul shukla e8f0802b9f Issue #1878 2019-12-12 15:23:30 +05:30
MonaHartdegen 7b1378fded added checkbox to add empty (default) option for attributes; only show attribute labels (not admin names) on product detail view 2019-12-12 10:32:51 +01:00
rahul shukla c6553ed238 conflict resolve 2019-12-12 14:20:17 +05:30
rahul shukla dbf404d13f Issue #1787 2019-12-11 15:25:19 +05:30
MonaHartdegen ebcae41f3c improved field size of url_path in DB, improved naming, update url_path of children on saving 2019-12-09 08:22:37 +01:00
naresh verma 183cbf34cf resolve table prefix issue 2019-12-05 13:21:52 +05:30
MonaHartdegen 0eb9cfc86d added comment to db column; added @property-read to Category and CategoryTranslation model 2019-12-03 13:24:11 +01:00
MonaHartdegen 78a3c91c84 fixed bug in sql triggers 2019-12-02 16:30:24 +01:00
peternuernberger 8cb3c5895a updated publishable folders 2019-12-02 12:26:55 +01:00
peternuernberger 57750b3864 prevent script break if there are no products 2019-12-02 11:46:13 +01:00
peternuernberger c1f648a17f excluded import statements 2019-12-02 11:41:02 +01:00
rahul shukla 8948aeaea7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-11-26 18:33:01 +05:30