bdnugget/magento2
1
0 Fork 0
mirror of https://github.com/bdnugget/magento2.git synced 2026-11-07 09:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
143,425 Commits 1 Branch 0 Tags
2.4-develop
Commit Graph
96 Commits
Author SHA1 Message Date
Dmytro Shevtsov 5113b7280c Update docs links 2022-12-20 10:59:17 -06:00
Marvin Hinz df7819385e Add .htpasswd to banned locations in nginx config 2021-10-19 15:44:32 +02:00
in-session 9c8c61b072 Update nginx.conf.sample 2021-03-09 14:15:09 +01:00
in-session b877a4a997 Add webmanifest for Static files 2021-03-09 14:06:39 +01:00
in-session c416e6b8b7 Remove Flash 2021-03-09 14:04:15 +01:00
in-session 760ab3680d Update nginx.conf.sample 2021-03-09 13:10:58 +01:00
in-session 81882e7842 Update nginx.conf.sample 2021-03-09 12:44:52 +01:00
in-session 59161f29dd Add WEBP Support by default 2021-03-09 12:14:23 +01:00
magento-mts-svc a0dd2defe7 merge magento-commerce/2.4-develop into magento-tsg/MC-40439 2021-02-07 23:23:37 -08:00
Gabriel da Gama dc1662dce7 Merge branch '2.4-develop' into nginx-conf-remove-recursion 2021-01-05 10:27:18 +00:00
Dmytro Shevtsov e92fbe51c5 MC-39004: Update links to devdocs in magento2 module READMEs 
Updated links to DevDocs and User Guides
Fixed formatting in readmes
 2020-12-10 20:10:41 -06:00
