Code

merge in most forks#167

Code

Open

J0s3f wants to merge 52 commits intoorganicinternet:masterorganicinternet/magento-configurable-simple:masterfrom J0s3f:masterJ0s3f/magento-configurable-simple:masterCopy head branch name to clipboard

+385-159

Commits

Commits on Apr 26, 2012

• Added columns group_price and base_group_price to column-list to fix the price indexing error in Magento 1.7.x

  

  Marco Grätsch

  committed
  6d88e5e

  Copy full SHA for 6d88e5e

Commits on Apr 27, 2012

• Fixed "Unknown column 'pi.base_group_price' in 'field list'" - should be pi.group_price

  

  Marco Grätsch

  committed
  92250c4

  Copy full SHA for 92250c4

Commits on May 18, 2012

• adding modman distribution filewq

  jonpday

  committed
  8742592

  Copy full SHA for 8742592

• fix for 1.7/1.12 compatibility re organicinternet#85

  jonpday

  committed
  07f5c01

  Copy full SHA for 07f5c01

• fix for 1.7/1.12 compatibility re organicinternet#85

  

  jonpday

  authored and

  roscius

  committed
  5b62204

  Copy full SHA for 5b62204

Commits on May 19, 2012

• Resync product stock index resource class override with changes made in 1.7/1.12 and

  Show description for bba22ab
  roscius

  committed
  bba22ab

  Copy full SHA for bba22ab

Commits on May 20, 2012

• Prevent javascript errors if the original select element in catalog/product/view/type/options/configurable.phtml has the attribute "size".

  

  mediarox

  committed
  44855a7

  Copy full SHA for 44855a7

Commits on May 21, 2012

• Fix bug with group price on cofigurable product in the price index,

  Show description for 87ca4de
  roscius

  committed
  87ca4de

  Copy full SHA for 87ca4de

Commits on Jun 22, 2012

• Resync product stock index resource class override with changes made in 1.7/1.12 and

  Show description for af333e2
  

  roscius

  authored and

  jonpday

  committed
  af333e2

  Copy full SHA for af333e2

• applying 44855a7 from github.com/mediarox/magento-configurable-simple.git

  jonpday

  committed
  1700da2

  Copy full SHA for 1700da2

• Merge remote-tracking branch 'mediarox/patch-1' into 17compatible

  jonpday

  committed
  105d6de

  Copy full SHA for 105d6de

• Merge remote-tracking branch 'magdev/patch-1' into 17compatible

  jonpday

  committed
  5e250ce

  Copy full SHA for 5e250ce

• Merge remote-tracking branch 'roscius/master' into 17compatible

  jonpday

  committed
  5808c0c

  Copy full SHA for 5808c0c

Commits on Jul 12, 2012

• Sync product resource and price indexing with Magento CE 1.7

  

  Joel Kociolek

  committed
  4db7622

  Copy full SHA for 4db7622

Commits on Jul 17, 2012

• Js for reloadPrice doesn't get correct price for text options

  

  Joel Kociolek

  committed
  c01bb30

  Copy full SHA for c01bb30

Commits on Jul 18, 2012

• Switch CatalogRule to Magento 1.7's way of doing resource classes

  

  Joel Kociolek

  committed
  eddf35a

  Copy full SHA for eddf35a

Commits on Jul 19, 2012

• remove unneeded logging

  

  Joel Kociolek

  committed
  46bee60

  Copy full SHA for 46bee60

Commits on Jul 23, 2012

• Strart to add French localization

  

  Joel Kociolek

  committed
  fe0c1f5

  Copy full SHA for fe0c1f5

Commits on Jul 24, 2012

• fix price resetting to zero when custom option checkbox is clicked

  dmtw

  committed
  36c0744

  Copy full SHA for 36c0744

• Add localization to modman/modgit

  

  Joel Kociolek

  committed
  1c1c031

  Copy full SHA for 1c1c031

Commits on Jul 25, 2012

• remove unneeded logging

  

  Joel Kociolek

  authored and

  jonpday

  committed
  8da3c97

  Copy full SHA for 8da3c97

• Switch CatalogRule to Magento 1.7's way of doing resource classes

  

  Joel Kociolek

  authored and

  jonpday

  committed
  ec9c821

  Copy full SHA for ec9c821

• Js for reloadPrice doesn't get correct price for text options

  

  Joel Kociolek

  authored and

  jonpday

  committed
  176cc35

  Copy full SHA for 176cc35

