Damien Metzger 39f6a2354a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	classes/helper/HelperForm.php
	classes/helper/HelperUploader.php

2013-10-25 18:58:07 +02:00

..

Helper.php

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-10-14 12:21:29 +02:00

HelperCalendar.php

// Date range picker improvements

2013-10-21 17:07:57 +02:00

HelperForm.php

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-10-25 18:58:07 +02:00

HelperHelpAccess.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

HelperKpi.php

// Added expense management to profitability KPI

2013-10-09 10:55:12 +02:00

HelperKpiRow.php

[*] BO : Connected the first KPIs to real data

2013-09-16 18:40:34 +02:00

HelperList.php

// list bulk actions fix

2013-10-22 11:24:50 +02:00

HelperOptions.php

// Fix HelperUploader images params

2013-10-25 15:54:53 +02:00

HelperTreeCategories.php

// Add id attribute to tree header button

2013-09-24 12:27:51 +02:00

HelperTreeShops.php

// Tree bugs

2013-09-12 15:22:47 +02:00

HelperUploader.php

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-10-25 18:58:07 +02:00

HelperView.php

// Welcome 2013

2013-01-04 11:19:03 +01:00

index.php

// Welcome 2013

2013-01-04 11:19:03 +01:00