d46feffcf1
[*] CORE : Throw Exception when no theme selected only in front office
2013-11-28 16:14:30 +01:00
336e784ca5
[*] CORE : Throw Exception when no theme selected
2013-11-28 15:32:19 +01:00
9eefcfd058
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/css/modules.css
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/Autoload.php
classes/Carrier.php
classes/Product.php
classes/ProductSale.php
classes/Tools.php
classes/Validate.php
classes/tax/TaxRulesTaxManager.php
controllers/admin/AdminPPreferencesController.php
controllers/admin/AdminPerformanceController.php
install-dev/install_version.php
js/admin_carrier_wizard.js
modules/blockcategories/blockcategories.php
modules/blocklayered/blocklayered.php
modules/statsequipment/statsequipment.php
modules/statsproduct/statsproduct.php
modules/watermark/watermark.php
themes/default/address.tpl
themes/default/authentication.tpl
themes/default/category.tpl
themes/default/contact-form.tpl
themes/default/css/history.css
themes/default/header.tpl
themes/default/js/cart-summary.js
themes/default/js/product.js
themes/default/mobile/order-detail.tpl
themes/default/modules/blocksearch/blocksearch.tpl
themes/default/modules/productcomments/productcomments.tpl
themes/default/order-carrier.tpl
themes/default/order-detail.tpl
themes/default/order-opc-new-account.tpl
themes/default/product.tpl
2013-11-21 17:43:51 +01:00
3f8b76f78c
[-][FO] _PS_THEME_MOBILE_OVERRIDE_DIR_ not defined
...
When there is no mobile theme provided with the current theme, the variable _PS_THEME_MOBILE_OVERRIDE_DIR_ is not defined. We so get the following error in apache logs:
"PHP Notice: Use of undefined constant _PS_THEME_MOBILE_OVERRIDE_DIR_ - assumed '_PS_THEME_MOBILE_OVERRIDE_DIR_' in FrontController.php"
2013-11-13 18:12:59 +01:00
889a2006ec
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/customer_threads/message.tpl
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/favorites.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/associations.tpl
admin-dev/themes/default/template/controllers/products/combinations.tpl
admin-dev/themes/default/template/controllers/products/images.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/referrers/helpers/view/view.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/ProductSale.php
classes/helper/HelperList.php
controllers/admin/AdminCmsController.php
controllers/admin/AdminCustomersController.php
controllers/admin/AdminMetaController.php
controllers/admin/AdminModulesController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminProductsController.php
controllers/front/ParentOrderController.php
install-dev/theme/views/welcome.phtml
modules/blocknewproducts/blocknewproducts.php
modules/blocktopmenu/blocktopmenu.php
modules/importerosc/importerosc.php
modules/mailalerts/mailalerts.php
modules/shopimporter/shopimporter.php
modules/statsstock/statsstock.php
themes/default/css/product_list.css
2013-11-04 14:43:01 +01:00
48f00b2367
[-] BO : FixBug #PSCFV-10882 - Add json encode and decode smarty modifier via tools class
2013-10-30 18:28:17 +01:00
8aa369531e
// employee avatar
2013-10-30 18:02:10 +01:00
ed2546d07c
// Define language dir constant
2013-10-18 17:59:34 +02:00
785fe814bc
// Define Order state dir constante
2013-10-18 17:40:49 +02:00
2e2151a1bb
[-] CORE : error_get_last > PHP 5.1
2013-10-18 15:29:12 +02:00
338efcad7f
[-] CORE : $smarty->compile_check is not set to false, thanks @prestamodule
2013-10-09 12:14:49 +02:00
41d29b5445
[-] CORE : Addslashes on not translated strings for javascript js=1
2013-08-09 18:26:26 +02:00
a69d1c6d05
Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug
...
Conflicts:
controllers/admin/AdminPerformanceController.php
install-dev/data/xml/configuration.xml
2013-08-06 10:42:44 +02:00
0b99a7b331
added the smarty var to the hook_params, this makes it possible to create modules that can assign variables to the smarty local scope
2013-08-05 23:20:19 +02:00
159d0b3904
// improve exception
2013-07-26 19:15:37 +02:00
795976cadb
[*] FO: display Error500 if no database access
...
Sometimes, we have some problems with the MySQL Database and a Fatal Error is done. With this, we show the error500 template.
2013-07-14 14:59:25 +02:00
6368409ec6
[-] BO : fixed addslashes on tpl translations (compatibility between "slashes" and "js" parameters) #PSCFV-9427
2013-06-27 15:30:30 +02:00
534c10562f
[*] Installer : added cookie mode instead of session for the installer
2013-06-13 15:28:16 +02:00
f3000f6c65
[-] BO: Fix #PSCFV-6657 translations of overriden admin templates
2013-06-10 18:23:59 +02:00
d8f1226bd7
// Added error reporting level in dev mode
2013-05-23 10:50:22 +02:00
2c10ba5359
[*] Core: you can now pass a query string with php-cli which will merged with for cronjobs and other things
2013-05-15 14:46:40 +02:00
f8dd047f99
Merge pull request #371 from PrestaEdit/patch-26
...
[-] Config: juste more beautifull :)
2013-04-12 01:50:54 -07:00
8070739347
[-] Remove /
2013-04-11 18:18:15 +03:00
0e418f20cc
[*] FO: use subdirectory per template for smarty cache
2013-04-05 11:44:16 +02:00
1aab35ea29
[-] Config: juste more beautifull :)
2013-04-05 02:43:11 +03:00
cc996afc13
// sometimes shit happen and no language is set when a employee is not logged yet
2013-03-20 15:26:51 +01:00
2ba4c2c1cc
[-] BO : admin language is now based directly on the employee language instead of the cookie
2013-03-07 12:18:49 +01:00
b23a7fe061
// Delete empty override files - use IO/s for nothing
2013-02-15 18:04:52 +01:00
288021224c
// Moved html and js compression from global smarty config to front office smarty config
2013-02-13 14:38:43 +01:00
0ab55781ee
//remove modules_list.xml
2013-02-12 14:36:43 +01:00
588276cfb1
[-] FO: Fix fatal error when a customer is deleted and still logged
2013-02-06 11:56:23 +01:00
b73ca29b58
//added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit
2013-02-05 14:16:47 +01:00
606b3eedd5
[-] BO : error message on install module
2013-02-05 09:41:34 +01:00
d0d3180509
Merge branch 'dispatch_modules' into development
2013-02-04 18:20:24 +01:00
947397c69b
[+] BO : new display of payment modules in payment tab
2013-02-04 18:18:50 +01:00
25a64e9098
[-] BO : reduced error catching severity in the module tab
2013-01-29 10:16:02 +01:00
150f8ae528
[-] BO: Fix translations for overridden templates #PSCFV-7391
2013-01-23 14:58:37 +01:00
886f6d864b
[+] BO : Added customer language on the customer page
2013-01-14 16:45:21 +01:00
84b6222de1
[-] FO : Fix backslashes for smartyTranslate and js=1
2013-01-09 18:20:25 +01:00
9154984c78
[-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1
2013-01-09 10:26:16 +01:00
9edb5e8911
// initialize also the link in config.inc.php for retrocompatibility
2013-01-08 15:52:31 +01:00
8baf87eef5
// Welcome 2013
2013-01-04 11:19:03 +01:00
8bb41fb5f8
[-] BO: override the compile check to true for smarty in the BackOffice
2013-01-03 17:49:04 +01:00
ec760c6eef
// Handle fatal error in modules (after an upgrade for example)
2012-12-13 19:06:10 +01:00
bfff958b1f
Merge pull request #75 from @sebastienhouzet
2012-12-12 11:24:56 +01:00
4c31212fa5
// Only js strings need to add slashes
2012-12-10 16:05:38 +01:00
3497af985a
[-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution
2012-12-07 17:23:06 +01:00
da5c5fb4a0
[-] Core: Locales should be setted anywhere #PSCFV-5953
2012-12-04 15:40:17 +01:00
79782858f0
// smarty_modifier_truncate (__call)
2012-11-25 22:23:56 +01:00
be946319be
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
gRoussac