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

[Backport] Added RewriteBase directive template in .htaccess file into pub/media folder #1

Open
wants to merge 893 commits into
base: 2.2-develop
Choose a base branch
from

Conversation

dipti2jcommerce
Copy link
Owner

Original Pull Request

magento#21036

Description

This PR adds RewriteBase directive template into .htaccess file under pub/media folder, useful in case the need is to install Magento code under a directory inside the web root.
Setting this directive into .htaccess file in Magento's root and without setting it into .htaccess under pub/media folder cause a media file missing by Apache Web Server due to specified RewriteRule directive that points to ../get.php.
A similar issue was already fixed in magento#13678 and relative branch portings.

Fixed Issues

none

Manual testing scenarios

none

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

sidolov and others added 30 commits January 31, 2019 16:52
Accepted Public Pull Requests:
 - magento#20739: [Backport] issue fixed magento#20563 Go to shipping information, Update qty & Addresses� (by @amol2jcommerce)
 - magento#20744: [Backport] recent-order-product-title-misaligned (by @amol2jcommerce)
 - magento#20270: [Backport] Fixed-Widget-option-labels-are-misalinged (by @amol2jcommerce)
 - magento#20613: [Backport] admin-order-info-issue2.2 (by @dipti2jcommerce)
 - magento#20418: [Backport] issue fixed magento#20304 No space between step title and saved address in c� (by @shikhamis11)
 - magento#20285: [Backport]magento#20222 Canary islands in ups carrier 2.2 (by @duckchip)
 - magento#18809: [Backport] catalog:images:resize total images count calculates incorrectly magento#18387 (by @vpodorozh)
 - magento#19461: [Backport 2.2] issue magento#18931 fixed. (by @JeroenVanLeusden)
 - magento#19655: Fixed - Shipping issue on PayPal Express magento#14712 (by @ssp58bleuciel)


Fixed GitHub Issues:
 - magento#20563: Go to shipping information, Update qty & Addresses and Enter a new address button Not aligned from left and right in 767px screen size (reported by @swetacedcoss) has been fixed in magento#20739 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. 6e7281d

 - magento#20500: Recent Order Product Title Misaligned in Sidebar (reported by @parag2jcommerce) has been fixed in magento#20744 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. a971270
     2. 81d8781
     3. 73cb5c8

 - magento#20113: Widget option labels are misalinged (reported by @yashwant2jcommerce) has been fixed in magento#20270 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. 936d71f
     2. 935d3d2

 - magento#20609: Currency rate value not align proper in order information tab  when we create creditmemo from admin (reported by @dipti2jcommerce) has been fixed in magento#20613 by @dipti2jcommerce in 2.2-develop branch
   Related commits:
     1. 7bf7ce1

 - magento#20304: No space between step title and saved address in checkout  (reported by @swetacedcoss) has been fixed in magento#20418 by @shikhamis11 in 2.2-develop branch
   Related commits:
     1. 16d7461

 - magento#18387: catalog:images:resize fails to process all images -> Possible underlying Magento/Framework/DB/Query/Generator issue (reported by @gwharton) has been fixed in magento#18809 by @vpodorozh in 2.2-develop branch
   Related commits:
     1. f114f2a
     2. 95eeb9f
     3. 84590de
     4. 4653d3e
     5. d2e5345
     6. 2539a71
     7. 76bd089
     8. b81b550
     9. 051d82d
     10. 10a1a88

 - magento#18931: Product added to shopping cart / comparison list message not translated by default (reported by @arnoudhgz) has been fixed in magento#19461 by @JeroenVanLeusden in 2.2-develop branch
   Related commits:
     1. 3b521b0

 - magento#14712: Shipping issue on PayPal Express (reported by @raymond62) has been fixed in magento#19655 by @ssp58bleuciel in 2.2-develop branch
   Related commits:
     1. 8a059e6
     2. 8bdcca9
     3. c3d5010
- consolidate cache flush into method
…'42-' magento#20876

 - Merge Pull Request magento#20876 from Nazar65/magento2:backport-issue-20716
 - Merged commits:
   1. 49d09cf
…es not have customer attribute set that is changed to required after original account creation
…es not have customer attribute set that is changed to required after original account creation
…igurable products without any tiered pricing
…igurable products without any tiered pricing
…eckout after changing the allowed countries from admin magento#20885

 - Merge Pull Request magento#20885 from amol2jcommerce/magento2:2.2-develop-PR-port-20634
 - Merged commits:
   1. 467a2a8
   2. a48a4de
   3. 8d67213
