Commit Graph

1166 Commits

Author SHA1 Message Date
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 8612bd1385
Merge pull request #2069 from jitendra-webkul/1.0
Fixed cms textarea field issue
2020-01-17 14:58:27 +05:30
Jitendra Singh 6535afb52c Fixed cms textarea field issue 2020-01-17 14:57:36 +05:30
Jitendra Singh a6960f2916
Merge pull request #2068 from jitendra-webkul/1.0
Removed Developement menu
2020-01-17 14:49:25 +05:30
Jitendra Singh eb3fdc12c6 Removed Developement menu 2020-01-17 14:48:39 +05:30
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
shubhammehrotra.symfony@webkul.com 0468b7fa58 pass locale data in view_render_event 2020-01-16 12:37:52 +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 915213711d
Merge pull request #2057 from jitendra-webkul/1.0
Issue #1863 fixed
2020-01-15 17:46:03 +05:30
Jitendra Singh 1e73cc9bc8 Issue #1863 fixed 2020-01-15 17:45:15 +05:30
Jitendra Singh 2049c45b0f
Merge pull request #2056 from jitendra-webkul/1.0
Issue #1863 fixed
2020-01-15 17:09:20 +05:30
Jitendra Singh b4319e1f38 Issue #1863 fixed 2020-01-15 17:08:37 +05:30
Jitendra Singh a7fe03602f
Merge pull request #2049 from rahulshukla-webkul/development
Issue #1971
2020-01-14 17:08:17 +05:30
rahul shukla 84feea8f0d Issue #1971 2020-01-14 17:04:53 +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
rahul shukla 7110804889 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-01-14 12:37:18 +05:30
rahul shukla 7e1b5fa693 Issue #1808 2020-01-14 12:37:03 +05:30
shubhammehrotra.symfony@webkul.com 2cf8af4815 updates for uploading attachments 2020-01-13 19:38:04 +05:30
Jitendra Singh 5ce709d31a
Merge pull request #2028 from rahulshukla-webkul/development
Issue #1808
2020-01-10 16:57:49 +05:30
rahul shukla 6d6efbb49c Issue #1808 2020-01-10 16:50:20 +05:30
Jitendra Singh 9faef742d7 Issue #1845 fixed 2020-01-10 13:53:11 +05:30
rahul shukla 0f0cc82058 Issue #1983 2020-01-09 13:39:13 +05:30
rahul shukla 6413cdae71 added star in state view in datagrid 2020-01-09 13:07:43 +05:30
Jitendra Singh 55df0ad02f
Merge pull request #2013 from jitendra-webkul/1.0
Issues #1997, #1994 fixed
2020-01-08 17:02:39 +05:30
Jitendra Singh ca0f8bca49 Issues #1997, #1994 fixed 2020-01-08 17:01:50 +05:30
Jitendra Singh a0c02e6c4a
Merge pull request #2011 from jitendra-webkul/1.0
Tax rates for all states
2020-01-07 19:37:42 +05:30
jitendra fbfd710f1c Tax rates for all states 2020-01-07 17:48:43 +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
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
rahul shukla 25dff89054 translation added for locales 2020-01-03 16:12:23 +05:30
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
rahul shukla 4b2088e66e upgrade to laravel 6 2019-12-30 17:10:38 +05:30
peternuernberger af28c35bf7 Merge branch 'master' of https://github.com/bagisto/bagisto into feature/update-npm-assets 2019-12-30 09:32:49 +01:00
jitendra 7aba45486f Indexes created for all product types 2019-12-25 19:57:05 +05:30
rahul shukla 23a15be1e0 compatible with laravel 5.8 2019-12-24 19:31:13 +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
jitendra 2380c1b597 Merged with master 2019-12-21 10:58:46 +05:30
jitendra 513b07e4cf Added new cart rule and catalog rule 2019-12-21 10:55:32 +05:30
rahul shukla 642d99a63c Issue #1792 2019-12-19 17:42:12 +05:30
rahul shukla 2f0338bda3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-12-19 16:47:20 +05:30