Skip to content

Fix #10764: delete url rewrites for products after an attribute set is deleted #11391

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

Closed
wants to merge 1,155 commits into from
Closed

Fix #10764: delete url rewrites for products after an attribute set is deleted #11391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1155 commits
Select commit Hold shift + click to select a range
a453689
MAGETWO-83547: update button.phtml overcomplicated translation phrase…
Nov 10, 2017
a7aa1e0
MAGETWO-83490: Cleanup for object manager references and depricated m…
Nov 10, 2017
f8144da
MAGETWO-83310: Fix bug: Customer import deletes exiting customer enti…
Nov 10, 2017
123dd85
MAGETWO-82292: close #10810 Migrates Apache Access Syntax to 2.4 on A…
Nov 10, 2017
04a9ba8
MAGETWO-83495: After logging in customer is now not redirecting to Cu…
Nov 10, 2017
0d6b36b
Merge pull request #1702 from magento-partners/prs-2.2-2017-11-10
Nov 10, 2017
1d2cbdc
Merge pull request #1704 from magento-engcom/2.2-develop-prs
Nov 10, 2017
3cc4070
MAGETWO-83184: Static Content Update for ReleaseNotification Module
Nov 10, 2017
d3f0ff2
MAGETWO-83495: After logging in customer is now not redirecting to Cu…
Nov 10, 2017
24de9b0
MAGETWO-83184: Static Content Update for ReleaseNotification Module
Nov 10, 2017
9ae097a
MAGETWO-83184: Static Content Update for ReleaseNotification Module
Nov 10, 2017
44d2562
Merge pull request #1705 from magento-engcom/2.2-develop-prs
Nov 11, 2017
149268c
Update the fixture and tests to reflect the functionality of getShipp…
andrew-garside-temando Nov 12, 2017
a5d84a7
Merge remote-tracking branch 'upstream/2.2-develop' into MAGETWO-8318…
Nov 12, 2017
00559ae
MAGETWO-72138: Upgrade outdated libraries w/composer (minor versions)…
Nov 13, 2017
4b57470
Merge branch '2.2-develop' of https://github.com/magento-qwerty/magen…
Nov 13, 2017
061229b
MAGETWO-70726: [GITHUB] [2.1] Store View Language switch leads to 404…
Nov 13, 2017
7750efe
Merge pull request #1701 from magento-plankton/bugfixes
Nov 13, 2017
c7d0eff
Merge remote-tracking branch 'mainline/2.2-develop' into PR_in_2.2
Nov 13, 2017
80e31b9
MAGETWO-83740: Even existing credit memos should be refundable if the…
ishakhsuvarov Nov 13, 2017
f293402
MAGETWO-83745: 11832: Create order (on Customer edit page) - not work…
dmanners Nov 13, 2017
0f5b693
Merge remote-tracking branch 'mainline/2.2-develop' into PR_in_2.2
Nov 13, 2017
2275b89
Merge pull request #1703 from magento-chaika/PR_in_2.2
Nov 13, 2017
b750e58
7691: address with saveInAddressBook 0 are still being added to the a…
RomaKis Nov 10, 2017
97390b3
MAGETWO-52974: Configurable product options not saved when editing - …
interio-zz Nov 13, 2017
e71416c
Merge branch 'MAGETWO-70726' into QwertyPR20171107
Nov 13, 2017
a96fced
Merge branch 'MAGETWO-52974-3' into QwertyPR20171107
Nov 13, 2017
119b564
MAGETWO-52974: Configurable product options not saved when editing - …
interio-zz Nov 13, 2017
f2bfdd9
11740: Sending emails from Admin in Multi-Store Environment defaults …
RomaKis Nov 13, 2017
b6764c8
Merge branch '2.2-develop' into 11740
RomaKis Nov 13, 2017
1605e86
Merge branch 'MAGETWO-52974-3' into QwertyPR20171107
Nov 13, 2017
b322718
11740: Sending emails from Admin in Multi-Store Environment defaults …
RomaKis Nov 13, 2017
ad59055
Merge remote-tracking branch 'upstream/2.2-develop' into MAGETWO-8318…
Nov 13, 2017
632ecfe
MAGETWO-83184: Static Content Update for ReleaseNotification Module
Nov 13, 2017
791a253
MAGETWO-83745: 11832: Create order (on Customer edit page) - not work…
Nov 13, 2017
b55f200
MAGETWO-83682: Fix js error when disable/enable wysiwyg editor #12141
Nov 13, 2017
24ce033
MAGETWO-83672: [Backport 2.2] MAGETWO-71697: Fix possible bug when sa…
Nov 13, 2017
e8cd40c
MAGETWO-83668: 8022: Uncaught Error: Call to a member function addIte…
Nov 13, 2017
8ba9837
MAGETWO-83627: 11532: Duplicate Simple Product Throws Error: Undefine…
Nov 13, 2017
8b4b70a
MAGETWO-83477: 10628: Color attribute swatches are not visible if sor…
Nov 13, 2017
2033c05
MAGETWO-83286: Fix newsletter subscriptions between stores #12035
Nov 13, 2017
e7c3cf0
MAGETWO-81161: Fix #10477 Check cart rule subselect conditions agains…
Nov 13, 2017
2ded6b2
MAGETWO-83184: Static Content Update for ReleaseNotification Module
Nov 13, 2017
ec8af46
Merge pull request #1709 from magento-qwerty/QwertyPR20171107
Nov 13, 2017
9dff3c4
Merge remote-tracking branch 'upstream/2.2-develop' into MAGETWO-8318…
Nov 13, 2017
4967544
Merge pull request #1710 from magento-arcticfoxes/MAGETWO-83184-relea…
Nov 13, 2017
a8e511e
[EngCom] Public Pull Requests - 2.2-develop \n\n - merged latest code…
magento-team Nov 13, 2017
f8a0433
MAGETWO-83780: 7691: address with saveInAddressBook 0 are still being…
Nov 13, 2017
d4e666f
Merge pull request #1711 from magento-engcom/2.2-develop-prs
Nov 13, 2017
dda946e
MAGETWO-83783: Shipping method fixtures not compatible with getShippi…
fooman Nov 14, 2017
1d341ef
use InvoiceInterface instead of Invoice model to check if an invoice …
Nov 14, 2017
7f6b560
Fixed php notice when invalid ui_component config is used
vovayatsyuk Nov 14, 2017
ef165a2
10128: New Orders not being saved to order grid
RomaKis Nov 14, 2017
f11c0db
Merge branch '2.2-develop' into 10128
RomaKis Nov 14, 2017
0d482ad
MAGETWO-83815: Fixed php notice when invalid ui_component config is u…
ishakhsuvarov Nov 14, 2017
60ae067
Backward compatible constructor updates
Nov 14, 2017
1ebcd7a
10128: New Orders not being saved to order grid
RomaKis Nov 14, 2017
2149833
Make new test class properties `private`
Nov 14, 2017
a933cf7
10128: New Orders not being saved to order grid
RomaKis Nov 14, 2017
7b6d50d
MAGETWO-80622: СheckCustomerTypeTest failure on FAT-EXT-B2B-UR
danielrenaud Nov 14, 2017
9d72569
MAGETWO-83780: 7691: address with saveInAddressBook 0 are still being…
Nov 14, 2017
f936604
Fix PHPDoc for uploadMediaFiles function in order to show $renameFileOff
Nov 14, 2017
2fab386
MAGETWO-83868: 11941: Invoice for products that use qty decimal round…
Nov 14, 2017
3ce246d
Fix PHPDoc typo on __construct method.
Nov 14, 2017
8f1aa87
Fix PHPDoc _saveProducts method to include throws
Nov 14, 2017
41a43c1
Remove deprecated gmDate function from _saveProducts() and _saveStock…
Nov 14, 2017
19de842
Fix PHPDoc for _saveValidatedBunches(). Return shall be declared as
Nov 14, 2017
dc22a82
Fine tuning: add use Magento\Framework\Exception\LocalizedException in
Nov 14, 2017
820c097
Fine tuning: add use Magento\Framework\Exception\LocalizedException in
Nov 14, 2017
22f54a4
Merge pull request #1719 from magento-engcom/2.2-develop-prs
Nov 15, 2017
dc31103
MAGETWO-83815: Fixed php notice when invalid ui_component config is u…
Nov 15, 2017
94422cb
Always use linkIds for category flat EAV indexing.
toddbc Nov 15, 2017
9f8c7d1
Merge pull request #1 from mediact/bugfix/remove-reference-container
cstergianos Nov 15, 2017
e18f1d2
Merge pull request #1720 from magento-engcom/2.2-develop-prs
ishakhsuvarov Nov 15, 2017
41e9ec0
magento/magento2#12083: Cannot import zero (0) value into custom attr…
p-bystritsky Nov 15, 2017
89d613c
magento/magento2#12083: Cannot import zero (0) value into custom attr…
p-bystritsky Nov 15, 2017
f2ba426
magento/magento2#11670: Merge branch '2.2-develop' of github.com:mage…
ishakhsuvarov Nov 15, 2017
53931cb
MAGETWO-83552: save invoice ID on credit memo when using API method s…
ishakhsuvarov Nov 15, 2017
631d547
MAGETWO-81841: Added CLI command to enable and disable the Profiler #…
Nov 15, 2017
97599f0
Merge remote-tracking branch 'origin/MAGETWO-80622' into PR2.2_20171115
slavvka Nov 15, 2017
0976cad
MAGETWO-81841: Added CLI command to enable and disable the Profiler #…
Nov 15, 2017
255fecc
Merge pull request #1726 from magento-engcom/2.2-develop-prs
Nov 15, 2017
a4774d5
MAGETWO-83957: magento/magento2#12083: Cannot import zero (0) value i…
Nov 16, 2017
c387cdc
MAGETWO-83958: Phpdoc improvements #12257
Nov 16, 2017
11649b7
MAGETWO-83958: Phpdoc improvements #12257
Nov 16, 2017
42fd99b
MAGETWO-83958: Phpdoc improvements #12257
Nov 16, 2017
addda42
Issue: 3596. Resolve Notice with undefined index 'value' while previe…
madonzy Nov 16, 2017
7ea830f
Merge pull request #1728 from magento-engcom/2.2-develop-prs
Nov 16, 2017
aef9714
MAGETWO-83959: Issue: 3596. Resolve Notice with undefined index 'valu…
Nov 16, 2017
ba47d85
9764: exception message is wrong and misleading in findAccessorMethod…
RomaKis Nov 15, 2017
0a76034
9764: exception message is wrong and misleading in findAccessorMethod…
RomaKis Nov 16, 2017
574f032
MAGETWO-75217: SKU parameter in capital letters on CSV ignored by dat…
Nov 16, 2017
251e7d6
Merge branch '2.2-develop' of https://github.com/magento-qwerty/magen…
Nov 16, 2017
6f4ab5f
Merge pull request #1724 from magento-borg/PR2.2_20171115
slavvka Nov 16, 2017
799199e
Fix errors when DOB field is visible. #12146
vovayatsyuk Nov 16, 2017
a796fe6
MAGETWO-75217: SKU parameter in capital letters on CSV ignored by dat…
Nov 16, 2017
78fbf4e
Merge branch '2.2-develop' of https://github.com/magento-qwerty/magen…
Nov 16, 2017
470c257
Handle empty or incorrect lines in a language CSV
Nov 16, 2017
b2c2ffa
MAGETWO-83959: Issue: 3596. Resolve Notice with undefined index 'valu…
ishakhsuvarov Nov 16, 2017
4d30c67
MAGETWO-83957: magento/magento2#12083: Cannot import zero (0) value i…
ishakhsuvarov Nov 16, 2017
17836e6
MAGETWO-83868: 11941: Invoice for products that use qty decimal round…
ishakhsuvarov Nov 16, 2017
24eee64
12261: Order confirmation email contains non functioning links #12261
RomaKis Nov 16, 2017
ec33cc5
12261: Order confirmation email contains non functioning links #12261
RomaKis Nov 16, 2017
4e9f118
MAGETWO-83999: 12261: Order confirmation email contains non functioni…
ishakhsuvarov Nov 16, 2017
6f70d06
MAGETWO-83993: Fixed a js bug where ui_component labels have the wron…
omiroshnichenko Nov 16, 2017
1d5adf9
MAGETWO-84003: 9764: exception message is wrong and misleading in fin…
osrecio Nov 16, 2017
8f52242
Merge branch '2.2-develop' of github.com:magento/magento2 into fix-ui…
omiroshnichenko Nov 16, 2017
36dfdca
Merge github.com:magento/magento2 into develop
Nov 16, 2017
5c02402
change robots.txt response content type to 'text/plain'
Nov 16, 2017
1d5208b
Merge pull request #1730 from magento-engcom/2.2-develop-prs
ishakhsuvarov Nov 16, 2017
dfefe0b
MAGETWO-84016: Fixed 'Non-numeric value' warning on account create/sa…
Nov 16, 2017
a6f226f
MAGETWO-84003: 9764: exception message is wrong and misleading in fin…
Nov 16, 2017
f2f94cf
Merge pull request #1733 from magento-engcom/2.2-develop-prs
Nov 16, 2017
38735ac
8003: Using System Value for Base Currency Results in Config Error.
nmalevanec Nov 10, 2017
b63ceb9
8003: Using System Value for Base Currency Results in Config Error.
nmalevanec Nov 13, 2017
3e0c785
8003: Using System Value for Base Currency Results in Config Error.
nmalevanec Nov 14, 2017
537cecb
MAGETWO-83329: 8003: Using System Value for Base Currency Results in …
dmanners Nov 17, 2017
ff42200
[BUGFIX] All option values were deleted if one was deleted earlier
bartlubbersen Nov 17, 2017
ffb7817
9684: No ACL set for integrations
RomaKis Nov 17, 2017
21d3153
MAGETWO-75217: SKU parameter in capital letters on CSV ignored by dat…
Nov 17, 2017
3c8d785
MAGETWO-84081: 9684: No ACL set for integrations #12332
dmanners Nov 17, 2017
51a22f7
Merge magento-partners/magento2ce#80.
Nov 17, 2017
d8f164e
Merge magento-partners/magento2ce#65.
Nov 17, 2017
f61aa38
Merge magento-partners/magento2ce#74.
Nov 17, 2017
2a83983
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-8340…
Nov 17, 2017
3d1d027
magento/magento2#12304: Merge branch '2.2-develop' of github.com:mage…
ishakhsuvarov Nov 17, 2017
723452c
magento/magento2#12304: Handle empty or incorrect lines in language CSV
ishakhsuvarov Nov 17, 2017
53ffa37
MAGETWO-83977: Handle empty or incorrect lines in a language CSV #12304
ishakhsuvarov Nov 17, 2017
2eada9c
magento/magento2#12310: Merge branch '2.2-develop' of github.com:mage…
ishakhsuvarov Nov 17, 2017
e9986c5
magento/magento2#12310: Fix robots.txt content type to 'text/plain'
ishakhsuvarov Nov 17, 2017
9e13988
MAGETWO-84006: Fix robots.txt content type to 'text/plain' #12310
ishakhsuvarov Nov 17, 2017
68ea0c5
MAGETWO-84098: Webshop throws an exception when sharing wishlist with…
ishakhsuvarov Nov 17, 2017
aa7da30
Stabilization magento-partners/magento2ce#83
Nov 17, 2017
cbf7a37
MAGETWO-84098: Webshop throws an exception when sharing wishlist with…
ishakhsuvarov Nov 18, 2017
e03892c
MAGETWO-84081: 9684: No ACL set for integrations #12332
ishakhsuvarov Nov 18, 2017
2c3cd64
MAGETWO-84006: Fix robots.txt content type to 'text/plain' #12310
ishakhsuvarov Nov 18, 2017
56e8d72
MAGETWO-83977: Handle empty or incorrect lines in a language CSV #12304
ishakhsuvarov Nov 18, 2017
b05a957
Merge pull request #1734 from magento-engcom/2.2-develop-prs
ishakhsuvarov Nov 18, 2017
b510857
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-8340…
Nov 20, 2017
2f0898a
Potential error on order edit page when address has extension attributes
YevSent Oct 26, 2017
8e8b0b3
MAGETWO-82577: [Backport 2.2] Translate order getCreatedAtFormatted()…
dmanners Nov 20, 2017
bd9054a
magento/magento2#11691: Wrong return type for getAttributeText($attri…
p-bystritsky Nov 20, 2017
069282b
MAGETWO-83410: Fix #10438: Potential error on order edit page when ad…
omiroshnichenko Nov 20, 2017
7583730
MAGETWO-83328: Run Nightly PAT on 2.2
slopukhov Nov 20, 2017
4c41ba9
Merge branch magento/magento2/2.2-develop into magento-partners/magen…
Nov 20, 2017
2b78994
Merge pull request #1735 from magento-partners/prs-2.2-develop-2017-1…
Nov 20, 2017
2158987
MAGETWO-77840: [2.2.x] - Special/lowest price in child of a Configura…
Nov 20, 2017
4f3625b
MAGETWO-70725: Admin token does not expire after 'Admin Token Lifetim…
Nov 20, 2017
21a891f
MAGETWO-84018: magento/magento2#11691: Wrong return type for getAttri…
Nov 20, 2017
5341e43
MAGETWO-84018: magento/magento2#11691: Wrong return type for getAttri…
Nov 20, 2017
b9e26e5
MAGETWO-83999: 12261: Order confirmation email contains non functioni…
Nov 20, 2017
6cb8f62
MAGETWO-83410: Fix #10438: Potential error on order edit page when ad…
Nov 20, 2017
513e9f5
Merge pull request #1738 from magento-engcom/2.2-develop-prs
Nov 21, 2017
f6cfea4
MAGETWO-84016: Fixed 'Non-numeric value' warning on account create/sa…
Nov 21, 2017
6bce6f7
Merge pull request #1739 from magento-engcom/2.2-develop-prs
Nov 21, 2017
992b3a1
use FQCN throughout the class
Nov 21, 2017
4e937a3
use FQCN, revert doc parameter namespace
mariuscris Nov 21, 2017
c303e4d
import Config class
mariuscris Nov 21, 2017
e42a686
MAGETWO-81525: Fix email not sent when sitemap generation has errors …
Nov 21, 2017
813ff0a
MAGETWO-77840: [2.2.x] - Special/lowest price in child of a Configura…
Nov 21, 2017
1053d6c
add static and api-funcional tests for swatches
gomencal Nov 21, 2017
3e9908f
Merge remote-tracking branch 'main/2.2-develop' into MAGETWO-70725
Nov 21, 2017
bc727b1
MAGETWO-70725: Admin token does not expire after 'Admin Token Lifetim…
Nov 21, 2017
cd7dc56
revert type parameter on method prepareSortableFieldsByCategory
mariuscris Nov 21, 2017
6fc2735
MAGETWO-70725: Admin token does not expire after 'Admin Token Lifetim…
Nov 21, 2017
0031a1c
Fix depends field not working for radio elements
Oct 18, 2017
7845651
MAGETWO-83401: Fix depends field not working for radio elements #11539
omiroshnichenko Nov 21, 2017
cfa1293
MAGETWO-81942: Magento 2.2.0 A solution for Product Repeat Issue afte…
ishakhsuvarov Nov 21, 2017
dde0624
MAGETWO-83740: Even existing credit memos should be refundable if the…
ishakhsuvarov Nov 21, 2017
c65c016
MAGETWO-83329: 8003: Using System Value for Base Currency Results in …
ishakhsuvarov Nov 21, 2017
d8fc203
MAGETWO-81942: Magento 2.2.0 A solution for Product Repeat Issue afte…
ishakhsuvarov Nov 21, 2017
cc53450
MAGETWO-81525: Fix email not sent when sitemap generation has errors …
ishakhsuvarov Nov 21, 2017
8797e4d
Merge pull request #1743 from magento-engcom/2.2-develop-prs
Nov 21, 2017
d91671c
MAGETWO-83402: Fix issue #10347 - Wrong order tax amounts displayed w…
Nov 21, 2017
90b9e8b
MAGETWO-84267: #11528 can't save customizable options #12048
Nov 21, 2017
ae6839a
MAGETWO-84267: #11528 can't save customizable options #12048
Nov 21, 2017
9fc1138
Merge pull request #1746 from magento-engcom/2.2-develop-prs
Nov 21, 2017
ff73459
CAPTCHA LABEL : Update the captcha labels and help text to refer to t…
Nov 22, 2017
65bd2f9
MAGETWO-84272: Update AbstractBackend.php #12120
Nov 22, 2017
9165dd9
MAGETWO-84272: Update AbstractBackend.php #12120
Nov 22, 2017
d1bf61c
MAGETWO-84284: Update CAPTCHA labels to reflect the symbols in the CA…
ishakhsuvarov Nov 22, 2017
97d449c
9515: South Korea Zip Code Validation incorrect
RomaKis Nov 22, 2017
311d409
Merge remote-tracking branch 'mainline/2.2-develop' into 11792
dmanners Nov 22, 2017
e65e4ad
MAGETWO-84087: 11792: Can't add customizable options to product #11965
dmanners Nov 22, 2017
74980f2
Merge remote-tracking branch 'mainline/2.2-develop' into 12064
dmanners Nov 22, 2017
be14c70
MAGETWO-84125: 12064: Database Rollback not working with magento 2.1.…
dmanners Nov 22, 2017
59d2086
MAGETWO-83399: Fix for remove 'product_list_toolbar' block from layou…
omiroshnichenko Nov 22, 2017
20540c2
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Nov 22, 2017
2b261a5
MAGETWO-84311: Fix for issue 12127: Single quotation marks are now de…
Nov 22, 2017
6162464
Merge branch '2.2-develop' of github.com:magento/magento2 into issue-…
omiroshnichenko Nov 22, 2017
08b20b5
Merge pull request #1748 from magento-performance/MAGETWO-83328
vzabaznov Nov 22, 2017
b5fe00c
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-8431…
Nov 22, 2017
b64e470
Merge pull request #2 from magento/2.2-develop
Nov 22, 2017
c464951
Merge branch '2.2-develop' of github.com:magento/magento2 into fix-ui…
omiroshnichenko Nov 22, 2017
1d16c6d
Merge branch '2.2-develop' of github.com:magento/magento2 into update…
omiroshnichenko Nov 22, 2017
4f77bd1
MAGETWO-83621: Add link to issue gates wiki page in the labels sectio…
omiroshnichenko Nov 22, 2017
5c3d295
9515: South Korea Zip Code Validation incorrect
RomaKis Nov 22, 2017
8818a11
MAGETWO-83993: Fixed a js bug where ui_component labels have the wron…
ishakhsuvarov Nov 22, 2017
55a36a2
MAGETWO-84284: Update CAPTCHA labels to reflect the symbols in the CA…
ishakhsuvarov Nov 22, 2017
8997335
MAGETWO-84267: #11528 can't save customizable options #12048
ishakhsuvarov Nov 22, 2017
26185ac
MAGETWO-84125: 12064: Database Rollback not working with magento 2.1.…
ishakhsuvarov Nov 22, 2017
1e4762a
MAGETWO-84087: 11792: Can't add customizable options to product #11965
ishakhsuvarov Nov 22, 2017
b8bf035
MAGETWO-83993: Fixed a js bug where ui_component labels have the wron…
ishakhsuvarov Nov 22, 2017
235737f
MAGETWO-83401: Fix depends field not working for radio elements #11539
ishakhsuvarov Nov 22, 2017
d02fd62
Merge pull request #1750 from magento-engcom/2.2-develop-prs
Nov 22, 2017
5abac2e
MAGETWO-84272: Update AbstractBackend.php #12120
Nov 22, 2017
01fab5a
MAGETWO-83621: Add link to issue gates wiki page in the labels sectio…
Nov 22, 2017
059584c
MAGETWO-84371: 10210: Transport variable can not be altered in email_…
Nov 22, 2017
6260a36
Merge pull request #1754 from magento-engcom/2.2-develop-prs
Nov 23, 2017
d16c806
Merge branch 'MAGETWO-77840' into PR-22-2017-11-23
Nov 23, 2017
d35f8ad
Merge branch 'MAGETWO-75217' into PR-22-2017-11-23
Nov 23, 2017
675f3f3
Merge branch 'MAGETWO-70725' into PR-22-2017-11-23
Nov 23, 2017
5e6f1cb
MAGETWO-77840: [2.2.x] - Special/lowest price in child of a Configura…
Nov 23, 2017
c21229c
New validation: validate-no-utf8mb4-characters.
Nov 14, 2017
0599c8e
drop useless fixture, fix tests
gomencal Nov 23, 2017
243dccb
codestyle fix
gomencal Nov 24, 2017
2f646cb
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-8378…
Nov 24, 2017
f8ed60f
magento/magento2#12241: Merge branch '2.2-develop' of github.com:mage…
ishakhsuvarov Nov 24, 2017
284b6de
MAGETWO-84474: 10128: New Orders not being saved to order grid #12241
ishakhsuvarov Nov 24, 2017
e9b75b8
MAGETWO-83290: Add swatch option: Prevent loosing data and default va…
Nov 24, 2017
268dc2e
MAGETWO-83741: 11740: Sending emails from Admin in Multi-Store Enviro…
ishakhsuvarov Nov 24, 2017
44c9096
MAGETWO-83552: save invoice ID on credit memo when using API method s…
ishakhsuvarov Nov 24, 2017
5966d3a
MAGETWO-82577: [Backport 2.2] Translate order getCreatedAtFormatted()…
ishakhsuvarov Nov 24, 2017
79dbb2d
MAGETWO-84367: New validation: 3bytes characters filter (4 bytes char…
orlangur Nov 24, 2017
68994c6
MAGETWO-84474: 10128: New Orders not being saved to order grid #12241
ishakhsuvarov Nov 24, 2017
dab47a5
MAGETWO-83783: Shipping method fixtures not compatible with getShippi…
ishakhsuvarov Nov 24, 2017
e4a32a6
MAGETWO-83290: Add swatch option: Prevent loosing data and default va…
ishakhsuvarov Nov 24, 2017
1865e82
Merge pull request #1759 from magento-qwerty/PR-22-2017-11-23
dvoskoboinikov Nov 24, 2017
ad155f0
MAGETWO-83741: 11740: Sending emails from Admin in Multi-Store Enviro…
ishakhsuvarov Nov 24, 2017
49dfa76
MAGETWO-83399: Fix for remove 'product_list_toolbar' block from layou…
ishakhsuvarov Nov 24, 2017
42d512f
MAGETWO-83399: Fix for remove 'product_list_toolbar' block from layou…
ishakhsuvarov Nov 24, 2017
9ec4e9e
Merge branch 'MAGETWO-83399-magento-magento2-11473' of github.com:mag…
ishakhsuvarov Nov 24, 2017
b8c4068
Merge branch '2.2-develop' of github.com:magento/magento2ce into 2.2-…
ishakhsuvarov Nov 25, 2017
9c3d257
Merge pull request #1764 from magento-engcom/2.2-develop-prs
ishakhsuvarov Nov 25, 2017
830517b
MAGETWO-84372: 9515: South Korea Zip Code Validation incorrect #903
Nov 27, 2017
2cc1dd0
MAGETWO-84372: 9515: South Korea Zip Code Validation incorrect #903
Nov 27, 2017
9e5c010
MAGETWO-84371: 10210: Transport variable can not be altered in email_…
Nov 27, 2017
5983429
MAGETWO-81916: Attribute category_ids issue #11389
orlangur Nov 27, 2017
3d628f8
Merge pull request #1769 from magento-engcom/2.2-develop-prs
Nov 27, 2017
0082f5c
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-8431…
Nov 28, 2017
147f638
9742: Default welcome message returns after being deleted #9742
RomaKis Nov 27, 2017
a1cc499
MAGETWO-84413: 9742: Default welcome message returns after being dele…
Nov 28, 2017
6618483
MAGETWO-84413: 9742: Default welcome message returns after being dele…
Nov 28, 2017
228d080
MAGETWO-84367: New validation: 3bytes characters filter (4 bytes char…
Nov 28, 2017
f748f11
MAGETWO-84311: Fix for issue 12127: Single quotation marks are now de…
Nov 28, 2017
a0a2474
MAGETWO-81916: Attribute category_ids issue #11389
Nov 28, 2017
6862632
Merge pull request #1773 from magento-engcom/2.2-develop-prs
Nov 28, 2017
5ba34a7
MAGETWO-82668: Fix #10764: delete url rewrites for products after an …
Nov 29, 2017
e025d7a
MAGETWO-82668: Fix #10764: delete url rewrites for products after an …
Nov 30, 2017
f440942
MAGETWO-82668: Fix #10764: delete url rewrites for products after an …
Nov 30, 2017
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
  •  
  •  
  •  
166 changes: 128 additions & 38 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,76 +203,166 @@
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 CONTRIBUTING.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