…space magento#20886

 - Merge Pull Request magento#20886 from milindsingh/magento2:2.2-develop-PR-port-20410
 - Merged commits:
   1. 9092e7a
…kout page magento#20837

 - Merge Pull Request magento#20837 from amol2jcommerce/magento2:2.2-develop-PR-port-20144
 - Merged commits:
   1. 4a3354a
   2. 1a75856
   3. 496c6af
…dding-cache-flush-on-static-clear

[honey] MC-5926: Conflict of simultaneous write in Redis cache
magento-engcom-team and others added 29 commits February 11, 2019 11:15
…ng to default when you checked Use system value magento#20566

 - Merge Pull Request magento#20566 from XxXgeoXxX/magento2:2.2-develop#13675
 - Merged commits:
   1. ca9bb26
…gned in admin panel magento#19333

 - Merge Pull Request magento#19333 from speedy008/magento2:fix-issue-19328
 - Merged commits:
   1. 4fcc190
   2. aa13b7d
   3. 330b6cc
   4. 5cab3ff
   5. 373c3b3
   6. 07216dd
   7. b7fa7f5
[performance] MAGETWO-97094: [BackPort][MC-5663] Enable caching of AJAX requests on Varnish/Fastly
Accepted Public Pull Requests:
 - magento#21081: [Backport] MAGETWO-95819: Customer registration fields not translated (by @tdgroot)
 - magento#19333: Fix issue 19328 - Success Message Icon vertically misaligned in admin panel (by @speedy008)


Fixed GitHub Issues:
 - magento#19328: Success Message Icon vertically misaligned in admin panel  (reported by @speedy008) has been fixed in magento#19333 by @speedy008 in 2.2-develop branch
   Related commits:
     1. 4fcc190
     2. aa13b7d
     3. 330b6cc
     4. 5cab3ff
     5. 373c3b3
     6. 07216dd
     7. b7fa7f5
Fixed issues:
- [MAGETWO-97898](https://jira.corp.magento.com/browse/MAGETWO-97898) [Magento Cloud] Store switcher URL redirects to the same store
Accepted Public Pull Requests:
 - magento#20566: [Backport] Number of Lines in a Street Address not setting to default  when you checked Use system value (by @XxXgeoXxX)
 - magento#21123: [Backport] Add filter for `NOT FIND_IN_SET` sql conditions (by @mageprince)
 - magento#21124: [Backport] issue fixed magento#20382 (by @irajneeshgupta)
 - magento#20845: [Backport] Empty block rendering in My Account page sidebar fixed using designing changes. (by @mage2pratik)


Fixed GitHub Issues:
 - magento#13675: Magento 2 :-  Number of Lines in a Street Address not setting to default when you checked Use system value in Magento 2.1.7 (reported by @pradeeprcs) has been fixed in magento#20566 by @XxXgeoXxX in 2.2-develop branch
   Related commits:
     1. ca9bb26

 - magento#20382: View and Edit Cart link not aligned in middle because bellow the link a blank div (class="minicart-widgets") existing has 15px margin top, this div (class="minicart-widgets" ) should be display none or should not come if has no content, should only display if has content (reported by @irajneeshgupta) has been fixed in magento#21124 by @irajneeshgupta in 2.2-develop branch
   Related commits:
     1. 05848e5

 - magento#19139: Empty block rendering in My Account page sidebar (reported by @rafaelstz) has been fixed in magento#20845 by @mage2pratik in 2.2-develop branch
   Related commits:
     1. e1e4f1b
…ntegration tests magento#21156

 - Merge Pull Request magento#21156 from eduard13/magento2:2.2-develop-PR-port-21048
 - Merged commits:
   1. 53f344d
   2. 8b98fb9
… valid coupon to cart by an integra… magento#21155

 - Merge Pull Request magento#21155 from eduard13/magento2:2.2-develop-PR-port-21028
 - Merged commits:
   1. 2fc33b4
   2. 1a31aee
[TSG] Backporting for 2.2 (pr76) (2.2)
 - merged latest code from mainline branch
Accepted Public Pull Requests:
 - magento#21156: [Backport] [SendFriend] Covering the Send to friend by integration tests (by @eduard13)
 - magento#21155: [Backport] [Checkout] Covering the successfully adding a valid coupon to cart by an integra… (by @eduard13)
 - magento#20821: [Backport] Fixing the styling issue on customizable options (by @eduard13)


Fixed GitHub Issues:
 - magento#20497: Product customizable options issue (reported by @eduard13) has been fixed in magento#20821 by @eduard13 in 2.2-develop branch
   Related commits:
     1. 06f7430
dipti2jcommerce pushed a commit that referenced this pull request May 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.