vAugagneur a4eb2cc7a9 //Merge branch release

2013-01-02 09:56:20 +01:00

..

access

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

addons_catalog

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

addresses

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

attachments

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

attribute_generator

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

attributes

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

attributes_groups

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

backup

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

carriers

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

cart_rules

[+] BO : you can now choose if a voucher is displayed under the cart in the frontend

2012-12-27 18:04:16 +01:00

carts

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

categories

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

cms

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

cms_categories

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

cms_content

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

countries

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

customer_threads

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

customers

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

emails

[-] FO : fixed bug #PSCFV-5980 && added 'js=1' in tpl when string is in script tag

2012-12-12 17:38:31 +01:00

employees

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

feature_value

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

features

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

geolocation

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

groups

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

home

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

images

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

import

[*] BO : moved sample csv file

2012-12-13 09:16:03 +01:00

information

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

invoices

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

languages

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

localization

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

login

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

logs

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

maintenance

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

manufacturers

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

meta

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

modules

// Cleaned modules call

2012-12-13 14:38:55 +01:00

modules_positions

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

not_found

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

order_preferences

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

orders

[-] FO : Fix html entities in order messages and threads

2012-12-27 12:23:10 +01:00

outstanding

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

payment

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

performance

//remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option

2012-12-12 14:37:15 +01:00

preferences

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

products

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

referrers

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

request_sql

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

return

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

scenes

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

search

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

shipping

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

shop

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

shop_group

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

shop_url

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

slip

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

specific_price_rule

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

states

[-] BO : fixed bug #PSCFV-5408 - Affect a new zone button for selected states in States doesn't work correctly

2012-12-14 16:12:25 +01:00

stats

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

statuses

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

stock_cover

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

stock_instant_state

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

stock_mvt

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

stores

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

suppliers

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

supply_orders

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

supply_orders_change_state

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

supply_orders_receipt_history

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

tags

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

tax_rules

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

tax_rules_group

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

themes

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

tracking

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

translations

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

warehouses

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

webservice

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00

index.php

Merge pull request #75 from @sebastienhouzet

2012-12-12 11:24:56 +01:00