Skip to content

2.3 develop #1

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.

Sign up for GitHub

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

Merged
merged 1,187 commits into from
Jan 4, 2018
Merged

2.3 develop #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1187 commits
Select commit Hold shift + click to select a range
e2461d5
MAGETWO-42156: Widgets in WYSIWYG
kieuphan2406 Dec 5, 2017
f7a617b
MAGETWO-84976: Variable is inserted into wrong editor when editing st…
irenelagno Dec 5, 2017
776e5d5
MAGETWO-85056: Fix magentovariable/editor_plugin.js for both versions…
irenelagno Dec 5, 2017
065b490
MAGETWO-85010: Variables display incorrect after switching between wy…
rganin Dec 6, 2017
ac9e356
MAGETWO-85010: Variables display incorrect after switching between wy…
rganin Dec 6, 2017
b3930cf
MAGETWO-85010: Variables display incorrect after switching between wy…
rganin Dec 6, 2017
b9382ab
MAGETWO-85056: Fix magentovariable/editor_plugin.js for both versions…
irenelagno Dec 5, 2017
488aa14
MAGETWO-85147: Insert Variable icon doesn't get selected when user cl…
rganin Dec 7, 2017
e4ac2ac
MAGETWO-81532: Support for Registered Customers
cpartica Dec 12, 2017
bd0126d
MAGETWO-85116: Build stabilization
irenelagno Dec 6, 2017
d203195
MAGETWO-85116: Build stabilization
irenelagno Dec 6, 2017
7b64f8e
MAGETWO-85116: Build stabilization:
irenelagno Dec 6, 2017
804284a
MAGETWO-85147: Insert Variable icon doesn't get selected when user cl…
rganin Dec 7, 2017
c49e8bc
MAGETWO-85147: Insert Variable icon doesn't get selected when user cl…
rganin Dec 7, 2017
3574acd
MAGETWO-85116: Build stabilization
irenelagno Dec 7, 2017
944cfa6
MAGETWO-85191: Variable table grid doesn't show custom variable
rganin Dec 7, 2017
9db1df8
MAGETWO-85191: Variable table grid doesn't show custom variable
rganin Dec 7, 2017
5a8e62e
MAGETWO-85116: Build stabilization
irenelagno Dec 7, 2017
9df695c
MAGETWO-85116: Build stabilization
irenelagno Dec 7, 2017
882c813
MAGETWO-85203: Variable creation opens an edit mode
irenelagno Dec 7, 2017
77d5c0b
MAGETWO-85195: Fix Sample Data tests failures
rganin Dec 8, 2017
3f25ea5
MAGETWO-85199: Build Stabilization
rganin Dec 8, 2017
d729367
MAGETWO-85057: Unable to save new changes for widget type of Order By…
danmooney2 Dec 5, 2017
091b8bc
MAGETWO-85068: Unable to use "Show/Hide Editor" button on Product Des…
danmooney2 Dec 6, 2017
348ba84
MAGETWO-85199: Build Stabilization
giabmf11 Dec 7, 2017
a7497d5
MAGETWO-85199: Build stabilization
giabmf11 Dec 8, 2017
96e5c24
MAGETWO-85199: Build Stabilization
giabmf11 Dec 8, 2017
2f407b0
MAGETWO-85199: Build Stabilization
giabmf11 Dec 8, 2017
eecce66
MAGETWO-85199: Build Stabilization
giabmf11 Dec 8, 2017
01882f2
MAGETWO-85195: Fix Sample Data tests failures
rganin Dec 8, 2017
0bad2d1
MAGETWO-85199: Branch Stabilization
giabmf11 Dec 8, 2017
13dd216
MAGETWO-85131: Unable to sort variable by Variable Name
rganin Dec 8, 2017
c1332b6
MAGETWO-85131: Unable to sort variable by Variable Name
rganin Dec 8, 2017
03a74bb
MAGETWO-85131: Unable to sort variable by Variable Name
rganin Dec 8, 2017
aaf3517
MAGETWO-85131: Unable to sort variable by Variable Name
rganin Dec 8, 2017
72c92c1
MAGETWO-85237: Unable to insert variable from textarea mode
rganin Dec 8, 2017
9fba2dd
MAGETWO-85239: Remove "Delete" button from Edit variable slide out
irenelagno Dec 8, 2017
c03ab74
MAGETWO-85259: Unable to apply variable filter by Variable Type
irenelagno Dec 8, 2017
42e8abc
MAGETWO-85243: Variable placeholder displays deleted mode after inser…
rganin Dec 11, 2017
d7545f0
MAGETWO-85246: Custom variable displays variable code on Editor mode …
rganin Dec 11, 2017
5b3e6ad
MAGETWO-85116: Builds stabilization
rganin Dec 8, 2017
2aab43b
MAGETWO-85116: Build stabilization
irenelagno Dec 8, 2017
b34a3ce
MAGETWO-85116: Build stabilization
rganin Dec 11, 2017
1630115
MAGETWO-85239: Remove "Delete" button from Edit variable slide out
irenelagno Dec 8, 2017
e1692a8
MAGETWO-85116: Build stabilization
irenelagno Dec 11, 2017
fe70ee1
MAGETWO-85116: Build stabilization
irenelagno Dec 11, 2017
0573631
MAGETWO-84625: Branch stabilization
irenelagno Dec 12, 2017
9ae0cbd
Merge remote-tracking branch 'remotes/origin/MAGETWO-81532-Support-fo…
Dec 12, 2017
e15470b
MAGETWO-85001: Newsletter Create Toolbar Buttons Are Unresponsive
danmooney2 Dec 5, 2017
86b9c33
MAGETWO-85064: Migrate over incompatible WYSIWYG API interfaces to ad…
danmooney2 Dec 11, 2017
bd8774f
MAGETWO-85064: Migrate over incompatible WYSIWYG API interfaces to ad…
danmooney2 Dec 11, 2017
461012a
MAGETWO-85064: Migrate over incompatible WYSIWYG API interfaces to ad…
danmooney2 Dec 11, 2017
3c116f9
MAGETWO-85064: Migrate over incompatible WYSIWYG API interfaces to ad…
danmooney2 Dec 11, 2017
3dc489f
MAGETWO-84625: Branch stabilization
irenelagno Dec 12, 2017
49f843c
MAGETWO-84625: Branch stabilization
irenelagno Dec 12, 2017
7c304b9
MAGETWO-83425: Unify product GraphQL APIs
Dec 12, 2017
0875fa5
MAGETWO-81532: Support for Registered Customers
cpartica Dec 12, 2017
8b40e77
MAGETWO-83425: Unify product GraphQL APIs
Dec 12, 2017
0e5c72f
MAGETWO-85259: Unable to apply variable filter by Variable Type
rganin Dec 12, 2017
bda0993
MAGETWO-85515: Variable placeholder doesn't display in the same place…
rganin Dec 12, 2017
62b6580
MAGETWO-85515: Variable placeholder doesn't display in the same place…
rganin Dec 12, 2017
98e2797
MAGETWO-82674: Fix full text search criteria filter group override
Dec 12, 2017
034d702
MAGETWO-85521: Variable page title should be uppercase at each first …
rganin Dec 12, 2017
257764e
Merge remote-tracking branch 'remotes/origin/MAGETWO-81532-Support-fo…
Dec 12, 2017
7dab295
MAGETWO-85557: Layout of variable placeholder should be matched with …
danmooney2 Dec 12, 2017
9c6c7f2
MAGETWO-85240: Inform message of missing variable is not displayed on…
rganin Dec 11, 2017
6b14cb1
MAGETWO-85240: Inform message of missing variable is not displayed on…
irenelagno Dec 12, 2017
b2b4236
MAGETWO-84983: Select last uploaded image in Media Gallery
krissyhiserote Dec 4, 2017
4397948
MAGETWO-82674: GraphQL Full Text Search
Dec 12, 2017
2072aa0
MAGETWO-83675: Create [Add Variable ] functional testing using MFTF
kieuphan2406 Dec 12, 2017
003198c
MAGETWO-81799: Media Gallery Image URL is not displayed correctly in …
krissyhiserote Nov 20, 2017
73b9007
fixed unit test for checkout configprovider
Dec 12, 2017
777a5df
MAGETWO-82674: GraphQL Full Text Search
Dec 12, 2017
716065b
MAGETWO-84625: Branch stabilization
irenelagno Dec 12, 2017
a4b1b5f
MAGETWO-82674: GraphQL Full Text Search
Dec 12, 2017
ced16a2
MAGETWO-82674: GraphQL Full Text Search
Dec 12, 2017
c2c4ecf
MAGETWO-81532: Support for Registered customers
dthampy Dec 12, 2017
159bcbc
Merge remote-tracking branch 'remotes/origin/MAGETWO-81532-Support-fo…
Dec 12, 2017
3fb4c82
Fix re saving product attribute
raumatbel Oct 21, 2017
eeed63e
Merge pull request #1837 from magento-engcom/develop-prs
ishakhsuvarov Dec 12, 2017
8cf7aa2
MAGETWO-84811: [Backport 2.3-develop] Update wrong layout update xml …
dmanners Dec 13, 2017
e181339
Add --no-update option to sampledata:deploy and remove commands
schmengler Nov 20, 2017
9516978
Fixes #12660 invalid parameter configuration provided for argument
Tomasz-Silpion Dec 13, 2017
af80bf2
MAGETWO-85584: Add --no-update option to sampledata:deploy and remove…
dmanners Dec 13, 2017
ac1eb6d
magento/magento2#12378: Regions list in Directory module for India
p-bystritsky Dec 13, 2017
5019b52
MAGETWO-85587: [2.3-develop] Fixes #12660 invalid parameter configura…
Dec 13, 2017
92cc98e
MAGETWO-85588: [forwarded from 2.2] magento/magento2#12378: Regions l…
ishakhsuvarov Dec 13, 2017
8116880
MAGETWO-85581: Enable metrics validation and run benchmark in multith…
slopukhov Dec 13, 2017
a41dbed
MAGETWO-85584: Add --no-update option to sampledata:deploy and remove…
Dec 13, 2017
6692b5f
MAGETWO-85539: fix adminhtml file attribute edit form #11267
Dec 13, 2017
622f27e
MAGETWO-81799: Media Gallery Image URL is not displayed correctly in …
krissyhiserote Dec 13, 2017
34c45c3
Merge pull request #1846 from magento-engcom/develop-prs
ishakhsuvarov Dec 13, 2017
20ca688
MAGETWO-82674: GraphQL Full Text Search
dthampy Dec 13, 2017
fa2ed36
MAGETWO-85557: Layout of variable placeholder should be matched with …
danmooney2 Dec 13, 2017
5cad5b5
MAGETWO-85557: Layout of variable placeholder should be matched with …
danmooney2 Dec 13, 2017
5a04985
MAGETWO-85515: Variable placeholder doesn't display in the same place…
rganin Dec 13, 2017
ff0e6f4
MAGETWO-85600: CSS of other elements in WYSIWYG are modifying styles …
danmooney2 Dec 13, 2017
2066494
MAGETWO-85515: Variable placeholder doesn't display in the same place…
rganin Dec 13, 2017
6efe9bb
Merge branch 'trigger-delivery' of github.com:magento-trigger/magento…
rganin Dec 13, 2017
a7e9bb9
Add message when not logged in for adding products to wishlist
Dec 13, 2017
af5a96f
Add message when not logged in for adding products to wishlist
Dec 13, 2017
326a2a8
Merge branch 'wishlist_add_message' of github.com:PieterCappelle/mage…
Dec 13, 2017
5423adc
Merge branch 'wishlist_add_message' of github.com:PieterCappelle/mage…
Dec 13, 2017
5cb9315
Merge branch 'wishlist_add_message' of github.com:PieterCappelle/mage…
Dec 13, 2017
2d5de75
MAGETWO-85240: Inform message of missing variable is not displayed on…
irenelagno Dec 13, 2017
c304562
MAGETWO-82674: GraphQL Full Text Search
Dec 13, 2017
90a6340
MAGETWO-84976: Variable is inserted into wrong editor when editing st…
irenelagno Dec 13, 2017
ad33ac2
MAGETWO-82674: GraphQL Full Text Search
Dec 13, 2017
5c5710c
MAGETWO-85563: Unable to add image into WYSIWYG content area
danmooney2 Dec 13, 2017
b527e47
Merge remote-tracking branch 'trigger/trigger-delivery' into MAGETWO-…
krissyhiserote Dec 13, 2017
a971049
MAGETWO-81532: Support for Registered Customers
cpartica Dec 13, 2017
7cfb1b4
Merge remote-tracking branch 'trigger/trigger-delivery' into MAGETWO-…
krissyhiserote Dec 13, 2017
77ef04e
Merge remote-tracking branch 'remotes/origin/MAGETWO-81532-Support-fo…
Dec 13, 2017
92c9fcc
MAGETWO-84625: Branch stabilization
irenelagno Dec 13, 2017
d8512d7
Merge branch 'MAGETWO-81799' into trigger-delivery
krissyhiserote Dec 13, 2017
2060ae4
MAGETWO-84811: [Backport 2.3-develop] Update wrong layout update xml …
ishakhsuvarov Dec 13, 2017
cea1437
Merge pull request #1849 from magento-engcom/develop-prs
ishakhsuvarov Dec 14, 2017
bbf865f
updated code following code review & backward compatible development …
Dec 14, 2017
71d1dfe
updated code following code review & backward compatible development …
Dec 14, 2017
9121318
fixed code styles
Dec 14, 2017
d511c3b
Fix issues
Dec 14, 2017
1313861
add nullable in comment & code cleanup
Dec 14, 2017
2025035
code cleanup
Dec 14, 2017
54028e1
MAGETWO-84625: Branch stabilization
rganin Dec 14, 2017
569313d
MAGETWO-84625: Branch stabilization
rganin Dec 14, 2017
b633e8b
Merge branch 'develop' of github.com:magento/magento2ce into trigger-…
rganin Dec 14, 2017
9901f35
MAGETWO-85627: Add error message if not logged in for adding products…
ishakhsuvarov Dec 14, 2017
7e406fc
MAGETWO-85627: Merge branch 'develop' of github.com:magento/magento2c…
ishakhsuvarov Dec 14, 2017
d6a25b9
MAGETWO-85588: [forwarded from 2.2] magento/magento2#12378: Regions l…
ishakhsuvarov Dec 14, 2017
ce9c708
MAGETWO-85587: [2.3-develop] Fixes #12660 invalid parameter configura…
ishakhsuvarov Dec 14, 2017
57db07c
Merge branch '2.3-develop' of github.com:magento/magento2 into quisse…
omiroshnichenko Dec 14, 2017
334089a
MAGETWO-85673: [2.3-develop] Add customer login url from Customer Url…
omiroshnichenko Dec 14, 2017
89fd5dc
MAGETWO-82674: GraphQL Full Text Search
dthampy Dec 14, 2017
8434460
Merge branch 'main_develop' into trigger-delivery
irenelagno Dec 14, 2017
169b3eb
Merge pull request #1852 from magento-engcom/develop-prs
Dec 14, 2017
81159f6
MAGETWO-85695: Re saving product attribute [backport] #11619
orlangur Dec 14, 2017
9272091
MAGETWO-85581: Enable metrics validation and run benchmark in multith…
slopukhov Dec 15, 2017
5943f27
Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-…
slopukhov Dec 15, 2017
a718bb6
MAGETWO-85581: Enable metrics validation and run benchmark in multith…
slopukhov Dec 15, 2017
ca2663a
MAGETWO-85709: Magento health index fails on composer's tinymce3 modu…
rganin Dec 15, 2017
cb0efb3
MAGETWO-85581: Enable metrics validation and run benchmark in multith…
slopukhov Dec 15, 2017
3cdfe08
Merge branch 'trigger-delivery' of github.com:magento-trigger/magento…
rganin Dec 15, 2017
2233d57
Merge remote-tracking branch 'mainline/develop' into MAGETWO-82674-Fu…
cpartica Dec 15, 2017
a4c3fa6
MAGETWO-83675: Create [Add Variable ] functional testing using MFTF
kieuphan2406 Dec 15, 2017
1046ccd
MAGETWO-85676: Fix Magento\Company\Test\TestCase\CheckMenuTest.test
krissyhiserote Dec 15, 2017
9f568c5
MAGETWO-81532: Support for Registered Customers
cpartica Dec 15, 2017
964a1ae
Merge branch 'MAGETWO-81532-Support-for-registered-customers' into MA…
cpartica Dec 15, 2017
e863326
MAGETWO-84984: Create [Select Uploaded Image] functional testing usin…
kieuphan2406 Dec 15, 2017
e53ab4b
MAGETWO-84984: Create [Select Uploaded Image] functional testing usin…
kieuphan2406 Dec 15, 2017
26fb7a8
MAGETWO-82674: GraphQL Full Text Search
Dec 15, 2017
ddbb960
Merge remote-tracking branch 'remotes/origin/MAGETWO-82674-Full-Text-…
Dec 15, 2017
7a29eda
MAGETWO-85677: Fix Magento\Cms\Test\TestCase\CreateCmsPageEntityTest.…
irenelagno Dec 15, 2017
2547183
Merge branch 'trigger-delivery' of github.com:magento-trigger/magento…
kieuphan2406 Dec 15, 2017
520740d
MAGETWO-82674: GraphQL Full Text Search
Dec 18, 2017
16da117
MAGETWO-82674: GraphQL Full Text Search
Dec 18, 2017
a5d0ce6
MAGETWO-82674: GraphQL Full Text Search
Dec 18, 2017
c00ff32
MAGETWO-82674: GraphQL Full Text Search
Dec 18, 2017
9c5fc73
Merge branch 'develop' of github.com:magento/magento2ce into trigger-…
rganin Dec 18, 2017
1a26592
MAGETWO-85709: Magento health index fails on composer's tinymce3 modu…
rganin Dec 18, 2017
092a870
Merge remote-tracking branch 'trigger/MAGETWO-85709' into trigger-del…
rganin Dec 18, 2017
338fefd
MAGETWO-85709: Magento health index fails on composer's tinymce3 modu…
rganin Dec 18, 2017
5cce625
Add Current Date to update_time Field Block and Page
osrecio Dec 14, 2017
5017fda
Merge pull request #1857 from magento-performance/MAGETWO-85581
vzabaznov Dec 18, 2017
a5c7739
Merge branch 'main_develop' into trigger-delivery1
irenelagno Dec 18, 2017
a71ee59
Merge remote-tracking branch 'trigger/trigger-delivery-taf' into trig…
irenelagno Dec 18, 2017
56b1579
MAGETWO-85557: Layout of variable placeholder should be matched with …
danmooney2 Dec 18, 2017
9569a40
MAGETWO-82674: GraphQL Full Text Search
Dec 18, 2017
8f75756
Merge remote-tracking branch 'remotes/origin/develop' into MAGETWO-82…
Dec 18, 2017
ab2af68
MAGETWO-82674: GraphQL Full Text Search
Dec 18, 2017
9181582
MAGETWO-83266: Prohibit global variables and output buffering with Co…
Dec 18, 2017
280461a
MAGETWO-85662: [Backport 2.3] #12625: Add Current Date to update_time…
Dec 19, 2017
c442505
Update validate_image_info_rollback.php
harrymt Dec 19, 2017
9954f1d
MAGETWO-85817: Update testsuite validate_image_info_rollback.php #12800
dmanners Dec 19, 2017
f18839b
MAGETWO-85695: Re saving product attribute [backport] #11619
Dec 19, 2017
56b8855
MAGETWO-85627: Add error message if not logged in for adding products…
Dec 19, 2017
c7671c1
MAGETWO-85817: Update testsuite validate_image_info_rollback.php #12800
Dec 19, 2017
174df28
Update checkout controller account create to stop using the object ma…
dmanners Dec 19, 2017
32bc645
Update app/code/Magento/Checkout/Controller/Account/Create.php to use…
dmanners Dec 19, 2017
b15e590
Update the create unit tests to use the result factory instead of obj…
dmanners Dec 19, 2017
02ff653
Refactor the unit test for the create account controller to remove th…
dmanners Dec 19, 2017
ba21d1f
MAGETWO-81532: Support for Registered Customers
cpartica Dec 19, 2017
16d2036
Merge pull request #1861 from magento-engcom/develop-prs
Dec 19, 2017
af12b58
Merge remote-tracking branch 'mainline/develop' into MAGETWO-82674-Fu…
cpartica Dec 19, 2017
1ac5537
MAGETWO-85830: Wong tooltip
rganin Dec 19, 2017
d2f1d56
MAGETWO-85673: [2.3-develop] Add customer login url from Customer Url…
Dec 19, 2017
48acb90
MAGETWO-85662: [Backport 2.3] #12625: Add Current Date to update_time…
Dec 19, 2017
894395c
MAGETWO-81532: Support for Registered Customers
cpartica Dec 19, 2017
db05cfb
merge magento/develop into magento-trigger/trigger-delivery
Dec 19, 2017
9a5b0c7
MAGETWO-85600: CSS of other elements in WYSIWYG are modifying styles …
irenelagno Dec 19, 2017
34f1dd9
MAGETWO-83266: Prohibit global variables and output buffering with Co…
Dec 19, 2017
cf85308
Merge pull request #1859 from magento-honey-badgers/MAGETWO-82674-Ful…
cpartica Dec 19, 2017
f369824
[EngCom] Public Pull Requests - develop
magento-team Dec 19, 2017
9f18538
Merge branch 'develop' of github.com:magento/magento2ce into trigger-…
rganin Dec 20, 2017
fc97826
Merge pull request #1864 from magento-engcom/develop-prs
Dec 20, 2017
ecb2179
Merge branch 'develop' of github.com:magento/magento2ce into trigger-…
rganin Dec 20, 2017
9b50b19
Merge pull request #1869 from magento-borg/MAGETWO-85893-2.3-develop-…
pdohogne-magento Dec 20, 2017
2c25cdd
merge magento/2.3-develop into magento-trigger/trigger-delivery
Dec 20, 2017
43d6ee8
Update CreateTest so that the resultJson variable fits in one line
dmanners Dec 21, 2017
cf20e56
MAGETWO-85890: Update checkout controller json usage #12806
mzeis Dec 21, 2017
d1db80f
Merge branch '2.3-develop' of github.com:magento/magento2ce into trig…
rganin Dec 21, 2017
01b1d64
Merge branch 'trigger-delivery' of github.com:magento-trigger/magento…
rganin Dec 21, 2017
364c8a5
functional.suite.dist.yml: use the value provided by the .env file fo…
scribam Dec 21, 2017
9c2ce25
Merge pull request #1863 from magento-trigger/trigger-delivery
rganin Dec 22, 2017
4587233
MAGETWO-85958: Fix #2156 Js\Dataprovider uses the RendererInterface. …
Dec 22, 2017
189f40e
merge magento/2.3-develop into magento-honey-badgers/MAGETWO-83266-Sn…
Dec 22, 2017
389bae2
MAGETWO-83266: Prohibit global variables and output buffering with Co…
Dec 22, 2017
2c0a91c
Merge pull request #1879 from magento-honey-badgers/MAGETWO-83266-Sniffs
buskamuza Dec 23, 2017
8cdf043
Fix import from external jpeg images
Dec 24, 2017
31e55f0
MAGETWO-85993: Update functional.suite.dist.yml to handle a custom ba…
ishakhsuvarov Dec 26, 2017
1b9f69a
MAGETWO-85993: Update functional.suite.dist.yml to handle a custom ba…
Dec 26, 2017
a107dbf
MAGETWO-85958: Fix #2156 Js\Dataprovider uses the RendererInterface. …
Dec 26, 2017
9a027d5
MAGETWO-85890: Update checkout controller json usage #12806
Dec 26, 2017
71e57a6
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
Dec 26, 2017
d3656ae
Remove unused if statement in order invoice save
Dec 27, 2017
a2aa34d
MAGETWO-86036: [Port 2.3-develop] Remove unused if statement in order…
ishakhsuvarov Dec 27, 2017
3e6aa28
MAGETWO-86014: GraphQL magento-catalog dependency version fix
pdohogne-magento Dec 26, 2017
0d27287
Add product ID and SKU to wishlist customer data
Dec 27, 2017
b2894e4
MAGETWO-86036: [Port 2.3-develop] Remove unused if statement in order…
Dec 28, 2017
bce891d
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
Dec 28, 2017
58990ce
MAGETWO-86101: Add product ID and SKU to wishlist customer data #12896
mzeis Dec 28, 2017
f3409be
Updated Incorrect product codes in DHL module.
Dec 28, 2017
d6890cb
MAGETWO-86177: [Backport #12666 into 2.3-develop] Fix incorrect DHL P…
miguelbalparda Dec 29, 2017
ed0a849
Merge pull request #1892 from magento-borg/MAGETWO-86014-GraphQl-Depe…
slavvka Dec 29, 2017
53292d3
Use of parse_url PHP_URL_PATH variable.
Dec 30, 2017
a0e5d1d
MAGETWO-86221: Fix import from external jpeg images #12872
dmanners Jan 2, 2018
9037878
MAGETWO-86177: [Backport #12666 into 2.3-develop] Fix incorrect DHL P…
ishakhsuvarov Jan 2, 2018
4870115
MAGETWO-86101: Add product ID and SKU to wishlist customer data #12896
ishakhsuvarov Jan 2, 2018
8580f45
MAGETWO-85179: Naming collision in Javascript ui registry (backend) #…
VladimirZaets Jan 2, 2018
8a11d76
MAGETWO-86233: Naming collision in Javascript ui registry (backend) #…
ishakhsuvarov Jan 2, 2018
a77f6c2
Respect "Learn More Link" in Recently Viewed Products widget options
Jan 2, 2018
702f464
MAGETWO-86251: [Port 2.3-develop] Respect 'Learn More Link' in Recent…
dmanners Jan 2, 2018
c49c52a
Fix #10682: Meta description and keywords transform to html entities
dverkade Oct 27, 2017
68389d6
Resolved issue #9243:
dverkade Oct 7, 2017
8cb5b9c
Fix #11236:
dverkade Oct 11, 2017
9749465
Changed typo where a string to be translated used double space "confi…
dverkade Oct 19, 2017
d66848e
MAGETWO-86275: [Backport to 2.3-develop] Fixed double space typo #12961
dmanners Jan 3, 2018
6f7e01a
MAGETWO-86276: [Backport to 2.3-develop] Fix #11236: Web Setup Wizard…
dmanners Jan 3, 2018
ccf68bb
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-team Jan 3, 2018
1d44256
MAGETWO-86283: [Backport to 2.3-develop] Fix #10682: Meta description…
dmanners Jan 3, 2018
b52c802
MAGETWO-86275: [Backport to 2.3-develop] Fixed double space typo #12961
ishakhsuvarov Jan 3, 2018
6ad1d01
MAGETWO-86221: Fix import from external jpeg images #12872
ishakhsuvarov Jan 3, 2018
5dc38df
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-team Jan 3, 2018
779b4bd
MAGETWO-86283: [Backport to 2.3-develop] Fix #10682: Meta description…
ishakhsuvarov Jan 3, 2018
be380e2
MAGETWO-86276: [Backport to 2.3-develop] Fix #11236: Web Setup Wizard…
ishakhsuvarov Jan 3, 2018
3a0de7a
MAGETWO-86251: [Port 2.3-develop] Respect "Learn More Link" in Recent…
ishakhsuvarov Jan 3, 2018
16184f8
MAGETWO-86299: [Backport to 2.3-develop] Fix #9243 - Upgrade ZF compo…
ishakhsuvarov Jan 3, 2018
8d9dc65
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-team Jan 3, 2018
73b9e76
MAGETWO-86299: [Backport to 2.3-develop] Fix #9243 - Upgrade ZF compo…
ishakhsuvarov Jan 3, 2018
cc67343
MAGETWO-86233: Naming collision in Javascript ui registry (backend) #…
ishakhsuvarov Jan 3, 2018
911f460
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-team Jan 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions .github/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
Order deny,allow
Deny from all
<IfVersion < 2.4>
Order deny,allow
Deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ atlassian*
/.php_cs.cache
/grunt-config.json
/dev/tools/grunt/configs/local-themes.js

/pub/media/*.*
!/pub/media/.htaccess
/pub/media/attribute/*
Expand Down
157 changes: 121 additions & 36 deletions .htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
############################################
## adjust memory limit

php_value memory_limit 768M
php_value memory_limit 756M
php_value max_execution_time 18000

############################################
Expand All @@ -59,7 +59,7 @@
############################################
## adjust memory limit

php_value memory_limit 768M
php_value memory_limit 756M
php_value max_execution_time 18000

############################################
Expand Down Expand Up @@ -203,72 +203,157 @@
RedirectMatch 403 /\.git

<Files composer.json>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files composer.lock>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .gitignore>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .htaccess>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .htaccess.sample>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .php_cs.dist>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .travis.yml>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files CHANGELOG.md>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files COPYING.txt>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files Gruntfile.js>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files LICENSE.txt>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files LICENSE_AFL.txt>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files nginx.conf.sample>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files package.json>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files php.ini.sample>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files README.md>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files magento_umask>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>

# For 404s and 403s that aren't handled by the application, show plain 404 response
Expand Down
Loading