Commit Graph

3636 Commits

Author SHA1 Message Date
Jitendra Singh a606c06e11 Cart rule and catalog rule updated for laravel 6.0 2020-01-21 15:51:12 +05:30
Jitendra Singh 50bf92d658
Merge pull request #2082 from rahulshukla-webkul/6.0
6.0
2020-01-21 15:30:23 +05:30
rahul shukla 4f1e20d23c conflict resolve 2020-01-21 15:28:16 +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 a8a28ccf60
Merge pull request #2081 from jitendra-webkul/1.0
Issue #2075 fixed
2020-01-21 12:58:57 +05:30
Jitendra Singh 5cc7b4aae2 Issue #2075 fixed 2020-01-21 12:58:11 +05:30
Jitendra Singh 2a9c3a04d5
Merge pull request #2080 from jitendra-webkul/1.0
Issue #2071 fixed
2020-01-20 19:59:42 +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 6b3415f0e8
Merge pull request #2076 from jitendra-webkul/1.0
Issue #2074 fixed
2020-01-20 15:27:59 +05:30
Jitendra Singh 7e14737f8c Issue #2074 fixed 2020-01-20 15:26:31 +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
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
Jitendra Singh a341c9291e
Merge pull request #2050 from Haendlerbund/remove-composer-lock-from-gitignore
remove composer.lock from .gitignore
2020-01-17 11:47:51 +05:30
Jitendra Singh 22b17acee3
Merge pull request #2064 from shubhwebkul/master
pass locale data in view_render_event
2020-01-17 11:13:39 +05:30
shubhammehrotra.symfony@webkul.com ba355a6f31 passing data from slider repository instead of id 2020-01-16 16:22:00 +05:30
shubhammehrotra.symfony@webkul.com 0468b7fa58 pass locale data in view_render_event 2020-01-16 12:37:52 +05:30
Jitendra Singh c2fdfb8921
Merge pull request #2063 from rahulshukla-webkul/development
Added mail from name field in .env.example file, Issue #2051
2020-01-16 11:09:54 +05:30
rahul shukla 5a590db145 Added mail from name field in .env.example file, Issue #2051 2020-01-15 19:27:51 +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 d931571c35
Merge pull request #2061 from jitendra-webkul/1.0
Issue #2054 fixed
2020-01-15 19:03:59 +05:30
Jitendra Singh 9e5fc5bf1e Issue #2054 fixed 2020-01-15 19:03:07 +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 774f08901b
Merge pull request #2055 from shubhwebkul/master
fire event on creating/updating slider
2020-01-15 15:50:20 +05:30
shubhammehrotra.symfony@webkul.com eab9fdebb0 fire event on creating/updating slider 2020-01-15 15:48:02 +05:30
Jitendra Singh 6fb3f78f2d
Merge pull request #2052 from jitendra-webkul/1.0
Issue #1779 fixed
2020-01-14 19:10:30 +05:30
Jitendra Singh dd1ca9336b Issue #1779 fixed 2020-01-14 19:09:59 +05:30
Herbert Maschke a5e1481ebd remove composer.lock from .gitignore 2020-01-14 13:31:15 +01:00
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 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 ed8a1fb621
Merge pull request #2046 from rahulshukla-webkul/development
Development
2020-01-14 12:43:28 +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