8ed77030aa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/controllers/products/suppliers.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/toolbar.tpl
classes/helper/HelperList.php
controllers/admin/AdminGroupsController.php
controllers/admin/AdminManufacturersController.php
2013-09-30 11:01:23 +02:00
5ebc2e5e91
[-] BO : Fix #PSCFV-10520
2013-09-29 14:43:14 +02:00
48966f7916
// Fixed language iso code consistency
2013-09-27 10:22:12 +02:00
d6a59a1dbd
// Maintenance bootstrap design
2013-09-26 09:37:38 +02:00
1b010da64f
// Fixed typo and configuration parse error
2013-09-25 20:21:41 +02:00
336e29eb67
// Default tab is the dashboard
2013-09-25 18:08:56 +02:00
147591dbe3
[*] BO : improved automatic language creation
2013-09-25 17:05:30 +02:00
439700f46a
// Removed deprecated function
2013-09-25 14:05:16 +02:00
5e7dbea970
//
2013-09-24 17:22:50 +02:00
beb0a74135
// use ObjectModel::validateField on validaterules
2013-09-24 17:12:28 +02:00
479662aa10
// Fix missing table id for shop asso in helper
2013-09-24 16:19:38 +02:00
799efcba3f
[*] BO : Customers KPIs
2013-09-24 15:32:05 +02:00
6e2337df44
// Add id attribute to tree header button
2013-09-24 12:27:51 +02:00
8f08f67812
[+] BO : Added fees configuration for the dashboard
2013-09-24 12:22:40 +02:00
6796b64e18
Merge pull request #691 from djfm/development
...
// fixed translation of modules descriptions containing quotes
2013-09-23 07:51:57 -07:00
50bbf1a547
// small fix
2013-09-23 10:46:41 +02:00
a578cfb2e2
[-] FO: Fix #PSCFV-10461
2013-09-23 10:20:22 +02:00
39468476ab
[-] CORE : #PSCFV-10461 customer group in getPriceStatic, pull request https://github.com/kpodemski/kp-PrestaShop/commit/361ebc72e09d00463bb7a7b7af670e3235ab6a5a
2013-09-23 09:50:12 +02:00
e9cd8ac145
// Search tree toolbar button
2013-09-20 16:20:27 +02:00
7aa348eb93
// bad char
2013-09-20 15:48:22 +02:00
429c9442a3
[*] CORE : bad else if in getTemplatePath
2013-09-20 15:10:14 +02:00
f312a055b1
// Multistore bootstrap design
2013-09-20 15:04:43 +02:00
9b878a33a8
// fix canonical and ssl page without ssl
2013-09-20 14:12:41 +02:00
e2ac223f4e
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-20 11:34:54 +02:00
5b7580d487
[-] MO: Fix time of smarty cache invalidation
2013-09-20 11:33:30 +02:00
1cebd5920e
[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
2013-09-20 11:09:22 +02:00
f8ca06d927
// Better cache depth management for smarty
2013-09-20 10:26:58 +02:00
150b68b96b
//displayError & displayConfirmation use bootstrap design
2013-09-19 16:52:58 +02:00
0a9f425281
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-18 16:08:44 +00:00
4e1d6de9b0
[-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated
2013-09-18 17:57:00 +02:00
75a9629b8a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-18 17:23:23 +02:00
27f14b9a31
[-] BO : Fix proces and save buttons for Modules and AdminControllers
2013-09-18 17:23:08 +02:00
f6dc81d0f1
// small fix for SSL
2013-09-18 17:19:03 +02:00
0452979ce7
[*] FO: Allow to enable SSL on all the pages
2013-09-18 16:30:34 +02:00
93aae26269
[-] Bo : Modules 'save' button not active
2013-09-18 15:41:30 +02:00
39fdc8c926
[+] BO : Added new class ConfigurationKPI for KPI cache storage
2013-09-18 15:09:04 +02:00
5a206e83a8
// Security
2013-09-18 10:43:58 +02:00
f7855f2a3a
// Always more KPIs
2013-09-17 12:47:13 +02:00
e6e8efc19a
[-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop
2013-09-17 11:58:12 +02:00
6ee6317fee
// orderby position
2013-09-17 11:07:29 +02:00
2d5bd901f4
[*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3
2013-09-16 18:51:06 +02:00
8934f9c7ed
[*] BO : Connected the first KPIs to real data
2013-09-16 18:40:34 +02:00
15dd1cf96f
[-] BO : Fix bugPSCFV-10249 images copy when unix path
2013-09-16 17:16:11 +02:00
235af94a92
// Fix Page header toolbar
2013-09-16 17:05:27 +02:00
7e8d119213
// Textarea autosize
2013-09-16 14:25:49 +02:00
e68c124218
[-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396
2013-09-16 11:42:11 +02:00
e0739ea1e0
Merge pull request #720 from makk1ntosh/development
...
//Added ui.button as dependency of ui.dialog
2013-09-16 01:35:25 -07:00
c0afb55d11
[-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link
2013-09-16 09:25:10 +02:00
74237ff694
// Some fix
2013-09-13 17:11:12 +02:00
d0ef8cca8f
Added ui.button as dependency of ui.dialog
...
While developing my own module, i've upgraded installation to latest version of PS and impacted a bug:
$('#something').dialog({...}); caused an error: t().button is not a function.
In my php code i had this:
$this->context->controller->addJqueryUI('ui.dialog');
i found that it doesn't load ui.button dependency.
Added 'ui.button' to classes/Media.php at the end of ui.dialog dependencies and all worked fine.
2013-09-13 08:02:47 -07:00
Kevin Granger