Eduard Muradov 9f3ab3acac Remove recursion in location of static files. 2020-11-10 17:37:34 +03:00
Oleg Posyniak de8edcfd37 [AWS S3] Improvements (#6262) 2020-10-27 20:01:40 -05:00
Andrii Lugovyi 640cad5300 [performance] MC-37459: Support by Magento Catalog (#6223) 
* MC-37459: Support by Magento Catalog
 2020-10-22 16:21:34 -05:00
Oleksandr Gorkun e44d2eeddc MC-33823: Merge CE, EE and B2B changes 2020-06-02 17:37:17 -05:00
Oleksandr Gorkun e6a98c45ac Merge branch '2.4.0-develop' of https://github.com/magento/magento2ce into MC-33823 
 Conflicts:
	dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
	dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
	dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Coupons.php
	dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
 2020-06-01 16:03:23 -05:00
Oleksandr Gorkun 64247aa68a MC-33823: Merge CE, EE and B2B changes 2020-05-13 14:23:38 -05:00
Dmytro Voskoboinikov dc289a9558 Merge branch '2.4-develop' into 2.4.0-develop 
# Conflicts:
#	app/code/Magento/Catalog/Block/Product/ListProduct.php
#	app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerPasswordTest.xml
#	dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
#	lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
 2020-03-24 11:45:17 -05:00
Alex Paliarush aabff22267 Reverted: 
ECP-261 Offload Catalog Image Resizing from Magento
ECP-262 Offload Catalog Image Watermarking from Magento
ECP-263 Deprecate Rotation Support in Magento
 2020-03-10 10:05:56 -05:00
Dmytro Voskoboinikov 506eb20e07 Merge branch '2.4-develop' into 2.4.0-develop 
# Conflicts:
#	lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
 2020-02-07 15:43:09 -06:00
Alex Paliarush 41b1cd5448 ECP-261: Offload Catalog Image Resizing from Magento 2020-01-29 10:05:55 -06:00
Viktor Sevch fcde97f38d MC-29467: File upload changes 2019-12-20 09:18:32 +02:00
Paavo Pokkinen 8260aa3a28 Add Cache-Control header to nginx sample configuration 2019-11-01 10:57:55 +02:00
Joan He 069c55b6ba merge upstream/2.3.1-qwerty into 2.3-develop-pr 2019-03-28 13:21:54 -05:00
Magento Community Engineering c17eec404e ENGCOM-4562: Secure errors directory #20212 
- Merge Pull Request magento/magento2#20212 from schmengler/magento2:secure-errors-directory
 - Merged commits:
   1. a0566abffe
 2019-03-24 11:18:27 -05:00
Dmytro Voskoboinikov be55ef50a6 MC-13741: Fixed incorrect behavior of template variables 2019-02-11 13:53:08 -06:00
jaideepghosh e5603018be update nginx.conf.sample to serve json also. 2019-02-07 19:49:47 +05:30
jaideepghosh 8ec9a3ab8b Update static block in nginx.conf 
Update the 'nginx.conf.sample' to allow the browsers for accessing the static contents even in multisite mode also.
 2019-02-07 19:44:41 +05:30
Dmitry Voskoboinikov 67d7b234fb Merge MAGETWO-96505 into 2.3-bugfixes-040219 2019-02-04 15:49:21 -06:00
roman b2608a7851 MAGETWO-96505: Fixed incorrect stacktrace displaying 2019-02-04 12:30:03 +02:00
Dmitry Voskoboinikov 599d3688c2 Merge MAGETWO-70972 into 2.3-bugfixes-230119 2019-01-24 12:46:02 -06:00
Fabian Schmengler a0566abffe Deny access to XML and PHTML files in pub/errors 
For apache via .htaccess and in nginx sample configuration
 2019-01-14 08:25:47 +01:00
Oleksandr Gorkun 69bd35d057 MAGETWO-70972: Servers Configurations Needs Update 2018-09-03 12:34:59 +03:00
Oleksandr Gorkun d764998480 MAGETWO-92170: Redundant File Names for Quote Attachments 2018-08-16 14:21:51 +03:00
Sergey Shvets 631bd09b3a MAGETWO-93708: [2.3] Client-side caching of js-translation.js. 2018-07-31 09:58:52 +03:00
Sean Breeden c65b876819 Update nginx.config.sample to exclude php5-fpm 
M2.2.x is not compatible with php5.x so there's no reason to include it as an option in the nginx.config.sample
 2018-07-23 18:15:14 +00:00
Ievgen Shakhsuvarov c0940f92d2 MAGETWO-87154: [EngCom Team] Batch 14. Forwardports to 2.3-develop #1299 2018-01-29 17:06:00 +02:00
Magento EngCom Team 1090c8b547 ⏫ Forwardport of magento/magento2#12521 to 2.3-develop branch 
Applied pull request patch https://github.com/magento/magento2/pull/12521.patch (created by @scottsb) based on commit(s):
  1. 32d30a537e6fa40ad28c8474cdab89ac43fe82ae
 2018-01-24 12:15:15 -06:00
Magento EngCom Team b836052059 ⏫ Forwardport of magento/magento2#11690 to 2.3-develop branch 
Applied pull request patch https://github.com/magento/magento2/pull/11690.patch (created by @andrewhowdencom) based on commit(s):
  1. 73178d87e5bc719c57e4dc874de3a4e62977e2bd

Fixed GitHub Issues in 2.3-develop branch:
  - magento/magento2#11157: nginx.sample.conf missing heath_check.php? (reported by @craigcarnell)
 2018-01-23 10:55:50 -06:00
Lewis Voncken 4015d2f37c [TASK] Incorrect minimum memory_limit references have been updated from 768M to 756M 2017-10-26 08:41:31 +00:00
Eugene Tulika 870d496c59 MAGETWO-66353: Optional PHP7.0 Socket Path #3869 
- Merge Pull Request magento/magento2#3869 from digimix/magento2:patch-1
 2017-03-20 05:45:39 -07:00
Carey Sizer b96fa923e1 Removed un-used static version rewrite rule in nginx.conf.sample 
The version / signature for the static file has already been removed by an earlier rule
 2016-12-22 11:17:01 +13:00
Oleksii Korshenko 57dedd1108 MAGETWO-56717: [GITHUB][PR] Update nginx.conf.sample #3137 
- Merge branch 'patch-1' of https://github.com/thaiphan/magento2 into thaiphan-patch-1
 2016-08-12 11:56:37 -05:00
Mike Weis 5627715f53 Merge branch 'develop' into FearlessKiwis-MAGETWO-51428-php_memory_limits 2016-07-18 13:54:20 -05:00
Andrii Lugovyi 8462c29207 MAGETWO-54692: Merchant can't install 2.1.0 EE with sample data using CLI (74% issue) 2016-07-04 17:40:27 +03:00
Robert He 5dcc618391 MAGETWO-51428: Duplication of PHP memory settings in sample web-server config files 
- remove duplication of PHP memory limits
 2016-06-29 16:19:09 -05:00
Igor Melnikov c51b1f3719 Merge remote-tracking branch 'upstream/develop' into pr 2016-06-07 22:26:37 -05:00
Dale Sikkema e806304596 MAGETWO-52867: [APPSEC-1446] Sensitive server information disclosure upon specific URL requests 2016-06-06 14:45:55 -05:00
Dale Sikkema f4a6ef6781 MAGETWO-53471: sample nginx config requires MAGE_MODE environment variable 2016-05-26 11:26:01 -05:00
Natalia Momotenko a34dda4449 Merge remote-tracking branch 'origin/MAGETWO-50855' into bugs 2016-05-19 11:56:16 +03:00