• add SKU and stock availability information to spConfig object and update the display based on child product selected

  jonpday

  committed
  ea64a30

  Copy full SHA for ea64a30

Commits on Jul 26, 2012

• add product alert html to the spConfig object

  jonpday

  committed
  9e88b33

  Copy full SHA for 9e88b33

• Update french translation

  

  Joel Kociolek

  committed
  2c06b4f

  Copy full SHA for 2c06b4f

• Merge branch 'master' of https://github.com/dmtw/magento-configurable-simple

  

  Joel Kociolek

  committed
  9b31033

  Copy full SHA for 9b31033

• Merge branch '17compatible' of https://github.com/aligent/magento-configurable-simple

  

  Joel Kociolek

  committed
  f8314ac

  Copy full SHA for f8314ac

• JS fixes for price resetting to zero when selecting product option

  

  Joel Kociolek

  committed
  2d70ea0

  Copy full SHA for 2d70ea0

Commits on Sep 21, 2012

• Fixed stock status and expanded dynamic js functions

  Show description for 6ccc834
  

  Lyndon Hook

  authored and

  jonpday

  committed
  6ccc834

  Copy full SHA for 6ccc834

Commits on Oct 18, 2012

• check that the product-sku DOM element is present before updating it

  jonpday

  committed
  8c7586f

  Copy full SHA for 8c7586f

Commits on Oct 31, 2012

• Allow SCP Ajax controller to display tier pricing when the parent is not visible, provided the child is.

  Show description for 85ab000
  aligentjim

  committed
  85ab000

  Copy full SHA for 85ab000

Commits on Dec 20, 2012

• Compatibility with the SweetTooth rewards extension.

  aligentjim

  committed
  b6ca9b4

  Copy full SHA for b6ca9b4

Commits on Jun 6, 2013

• Merging 1.7.2 fix pull-request

  andyflan

  committed
  7dc6024

  Copy full SHA for 7dc6024

Commits on Aug 23, 2013

• Added composer.json

  

  James Harrison

  committed
  b4c930a

  Copy full SHA for b4c930a

• composer json fix

  

  James Harrison

  committed
  e91c9fc

  Copy full SHA for e91c9fc

• Restructured template files & added modman

  

  James Harrison

  committed
  d0c54a9

  Copy full SHA for d0c54a9

Commits on Sep 2, 2013

• Update composer.json

  jharrisonio

  committed
  c084166

  Copy full SHA for c084166

Commits on Sep 3, 2013

• Removed logging call and fixed some block types

  

  James Harrison

  committed
  b2db34a

  Copy full SHA for b2db34a

• Merge branch 'master' of https://github.com/blissmedia/organicinternet_magento-configurable-simple

  

  James Harrison

  committed
  e03b3fe

  Copy full SHA for e03b3fe

Commits on Sep 26, 2013

• Merge remote-tracking branch 'remotes/andyflan/master'

  Show description for 278110a
  J0s3f

  committed
  278110a

  Copy full SHA for 278110a

• Merge remote-tracking branch 'remotes/aligent/master'

  J0s3f

  committed
  6421ce8

  Copy full SHA for 6421ce8

• german translation

  Show description for 7a5fb70
  

  Supreme Leader

  authored and

  J0s3f

  committed
  7a5fb70

  Copy full SHA for 7a5fb70

• de_DE Language Support

  J0s3f

  committed
  f6f8618

  Copy full SHA for f6f8618

Commits on Oct 1, 2013

• fixed layout xml filename

  nhp

  committed
  c660bab

  Copy full SHA for c660bab

• adapted more pathes

  nhp

  committed
  f1590cd

  Copy full SHA for f1590cd

• adapted more pathes

  nhp

  committed
  7ef8eda

  Copy full SHA for 7ef8eda

• finalized modman pathes

  nhp

  committed
  a842736

  Copy full SHA for a842736

• Merge pull request #1 from nhp/master

  Show description for d70c3e7
  J0s3f

  committed
  d70c3e7

  Copy full SHA for d70c3e7

Commits on Feb 13, 2014

• Merge jhuriez fork

  Show description for 7e2f91f
  insanityinside

  committed
  7e2f91f

  Copy full SHA for 7e2f91f

• Merge barbazul fork

  Show description for e869c7b
  insanityinside

  committed
  e869c7b

  Copy full SHA for e869c7b

• Merge pull request #2 from microchip/master

  Show description for 8d6f8a3
  J0s3f

  committed
  8d6f8a3

  Copy full SHA for 8d6f8a3