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.

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

Jump to bottom

merge in most forks #167

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open

merge in most forks #167

wants to merge 52 commits into from

Conversation

J0s3f
Copy link

@J0s3f J0s3f commented Oct 1, 2013

No description provided.

Marco Grätsch and others added 30 commits April 27, 2012 00:50
Added columns group_price and base_group_price to column-list to fix …
6d88e5e 
…the price indexing error in Magento 1.7.x
Fixed "Unknown column 'pi.base_group_price' in 'field list'" - should…
92250c4 
… be pi.group_price
@jonpday
adding modman distribution filewq
8742592
@jonpday
fix for 1.7/1.12 compatibility re organicinternet#85
07f5c01
@jonpday @roscius
fix for 1.7/1.12 compatibility re organicinternet#85
5b62204
@roscius
Resync product stock index resource class override with changes made …
bba22ab 
…in 1.7/1.12 and

move to same location as in 1.7/1.12
Prevent javascript errors if the original select element in catalog/p…
44855a7 
…roduct/view/type/options/configurable.phtml has the attribute "size".
@roscius
Fix bug with group price on cofigurable product in the price index,
87ca4de 
update overriden code to reflect changes made in parent 1.7/1.12 code
@roscius @jonpday
Resync product stock index resource class override with changes made …
af333e2 
…in 1.7/1.12 and

move to same location as in 1.7/1.12
@jonpday
applying 44855a7 from github.com/mediarox/magento-configurable-simple…
1700da2 
….git
@jonpday
Merge remote-tracking branch 'mediarox/patch-1' into 17compatible
105d6de
@jonpday
Merge remote-tracking branch 'magdev/patch-1' into 17compatible
5e250ce
@jonpday
Merge remote-tracking branch 'roscius/master' into 17compatible
5808c0c
Sync product resource and price indexing with Magento CE 1.7
4db7622
Js for reloadPrice doesn't get correct price for text options
c01bb30
Switch CatalogRule to Magento 1.7's way of doing resource classes
eddf35a
remove unneeded logging
46bee60
Strart to add French localization
fe0c1f5
@dmtw
fix price resetting to zero when custom option checkbox is clicked
36c0744
Add localization to modman/modgit
1c1c031
@jonpday
remove unneeded logging
8da3c97
@jonpday
Switch CatalogRule to Magento 1.7's way of doing resource classes
ec9c821
@jonpday
Js for reloadPrice doesn't get correct price for text options
176cc35
@jonpday
add SKU and stock availability information to spConfig object and upd…
ea64a30 
…ate the display based on child product selected
@jonpday
add product alert html to the spConfig object
9e88b33
Update french translation
2c06b4f
Merge branch 'master' of https://github.com/dmtw/magento-configurable…
9b31033 
…-simple
Merge branch '17compatible' of https://github.com/aligent/magento-con…
f8314ac 
…figurable-simple
JS fixes for price resetting to zero when selecting product option
2d70ea0
@jonpday
Fixed stock status and expanded dynamic js functions
6ccc834 
Fixed an issue with the stock status js and also included the "Add to Cart" button dynamic switching.

Signed-off-by: Lyndon Hook <[email protected]>
Signed-off-by: Jonathan <[email protected]>
jonpday and others added 22 commits October 18, 2012 21:57
@jonpday
check that the product-sku DOM element is present before updating it
8c7586f
@aligentjim
Allow SCP Ajax controller to display tier pricing when the parent is …
85ab000 
…not visible, provided the child is.

Signed-off-by: Jim O'Halloran <[email protected]>
@aligentjim
Compatibility with the SweetTooth rewards extension.
b6ca9b4
@andyflan
Merging 1.7.2 fix pull-request
7dc6024
Added composer.json
b4c930a
composer json fix
e91c9fc
Restructured template files & added modman
d0c54a9
@jharrisonio
Update composer.json
c084166
Removed logging call and fixed some block types
b2db34a
Merge branch 'master' of https://github.com/blissmedia/organicinterne…
e03b3fe 
…t_magento-configurable-simple
@J0s3f
Merge remote-tracking branch 'remotes/andyflan/master'
278110a 
Conflicts:
	app/code/community/OrganicInternet/SimpleConfigurableProducts/Catalog/Model/Product/Type/Simple.php
	modman
@J0s3f
Merge remote-tracking branch 'remotes/aligent/master'
6421ce8
@J0s3f
german translation
7a5fb70 
(cherry picked from commit ef20da5)
@J0s3f
de_DE Language Support
f6f8618
@nhp
fixed layout xml filename
c660bab
@nhp
adapted more pathes
f1590cd
@nhp
adapted more pathes
7ef8eda
@nhp
finalized modman pathes
a842736
@J0s3f
Merge pull request #1 from nhp/master
d70c3e7 
Fixed modman file
@insanityinside
Merge jhuriez fork
7e2f91f 
Merge changes from
jhuriez@7321776
@insanityinside
Merge barbazul fork
e869c7b 
Merging
barbazul@055aa7d
@J0s3f
Merge pull request #2 from microchip/master
8d6f8a3 
Request merge for two functionality issues
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@J0s3f @jonpday @roscius @dmtw @aligentjim @andyflan @jharrisonio @nhp @insanityinside