Commit Graph

6632 Commits

Author SHA1 Message Date
Devansh 9dae408c03 Some Changes done 2020-09-07 23:09:19 +05:30
Devansh cb2194f4cd Payment Instructions Added On Invoice 2020-09-07 22:17:37 +05:30
Jitendra Singh d85ef2d404
Merge pull request #3905 from jitendra-webkul/master
Issue #3893 fixed
2020-09-07 21:08:48 +05:30
jitendra b449fcdf80 Updated .env.testing with current version 2020-09-07 20:08:06 +05:30
jitendra 17f22f22e7 Updated .env.testing 2020-09-07 20:05:20 +05:30
jitendra 15d4123df9 Issue #3905 fixed 2020-09-07 20:00:57 +05:30
Jitendra Singh 63f5eb8f3b
Merge pull request #3901 from vishal-webkul/issue-3900
Issue #3900 fixed
2020-09-07 20:00:31 +05:30
vishal.kushwaha650 2cc490ec03 fix conflicts 2020-09-07 19:53:08 +05:30
vishal.kushwaha650 b630f107d2 Merge branch 'master' of https://github.com/vishal-webkul/bagisto into issue-3900 2020-09-07 19:49:05 +05:30
Jitendra Singh ac20589269
Merge pull request #3892 from vishal-webkul/issue-3890
Issue #3890 Fixed
2020-09-07 19:37:13 +05:30
Jitendra Singh 0096491a4d
Merge pull request #3868 from devansh-webkul/compare_icon_issue_in_default
Fixed #3866
2020-09-07 19:36:38 +05:30
Jitendra Singh fc22a61c32
Merge pull request #3896 from devansh-webkul/default_fr_issue
French Settings Added To Seeder #3889
2020-09-07 19:36:02 +05:30
Jitendra Singh 93309f6d64
Merge pull request #3904 from devansh-webkul/social_login_cart_merging
Social login cart merging
2020-09-07 19:35:37 +05:30
Jitendra Singh 90f4521b26
Merge pull request #3906 from devansh-webkul/same_order_id_issue
Fixed #3902
2020-09-07 19:35:13 +05:30
Jitendra Singh ecdb6ecce3
Merge pull request #3910 from devansh-webkul/enhancement_for_payment_instruction
Instructions Added #3907
2020-09-07 19:34:27 +05:30
Devansh 8099c3cb74 Instructions Added 2020-09-07 18:09:39 +05:30
vishal.kushwaha650 4ffce40f1e fixed sale sticker problem 2020-09-07 15:40:54 +05:30
Devansh f90e354c1b Migration Added For Unique Check On Increment ID 2020-09-07 12:41:18 +05:30
jitendra 6b92265c52 Issue #3862 fixed 2020-09-07 12:28:41 +05:30
jitendra d1e5c889ba Issue #3893 fixed 2020-09-07 12:13:54 +05:30
Devansh 78805bfcec Merge branch 'master' into social_login_cart_merging
Merged With Master
2020-09-07 11:32:18 +05:30
Devansh eb54a90b3b Event Dispatcher Added 2020-09-07 11:30:47 +05:30
Jitendra Singh f132db5deb
Merge pull request #3899 from devansh-webkul/order_state_issue
Number Of Invoiced Added #3895
2020-09-07 10:57:13 +05:30
vishal.kushwaha650 71ae924806 Issue #3900 fixed 2020-09-05 21:02:32 +05:30
Devansh fc60606cfb Number Of Invoiced Added 2020-09-05 18:31:56 +05:30
Devansh 2ba3b59235 Added to Seeder 2020-09-05 17:20:14 +05:30
vishal.kushwaha650 e428d7bc47 Issue #3890 Fixed 2020-09-05 13:24:34 +05:30
Devansh 896388bb75
Merge branch 'master' into compare_icon_issue_in_default 2020-09-05 12:21:31 +05:30
Devansh 377283237c https://github.com/bagisto/bagisto/pull/3868#issuecomment-686963796 Fixed 2020-09-05 12:19:38 +05:30
Jitendra Singh 4b63fba6b9
Merge pull request #3887 from jitendra-webkul/master
Merged with master
2020-09-04 19:08:32 +05:30
jitendra 0905517f24 Merged with master 2020-09-04 19:07:04 +05:30
Jitendra Singh 7874798dfa
Merge pull request #3883 from jitendra-webkul/master
Updated changelog
2020-09-04 13:29:38 +05:30
Jitendra Singh 0cf699d8ba
Merge pull request #3884 from rahulcs0082/development
Development
2020-09-04 13:29:25 +05:30
rahulshukla-home d7edcdb8bc Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-09-04 13:15:45 +05:30
rahulshukla-home 6270c59566 Authorization check added in resouce controller in API 2020-09-04 13:15:27 +05:30
jitendra 82b32fb4cc Updated changelog 2020-09-04 13:06:23 +05:30
Jitendra Singh abd057d4d0
Merge pull request #3798 from vishal-webkul/quick-view
Add  effect on open quick product view
2020-09-04 12:05:22 +05:30
vishal-webkul 6a8f86a494
Merge branch 'master' into quick-view 2020-09-04 11:53:04 +05:30
Jitendra Singh d333859b01
Merge pull request #3869 from bagisto/dependabot/composer/symfony/http-kernel-5.1.5
Bump symfony/http-kernel from 5.1.0 to 5.1.5
2020-09-04 11:43:25 +05:30
Jitendra Singh 6aa8e11a3c
Merge pull request #3876 from devansh-webkul/back_url_issue
Fixed #3872
2020-09-04 11:43:11 +05:30
Jitendra Singh 527a6ce645
Merge pull request #3875 from devansh-webkul/rtl_downloadable_issue
Fixed #3871
2020-09-04 11:42:31 +05:30
Devansh 546dd1e5f9 Chained Element When Not In Used 2020-09-04 00:05:24 +05:30
Devansh 4d40444dd2 RTL Issue Fixed In Default 2020-09-03 23:50:08 +05:30
Devansh d540aae283 Merge branch 'master' into rtl_downloadable_issue
Merged
2020-09-03 20:44:58 +05:30
Jitendra Singh 4a72c72b24
Merge pull request #3880 from jitendra-webkul/master
Config to add custom css and javascript (Eg. google anlytics)
2020-09-03 19:41:55 +05:30
Jitendra Singh 7bcd6ba5d8
Merge pull request #3881 from devansh-webkul/some_error_fixes
Some Error Fixes
2020-09-03 19:39:01 +05:30
Devansh b1afdf3e5e Added Admin Folder To Git Ignore 2020-09-03 19:25:01 +05:30
jitendra 4b6bb0a8f5 Config to add custom css and javascript (Eg. google anlytics) 2020-09-03 19:24:15 +05:30
Devansh 80ccee80fe Revert "Some Files Are Ignored"
This reverts commit a45cb01261.

Reverted and Adding Main Folder
2020-09-03 19:19:50 +05:30
Devansh 3b14f6d334 Layout Issue Fixed 2020-09-03 18:35:20 +05:30