Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bagisto to HB Update #23

Merged
merged 432 commits into from May 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
432 commits
Select commit Hold shift + click to select a range
9d6ac8a
Bump symfony/http-foundation from 4.4.5 to 4.4.7
dependabot[bot] Mar 31, 2020
dd88a81
remove line
shubh-mehrotra Apr 1, 2020
d65653a
Merge pull request #2809 from shubhwebkul/patch-1
jitendra-webkul Apr 1, 2020
eabbbfe
#2808
shubh-mehrotra Apr 1, 2020
e259d6b
#2785
shubh-mehrotra Apr 1, 2020
a5e9c23
checkout page margin added
shubh-mehrotra Apr 1, 2020
3f8741e
resolved conflicts
shubh-mehrotra Apr 1, 2020
6e18ea7
Merge pull request #2803 from Haendlerbund/fix_tax_rate_rounding
jitendra-webkul Apr 1, 2020
256c6fd
Merge pull request #2802 from Haendlerbund/pr-2753/flickering-locale-…
jitendra-webkul Apr 1, 2020
f4249f2
Merge pull request #2815 from shubhwebkul/patch-2
jitendra-webkul Apr 1, 2020
efd96f8
{git commit -m
shubh-mehrotra Apr 2, 2020
26909c1
Merge pull request #2816 from shubhwebkul/master
jitendra-webkul Apr 2, 2020
e8cc97f
Merge pull request #2806 from bagisto/dependabot/composer/symfony/htt…
jitendra-webkul Apr 2, 2020
0c0dc5d
checkout page issue
shubh-mehrotra Apr 2, 2020
9f36a88
modal view update
shubh-mehrotra Apr 2, 2020
438aab3
bundled assets
shubh-mehrotra Apr 2, 2020
ff20147
remove irrelevant css
shubh-mehrotra Apr 2, 2020
258e0b3
Merge pull request #2817 from shubhwebkul/master
jitendra-webkul Apr 2, 2020
96e730f
#2775
shubh-mehrotra Apr 2, 2020
b631f5e
Merge pull request #2820 from shubhwebkul/master
jitendra-webkul Apr 2, 2020
bc838a2
remove irrelevant xhr
shubh-mehrotra Apr 3, 2020
07f3513
revert back changes in format price
rahulcs0082 Apr 3, 2020
961850b
Merge branch 'master' of https://github.com/bagisto/bagisto into deve…
rahulcs0082 Apr 3, 2020
6ee462a
Merge pull request #2823 from rahulcs0082/development
jitendra-webkul Apr 3, 2020
4c8ad50
category call get products method
shubh-mehrotra Apr 3, 2020
9bcc624
customer options click issue resolved
shubh-mehrotra Apr 3, 2020
b92e679
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 3, 2020
4b59e7e
Merge pull request #2824 from shubhwebkul/master
jitendra-webkul Apr 3, 2020
df6dc49
Merge branch 'bagisto/master' into improve-have-product-faker
thyseus Apr 4, 2020
26b0e25
customer panel accordian view and file picker view
shubh-mehrotra Apr 6, 2020
e626eba
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 6, 2020
0e06a11
customer accordian design update
shubh-mehrotra Apr 6, 2020
9d357e4
Merge pull request #2830 from shubhwebkul/master
jitendra-webkul Apr 6, 2020
02cb64e
Issue #2812
rahulcs0082 Apr 6, 2020
804dc01
compare page update height after loading images
shubh-mehrotra Apr 6, 2020
ae275de
Merge pull request #2833 from shubhwebkul/master
jitendra-webkul Apr 6, 2020
3cac6fc
Merge pull request #2831 from rahulcs0082/development
jitendra-webkul Apr 6, 2020
4ec8268
api changes
shivam-webkul Apr 6, 2020
2118714
Merge pull request #2835 from shivam-webkul/master
shivam-webkul Apr 6, 2020
c059d13
code changed for api
shivam-webkul Apr 7, 2020
9e768af
#2329
shubh-mehrotra Apr 7, 2020
16d359a
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 7, 2020
2ce322b
Merge pull request #2838 from shubhwebkul/master
jitendra-webkul Apr 7, 2020
b3e326d
Merge pull request #2839 from shivam-webkul/master
jitendra-webkul Apr 7, 2020
61f2780
issue #2792 resolved
shivam-webkul Apr 7, 2020
3ddb6a5
Merge pull request #2841 from shivam-webkul/master
jitendra-webkul Apr 7, 2020
eda2795
margin added between wishlist icon and compare icon
shubh-mehrotra Apr 8, 2020
67a4720
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 8, 2020
81c6a1b
Merge pull request #3 from bagisto/master
0xuhe Apr 8, 2020
c2022a9
checkout page email validation
shubh-mehrotra Apr 8, 2020
f4f84c0
Merge pull request #2848 from shubhwebkul/master
jitendra-webkul Apr 8, 2020
187c99c
#2834
shubh-mehrotra Apr 9, 2020
b58cc7e
Issue #2713 fixed
rahulcs0082 Apr 9, 2020
7d36062
Issue #2851 fixed
Apr 9, 2020
172310b
Issue #2847
rahulcs0082 Apr 9, 2020
3ebe63c
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 9, 2020
66ea50b
Issue #2851 fixed
Apr 9, 2020
bd2dd55
Merge pull request #2853 from jitendra-webkul/1.0
jitendra-webkul Apr 9, 2020
b3c6b93
Issue #2768 fixed
Apr 9, 2020
f51337b
Merge pull request #2855 from jitendra-webkul/1.0
jitendra-webkul Apr 9, 2020
9375ed6
Merge pull request #2852 from rahulcs0082/development
jitendra-webkul Apr 9, 2020
b82c47e
Merge pull request #2854 from shubhwebkul/master
jitendra-webkul Apr 9, 2020
63b423d
#2691
shubh-mehrotra Apr 9, 2020
373a293
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 9, 2020
a1fa3f6
Issue #2794
rahulcs0082 Apr 9, 2020
7cae8df
Merge branch 'master' of https://github.com/bagisto/bagisto into deve…
rahulcs0082 Apr 9, 2020
a1f4e1d
#2849
shubh-mehrotra Apr 9, 2020
bc23025
#2856
shubh-mehrotra Apr 9, 2020
c9fbc72
Changelog updated
Apr 9, 2020
9b56315
subcategory visibility issue in responsive
shubh-mehrotra Apr 9, 2020
72f11fb
#2790
shubh-mehrotra Apr 9, 2020
f887f07
Issue #2793
rahulcs0082 Apr 9, 2020
ad7895a
Merge pull request #2858 from jitendra-webkul/1.0
jitendra-webkul Apr 10, 2020
9573424
Merge pull request #2859 from rahulcs0082/development
jitendra-webkul Apr 10, 2020
8bee45f
Merge pull request #2857 from shubhwebkul/master
jitendra-webkul Apr 10, 2020
7082809
Issue #2846 fixed
Apr 10, 2020
dcb59d1
Merge pull request #2860 from jitendra-webkul/1.0
jitendra-webkul Apr 10, 2020
fa8120b
Merge pull request #2692 from Haendlerbund/improve-have-product-faker
jitendra-webkul Apr 10, 2020
9752f63
Merge pull request #2787 from Haendlerbund/add-option-for-set-current…
jitendra-webkul Apr 10, 2020
45c2d67
Changelog updated
Apr 10, 2020
1107854
Merge pull request #2861 from jitendra-webkul/1.0
jitendra-webkul Apr 10, 2020
5310f9e
Fixed date icon issue
Apr 10, 2020
0a216b2
Merge pull request #2862 from jitendra-webkul/1.0
jitendra-webkul Apr 10, 2020
fe84dbb
Translate mass-update for review status in admin grid
VaD1ke Apr 11, 2020
e1ae721
Fix save-category btn translation for langs with noun case
VaD1ke Apr 11, 2020
9508c3d
Merge branch 'master' into webinstall
jitendra-webkul Apr 11, 2020
4889b23
Merge pull request #2727 from ghermans/webinstall
jitendra-webkul Apr 11, 2020
e293fbf
Added more view_render_events in the customer account views
cagartner Apr 13, 2020
5a3e191
Added view_render_event to admin order view
cagartner Apr 13, 2020
1f30769
Created new view_render_events for admin order and invoice view
cagartner Apr 13, 2020
4b03e79
#2866
shubh-mehrotra Apr 13, 2020
8e93a3f
calculate height on change value of dropdown
shubh-mehrotra Apr 13, 2020
21a62ff
#2876
shubh-mehrotra Apr 13, 2020
712db11
Merge pull request #2877 from shubhwebkul/master
jitendra-webkul Apr 13, 2020
c71353f
Merge pull request #2872 from cagartner/add_view_events
jitendra-webkul Apr 13, 2020
94a08b7
Merge pull request #2867 from VaD1ke/translation-fixes
jitendra-webkul Apr 13, 2020
3d7d1ab
Issue #2784 fixed
Apr 13, 2020
57d2def
Updated changelog
Apr 13, 2020
f1cec6e
Merge pull request #2878 from jitendra-webkul/1.0
jitendra-webkul Apr 13, 2020
dd46e23
Issue #2871 fixed
Apr 13, 2020
fdd991a
Merge pull request #2879 from jitendra-webkul/1.0
jitendra-webkul Apr 13, 2020
b88e239
Issue #2543 fixed
rahulcs0082 Apr 13, 2020
b65601e
Merge branch 'master' of https://github.com/bagisto/bagisto into deve…
rahulcs0082 Apr 13, 2020
37f9dd6
Merge pull request #2880 from rahulcs0082/development
jitendra-webkul Apr 14, 2020
ef7d718
subcategory issue resolved
shubh-mehrotra Apr 14, 2020
7c7b99c
Merge pull request #2882 from shubhwebkul/master
jitendra-webkul Apr 14, 2020
6758bc4
Updated changelog
Apr 14, 2020
287975d
Merge pull request #2883 from jitendra-webkul/1.0
jitendra-webkul Apr 14, 2020
e4c96ad
#2875
shubh-mehrotra Apr 15, 2020
1d502be
Issue #2890
rahulcs0082 Apr 15, 2020
09ee600
Merge branch 'master' of https://github.com/bagisto/bagisto into deve…
rahulcs0082 Apr 15, 2020
a1509ff
Merge pull request #2892 from rahulcs0082/development
jitendra-webkul Apr 15, 2020
1f41b2a
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 15, 2020
53a1246
2875 update
shubh-mehrotra Apr 15, 2020
cce548f
Merge pull request #2894 from shubhwebkul/master
jitendra-webkul Apr 15, 2020
7a9f099
remove channel from tax category
AnnikaWolff Apr 16, 2020
3729b9d
introduce channel and channel inventory source factories
AnnikaWolff Apr 16, 2020
2eb8aa9
Issue #2895
rahulcs0082 Apr 16, 2020
4a57040
Merge branch 'master' of https://github.com/bagisto/bagisto into deve…
rahulcs0082 Apr 16, 2020
bcb32f3
removed dd
rahulcs0082 Apr 16, 2020
3412da3
Issue #2893
rahulcs0082 Apr 16, 2020
cfbc0d0
Merge pull request #2906 from rahulcs0082/development
jitendra-webkul Apr 16, 2020
5a9dfd8
add unified address-table and handling for models
Apr 16, 2020
2b19040
Issue #2884
rahulcs0082 Apr 17, 2020
9fc956a
Merge branch 'master' of https://github.com/bagisto/bagisto into deve…
rahulcs0082 Apr 17, 2020
29ecd9a
Issue #2863 fixed
rahulcs0082 Apr 17, 2020
6a56c9b
Merge pull request #2909 from rahulcs0082/development
jitendra-webkul Apr 17, 2020
01d4cb0
fix address_type at many places; add tests for address relations
Apr 17, 2020
10f76b2
Issue #2793
rahulcs0082 Apr 17, 2020
d21e027
Issue #2721
rahulcs0082 Apr 17, 2020
db1b799
Merge branch 'master' of https://github.com/bagisto/bagisto into deve…
rahulcs0082 Apr 17, 2020
f05217f
Merge pull request #2911 from rahulcs0082/development
jitendra-webkul Apr 17, 2020
910f769
fix address-constrains; fix address global scopes
Apr 17, 2020
9b6b3ee
variant products images update issue resolved
shubh-mehrotra Apr 17, 2020
f9f8b94
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 17, 2020
ef622b9
Merge pull request #2912 from shubhwebkul/master
jitendra-webkul Apr 17, 2020
754c52e
rename address types
Apr 20, 2020
1403364
responsive cart count update
shubh-mehrotra Apr 20, 2020
b8506d5
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 20, 2020
76a9ed1
#2915
shubh-mehrotra Apr 20, 2020
4e96ce5
fix typo in address migration
Apr 20, 2020
bc94f31
update
shubh-mehrotra Apr 20, 2020
ab50478
update
shubh-mehrotra Apr 20, 2020
6820e1c
Merge pull request #2917 from shubhwebkul/master
jitendra-webkul Apr 20, 2020
be43520
add option to OrderItemFactory to use existing product
AnnikaWolff Apr 21, 2020
7f7a3a9
Merge pull request #2904 from Haendlerbund/introduce-channel-and-chan…
jitendra-webkul Apr 21, 2020
6beb0f9
Merge pull request #2921 from Haendlerbund/update-order-item-factory
jitendra-webkul Apr 21, 2020
716345e
Added new events to customer update and checkou, fixed some view rend…
cagartner Apr 21, 2020
7629d85
Merge pull request #2910 from Haendlerbund/unified-addresses
jitendra-webkul Apr 22, 2020
f4b6762
Add Japanese translation
chemisax Apr 22, 2020
8030b09
Moved command to packages
Apr 23, 2020
7a9bacf
Updated composer lock file
Apr 23, 2020
9b58604
Merge pull request #2928 from jitendra-webkul/1.0
jitendra-webkul Apr 23, 2020
31c858e
Bump symfony/http-foundation from 4.4.5 to 4.4.7
dependabot[bot] Apr 23, 2020
b5b6532
#2908
shubh-mehrotra Apr 24, 2020
d439077
customer sidebar menu issue resolved
shubh-mehrotra Apr 24, 2020
9361e9e
removed layered navigation in searchproducts page
shubh-mehrotra Apr 24, 2020
6fc769b
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 24, 2020
1d7228e
#2919
shubh-mehrotra Apr 24, 2020
deb9a4c
content header path update
shubh-mehrotra Apr 24, 2020
a593f89
Merge pull request #2927 from chemisax/master
jitendra-webkul Apr 24, 2020
da9382d
Merge pull request #2903 from Haendlerbund/unnecessary-channel-for-taxes
jitendra-webkul Apr 24, 2020
7ab7654
add check if view exists
AnnikaWolff Apr 24, 2020
d653cbd
[Updated: getBaseImage() method updated for configurable product.]
vivek-webkul Apr 24, 2020
e2cdfba
Merge pull request #2935 from vivek-webkul/patch-42
jitendra-webkul Apr 24, 2020
aababbf
Merge pull request #2934 from Haendlerbund/add-booking-product-templa…
jitendra-webkul Apr 27, 2020
4115a3a
Merge pull request #2932 from shubhwebkul/master
jitendra-webkul Apr 27, 2020
30061b8
Merge pull request #2924 from cagartner/added_new_events_to_core
jitendra-webkul Apr 27, 2020
8d82b19
Merge pull request #2777 from gfd6th/master
jitendra-webkul Apr 27, 2020
5794907
Cancel feature added in customer order
Apr 27, 2020
b3e18c0
Merge pull request #2946 from jitendra-webkul/1.0
jitendra-webkul Apr 27, 2020
0c48b0b
Installer fixes
rahulcs0082 Apr 27, 2020
0242a0c
resolved issue with product images carousel
shubh-mehrotra Apr 27, 2020
2a5c65b
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 27, 2020
653d99d
change file name from views to Views
rahulcs0082 Apr 27, 2020
8576c40
Merge pull request #2944 from rahulcs0082/development
jitendra-webkul Apr 27, 2020
b3b20a9
Auto exchange rate feature added
Apr 27, 2020
22b4079
Merge pull request #2952 from jitendra-webkul/1.0
jitendra-webkul Apr 27, 2020
837c5d4
fix category issue and change country,state order
rahulcs0082 Apr 28, 2020
0e4a5e7
Merge pull request #2947 from shubhwebkul/master
jitendra-webkul Apr 28, 2020
73ca29c
Merge pull request #2953 from rahulcs0082/development
jitendra-webkul Apr 28, 2020
abac3a2
max price issue in category
rahulcs0082 Apr 28, 2020
10b05e5
Merge pull request #2955 from rahulcs0082/development
jitendra-webkul Apr 28, 2020
10c31e2
Updated change log file
Apr 28, 2020
1d6b4e8
Updated change log file
Apr 28, 2020
cd8e994
fix translation in add attribute button
Namvarii Apr 28, 2020
559954e
Issue #2954 fixed
Apr 28, 2020
acafb44
Merge pull request #2957 from jitendra-webkul/1.0
jitendra-webkul Apr 28, 2020
790719f
Merge pull request #2956 from namvarii/master
jitendra-webkul Apr 28, 2020
16fcb02
Removed unnecessary code from CartController
Apr 28, 2020
1a71604
Issue #2954 fixed
Apr 28, 2020
a8c969d
Merge pull request #2958 from jitendra-webkul/1.0
jitendra-webkul Apr 28, 2020
b5ebfe7
Issue #2945 fixed
Apr 28, 2020
209de7f
Updated change log file
Apr 28, 2020
be3fe03
Merge pull request #2959 from jitendra-webkul/1.0
jitendra-webkul Apr 28, 2020
f13ce73
Updated change log file
Apr 28, 2020
454d95d
Merge pull request #2960 from jitendra-webkul/1.0
jitendra-webkul Apr 28, 2020
3eff7c2
Version updated in env files
Apr 28, 2020
20e6378
Merge pull request #2930 from bagisto/dependabot/composer/symfony/htt…
jitendra-webkul Apr 28, 2020
c88ca31
Merge pull request #2961 from jitendra-webkul/1.0
jitendra-webkul Apr 28, 2020
d973ec9
add CartRuleCest
Apr 28, 2020
3154d27
introduce channel and customer group filter for cart rule grid
Apr 29, 2020
cbd873b
fix calulation helper in test
Apr 29, 2020
dd5a41f
Issue #2949 and #2950
rahulcs0082 Apr 29, 2020
5e1c0ac
resolve issue 2964
AnnikaWolff Apr 29, 2020
6118cab
localization error message added in velocity theme
rahulcs0082 Apr 29, 2020
ede46da
Merge branch 'master' into add_tests_for_cart_rules
SteffenMahler Apr 29, 2020
4899f90
Merge pull request #2963 from rahulcs0082/development
jitendra-webkul Apr 29, 2020
5d43e2b
type hint changed
Apr 29, 2020
214d7a8
merge branch 'add_tests_for_cart_rules' of https://github.com/Haendle…
Apr 29, 2020
da90ed3
refactoring, variable renamed
Apr 29, 2020
65f8946
Issue #2942
rahulcs0082 Apr 29, 2020
fee6645
Issue #2942
rahulcs0082 Apr 29, 2020
2729dc9
Merge branch 'master' of https://github.com/bagisto/bagisto into deve…
rahulcs0082 Apr 29, 2020
2753c7b
configuration added for favicon in admin
rahulcs0082 Apr 29, 2020
89174f0
Merge pull request #2967 from rahulcs0082/development
jitendra-webkul Apr 29, 2020
751d8b8
Merge pull request #2968 from rahulcs0082/development
jitendra-webkul Apr 29, 2020
40db94b
Issue #2969
rahulcs0082 Apr 29, 2020
eb65eee
Merge pull request #2970 from rahulcs0082/development
jitendra-webkul Apr 29, 2020
235b0e6
#2974
shubh-mehrotra Apr 30, 2020
9603bef
Merge branch 'master' of https://github.com/bagisto/bagisto
shubh-mehrotra Apr 30, 2020
584b2ae
favicon for admin login
rahulcs0082 Apr 30, 2020
68a1d16
fix randomly failing tax cest
May 1, 2020
bf2c109
merge bagisto master
May 1, 2020
3d2e49a
remove unnecessary use statements
May 1, 2020
1caa039
fix GuestCheckoutCest
May 1, 2020
ad4e517
remove newline
May 1, 2020
f163abe
Merge pull request #2965 from Haendlerbund/issue-2964/bugfix-api-exce…
jitendra-webkul May 1, 2020
b405ebf
Merge pull request #2977 from shubhwebkul/master
jitendra-webkul May 1, 2020
95f1903
set price faker in Laravel5Helper to 2 decimals, fix rounding in Cart…
May 1, 2020
24c076f
Merge pull request #2984 from Haendlerbund/fix-GuestCheckoutCest
jitendra-webkul May 1, 2020
0aaa1fd
Merge pull request #2983 from Haendlerbund/fix-randomly-failing-tax-cest
jitendra-webkul May 1, 2020
e6ed484
Merge pull request #2978 from rahulcs0082/development
jitendra-webkul May 1, 2020
7639dfb
Merge pull request #2962 from Haendlerbund/channel-filter-for-cart-ru…
jitendra-webkul May 1, 2020
7f3e564
Merge pull request #2966 from Haendlerbund/add_tests_for_cart_rules
jitendra-webkul May 1, 2020
e31db32
Added missing space for configurable/grouped product price.
MattApril May 4, 2020
d2842a5
responsive product gallery issue resolved
shubh-mehrotra May 5, 2020
af3b152
Issue #2987
rahulcs0082 May 6, 2020
83cb0ff
Issue #2987
rahulcs0082 May 6, 2020
b42ccbf
Merge pull request #3008 from rahulcs0082/development
jitendra-webkul May 6, 2020
95caad1
Product multiple image select feature added
May 6, 2020
adaeaf7
Merge pull request #3010 from jitendra-webkul/1.0
jitendra-webkul May 6, 2020
2a9c3de
Order comment feature added
May 6, 2020
91661dc
Merge pull request #3006 from shubhwebkul/master
jitendra-webkul May 6, 2020
45e6168
Merge pull request #3013 from jitendra-webkul/1.0
jitendra-webkul May 6, 2020
f446f1d
process checkout if user not logged in
shubh-mehrotra May 7, 2020
4b31626
Merge pull request #2998 from MattApril/product_price_spacing_fix
jitendra-webkul May 7, 2020
0893513
Order comment email sent to customer
May 7, 2020
ad306f7
Merge pull request #3017 from jitendra-webkul/1.0
jitendra-webkul May 7, 2020
071fc16
Merge pull request #3016 from shubhwebkul/master
jitendra-webkul May 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .env.example
@@ -1,6 +1,6 @@
APP_NAME=Bagisto
APP_ENV=local
APP_VERSION=1.0.0
APP_VERSION=1.1.2
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
Expand Down
2 changes: 1 addition & 1 deletion .env.testing
@@ -1,6 +1,6 @@
APP_NAME=Laravel
APP_ENV=local
APP_VERSION=1.0.0
APP_VERSION=1.1.2
APP_KEY=base64:G4KY3tUsTaY9ONo1n/QyJvVLQZdJDgbIkSJswFK01HE=
APP_DEBUG=true
APP_URL=http://localhost
Expand Down