Commit Graph

1091 Commits

Author SHA1 Message Date
Jitendra Singh 3aec5047f6
Merge pull request #2072 from Haendlerbund/issue-1183/guest-checkout-configuration
Resolve #1183 guest checkout configuration
2020-01-22 11:32:45 +05:30
Jitendra Singh 92636543cd
Merge pull request #1970 from Haendlerbund/introduce-default-country
introduce default_country application configuration key
2020-01-21 16:34:38 +05:30
rahul shukla 82dbdee0b8 helper functions updated 2020-01-21 15:23:04 +05:30
rahul shukla debf060b03 helper function updated 2020-01-21 15:13:01 +05:30
rahul shukla e3db0b164c conflict resolve 2020-01-21 13:24:19 +05:30
Jitendra Singh 176feecb55 Resolved conflicts 2020-01-20 19:59:04 +05:30
Jitendra Singh b18f2292c4 Issue #2071 fixed 2020-01-20 19:57:10 +05:30
Jitendra Singh dfa4272cf2
Merge pull request #2008 from Haendlerbund/category-url-structure-multiple-roots
Set correct category url_path in multiple root categories environment
2020-01-20 13:27:04 +05:30
Annika Wolff 132dd6c0f0 introduce guest checkout configuration 2020-01-17 14:42:47 +01:00
Jitendra Singh 880868738a
Merge pull request #2067 from jitendra-webkul/1.0
Issue #2058 fixed
2020-01-17 12:06:06 +05:30
Jitendra Singh 7d7e86e85c Issue #2058 fixed 2020-01-17 12:05:28 +05:30
Jitendra Singh ab8001d20c
Merge pull request #2062 from jitendra-webkul/1.0
Issue #2054 fixed
2020-01-15 19:08:54 +05:30
Jitendra Singh 130ed41044 Issue #2054 fixed 2020-01-15 19:07:12 +05:30
Jitendra Singh d80a3c7a5f
Merge pull request #2059 from jitendra-webkul/1.0
Removed ')' in page edit blade
2020-01-15 18:42:24 +05:30
Jitendra Singh b552aba450 Removed ')' in page edit blade 2020-01-15 18:40:57 +05:30
Jitendra Singh 3901c1ad2e
Merge pull request #2048 from rahulshukla-webkul/development
Issue #2045
2020-01-14 15:27:47 +05:30
rahul shukla 9c7770b29e Issue #2045 2020-01-14 15:25:04 +05:30
Jitendra Singh 0e2b8163e6
Merge pull request #2047 from jitendra-webkul/1.0
Issue #1779 fixed
2020-01-14 13:24:26 +05:30
Jitendra Singh 05a619d39b Issue #1779 fixed 2020-01-14 13:23:49 +05:30
Jitendra Singh a42724d5f3
Merge pull request #2038 from jitendra-webkul/1.0
Issue #1795 fixed
2020-01-13 13:18:25 +05:30
Jitendra Singh 3368eb5ba5 Issue #1795 fixed 2020-01-13 13:17:27 +05:30
Jitendra Singh 1e18cebb00
Merge pull request #2037 from jitendra-webkul/1.0
Issue #1764 fixed
2020-01-13 12:45:25 +05:30
Jitendra Singh cf36d252a0 Issue #1764 fixed 2020-01-13 12:44:36 +05:30
Jitendra Singh 9380a37479
Merge pull request #2036 from jitendra-webkul/1.0
Issue #1786 fixed
2020-01-13 12:38:30 +05:30
Jitendra Singh 27e728d54e Issue #1786 fixed 2020-01-13 12:37:41 +05:30
Jitendra Singh 9d1887a9a1
Merge pull request #2026 from jitendra-webkul/1.0
Issue #1804 fixed
2020-01-10 16:28:27 +05:30
Jitendra Singh a7d02d552f Issue #1804 fixed 2020-01-10 16:27:35 +05:30
Jitendra Singh 30cb75c307
Merge pull request #2024 from jitendra-webkul/1.0
Issue #1821 fixed
2020-01-10 15:48:53 +05:30
Jitendra Singh b336a998d3 Issue #1821 fixed 2020-01-10 15:47:55 +05:30
Jitendra Singh 9fbe756075 Fixed review controller compact undefined variable issue 2020-01-10 15:14:29 +05:30
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
MonaHartdegen c065631a58 set correct category url_path in multiple root categories environment 2020-01-06 15:37:55 +01:00
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
MonaHartdegen f4499b4728 altered trigger to be compatible with multi root categories environment; tests still WIP 2020-01-03 15:22:09 +01:00
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
rahul shukla 5c0843c470 upgrade to lavael 6.0 2019-12-27 13:30:05 +05:30