Updating from LTS repository #3
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...)
* Fix documentation in Mage_Core * Fix documentation in Mage_Core * Fix docblocks
) * Cache all attribute options for display in layered navigation This will improve performance by reducing the amount of SQL Queries when fetching all possible attributes to display in the layered navigation * Use the attribute's own cache tags Co-authored-by: Ricardo Velhote <ricardo@caretobeauty.com>
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) Co-authored-by: Tymoteusz Motylewski <t.motylewski@gmail.com>
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...)
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...)
* Mage_Tax - DOC block update - doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) - fixedd translation in Mage_Tax_Model_System_Config_Source_Tax_Country::toOptionArray() * Minor fixes
* Mage_Review - DOC block update - doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) - fixed undefined property used instead of magic getter * Minor fixes
* Mage_Sitemap - DOC block update - doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) * Replaced mysql4 with resource class
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...)
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) Co-authored-by: Colin Mollenhour <colin@mollenhour.com>
* Mage_Page - DOC block update - doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...) * Fix Co-authored-by: Colin Mollenhour <colin@mollenhour.com>
…-lts into sreichel-cleanup/payment
- doc blocks added/fixed - PSR2 fixes (whitespaces, linebreaks, ...)
The method getFormKey() exists in Mage_Core_Block_Abstract, so no need to define it with `@method`
If not here, then please add it to http://openmage.github.io/magento-lts/install.html ... it is good to have it. This way if he flow changes or can be improved people can add to it,
This fix adds a check for the "HTTP_X_FORWARDED_PROTO" header to determine if the scheme is HTTPS or HTTP.
* Add all-contributors bot config & placeholder * Add @sreichel as a contributor * Add @LeeSaferite as a contributor * Add @colinmollenhour as a contributor * Add @drobinson as a contributor * Add @tmotyl as a contributor * Add @Flyingmana as a contributor * Add @seansan as a contributor * Add @spinsch as a contributor * Add @Schrank as a contributor * Add @Sekiphp as a contributor * Add @edannenberg as a contributor * Add @JeroenBoersma as a contributor * Add @lfluvisotto as a contributor * Add @kkrieger85 as a contributor * Add @kiatng as a contributor * Add @bob2021 as a contributor * Add @bastienlm as a contributor * Add @DmitryFursNeklo as a contributor * Add @rjocoleman as a contributor * Add @midlan as a contributor * Add @mattdavenport as a contributor * Add @kestraly as a contributor * Add @henrykbrzoska as a contributor * Add @empiricompany as a contributor * Add @mark-netalico as a contributor * Add @ericseanturner as a contributor * Add @willcodeforfood as a contributor * Add @tschifftner as a contributor * Add @sprankhub as a contributor * Add @tomlankhorst as a contributor * Add @shirtsofholl as a contributor * Add @sebastianwagner as a contributor * Add @maximehuran as a contributor * Add @pepijnblom as a contributor * Add @manuperezgo as a contributor * Add @luigifab as a contributor * Add @loekvangool as a contributor * Add @kpitn as a contributor * Add @kalenjordan as a contributor * Add @ioweb-gr as a contributor * Add @fplantinet as a contributor * Add @dvdsndr as a contributor * Add @VincentMarmiesse as a contributor * Add @ProxiBlue as a contributor * Add @zamoroka as a contributor * Add @wpdevteam as a contributor * Add @woutersamaey as a contributor * Add @vovayatsyuk as a contributor * Add @viable-hartman as a contributor * Add @trabulium as a contributor * Add @schmengler as a contributor * Add @roman204 as a contributor * Add @sergeifilippov as a contributor * Add @samsteele as a contributor * Add @rvelhote as a contributor * Add @royduin# as a contributor * Add @roberto-ebizmarts as a contributor * Add @real34 as a contributor * Add @rafdol as a contributor * Add @rafaelpatro as a contributor * Add @pointia as a contributor * Add @paulrodriguez as a contributor * Add @ollb as a contributor * Add @nintenic as a contributor * Add @mpalasis as a contributor * Add @miguelbalparda as a contributor * Add @markvds as a contributor * Add @mickys as a contributor * Add @mSengera as a contributor * Add @kanevbg as a contributor * Add @julienloizelet as a contributor * Add @jonashrem as a contributor * Add @jaroschek as a contributor * Add @jacquesbh as a contributor * Add @googlygoo as a contributor * Add @edwinkortman as a contributor * Add @drago-aca as a contributor * Add @dng-dev as a contributor * Add @davis2125 as a contributor * Add @damien-biasotto as a contributor * Add @cundd as a contributor * Add @cieslix as a contributor * Add @borriglione as a contributor * Add @blopa as a contributor * Add @aterjung as a contributor * Add @altdovydas as a contributor * Add @alissonjr as a contributor * Add @alexkirsch as a contributor * Add @SnowCommerceBrand as a contributor * Add @PofMagicfingers as a contributor * Add @MichaelThessel as a contributor * Add @JonLaliberte as a contributor * Add @IvanChepurnyi as a contributor * Add @Ig0r-M-magic42 as a contributor * Add @EliasKotlyar as a contributor * Add @Hejty1 as a contributor * Add @Gaelle as a contributor * Add @FredericMartinez as a contributor * Add @FaustTobias as a contributor * Add @AndresInSpace as a contributor * Update @kkrieger85 as a contributor
Fix undefined function
* Support symlinks while not allowing malicious template paths. * Add protection for unauthorized file access to all fallback-based paths and allow symlinks for inlinecss directive. * Remove symlink notification.
Added GIT flow
Fixed Magento not detecting HTTPS behind a proxy.
This prevents a exception thrown in the GD2 class when resizing to 0 width or height. Co-authored-by: Martin René Sørensen <mrs@wexo.dk>
* Apply SUPEE-11346 patch * Apply SUPEE-11346 patch * magento-lts-1093 Disable currencyconverterapi service by default
Co-authored-by: Dean Williams <deanwilliams@MacBook-Pro.local>
* Fix special price management for bundled products * Call function as static Co-authored-by: Francesco Tuzzolino <francescoboes@gmail.com>
* Add development environment setup files and README. Refs #644 * Added mention of ddev. * Fix for first-time user. * Fix file permissions for first time install. * Reduce installation steps to one.
…tion (#1008) * add OpenMage admin theme and theme switcher * updated message-popup styling * improved scss and replaced more images * add scss compile warning * icon names refactored and added more icon replacements * fixed css bugs * replace getStoreConfig by getStoreConfigFlag * update color theme to match upcoming openmage 1.1 styles * remove no longer needed code fragment * add openmage theme config option and add default value * adjusted some spacings * changed admin/design/theme to admin/desing/use_legacy_theme and added default value * fixed css bug introduced in 47025d7 * fix padding on select boxes * add show_in_website and show_in_store to use_legacy_theme config option * remove googlefonts cdn usage and add Open Sans font as local version to skin * updated login, forgot password page, header * fix absolute urls to localhost in login.scss * fix design of resetpassword page * fix design of resetpassword page * remove Magento from login and forgot password page * escapeHtml store frontend name Co-authored-by: Aike Terjung <at@akt-web.de>
* remove $timesUsed > 0 check to prevent duplicate entry * Prevent $timesUsed from going less than 0
While Mage_Catalog_Model_Resource_Product_Collection::addUrlRewrite() does respect any set storeId on the collection it's helper that does the actual work is hard-coded to the current active store.
…cancelled. (#1170) This is to avoid having 2 open orders.
* fix checkout address for guest * refactoring
…tting blocks... this is causing wrong sort order (#1108) Co-authored-by: Hannes Drittler <h.drittler@lemundo.de>
Co-authored-by: Sven Reichel <sven.reichel@sandstein.de>
Co-authored-by: Sven Reichel <sven.reichel@sandstein.de>
…agento-lts into 1.9.4.x app/design/install/default/default/template/install/download.phtml
Co-authored-by: Sven Reichel <sven.reichel@sandstein.de>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.