gRoussac
|
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 |
|
Davy Rolink
|
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 |
|
Rémi Gaillard
|
159d0b3904
|
// improve exception
|
2013-07-26 19:15:37 +02:00 |
|
PrestaEdit
|
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 |
|
Damien Metzger
|
6368409ec6
|
[-] BO : fixed addslashes on tpl translations (compatibility between "slashes" and "js" parameters) #PSCFV-9427
|
2013-06-27 15:30:30 +02:00 |
|
Damien Metzger
|
534c10562f
|
[*] Installer : added cookie mode instead of session for the installer
|
2013-06-13 15:28:16 +02:00 |
|
Rémi Gaillard
|
f3000f6c65
|
[-] BO: Fix #PSCFV-6657 translations of overriden admin templates
|
2013-06-10 18:23:59 +02:00 |
|
Damien Metzger
|
d8f1226bd7
|
// Added error reporting level in dev mode
|
2013-05-23 10:50:22 +02:00 |
|
Rémi Gaillard
|
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 |
|
Vincent Augagneur
|
f8dd047f99
|
Merge pull request #371 from PrestaEdit/patch-26
[-] Config: juste more beautifull :)
|
2013-04-12 01:50:54 -07:00 |
|
PrestaEdit
|
8070739347
|
[-] Remove /
|
2013-04-11 18:18:15 +03:00 |
|
Rémi Gaillard
|
0e418f20cc
|
[*] FO: use subdirectory per template for smarty cache
|
2013-04-05 11:44:16 +02:00 |
|
PrestaEdit
|
1aab35ea29
|
[-] Config: juste more beautifull :)
|
2013-04-05 02:43:11 +03:00 |
|
Rémi Gaillard
|
cc996afc13
|
// sometimes shit happen and no language is set when a employee is not logged yet
|
2013-03-20 15:26:51 +01:00 |
|
Damien Metzger
|
2ba4c2c1cc
|
[-] BO : admin language is now based directly on the employee language instead of the cookie
|
2013-03-07 12:18:49 +01:00 |
|
Rémi Gaillard
|
b23a7fe061
|
// Delete empty override files - use IO/s for nothing
|
2013-02-15 18:04:52 +01:00 |
|
Damien Metzger
|
288021224c
|
// Moved html and js compression from global smarty config to front office smarty config
|
2013-02-13 14:38:43 +01:00 |
|
vAugagneur
|
0ab55781ee
|
//remove modules_list.xml
|
2013-02-12 14:36:43 +01:00 |
|
Rémi Gaillard
|
588276cfb1
|
[-] FO: Fix fatal error when a customer is deleted and still logged
|
2013-02-06 11:56:23 +01:00 |
|
vAugagneur
|
b73ca29b58
|
//added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit
|
2013-02-05 14:16:47 +01:00 |
|
vAugagneur
|
606b3eedd5
|
[-] BO : error message on install module
|
2013-02-05 09:41:34 +01:00 |
|
vAugagneur
|
d0d3180509
|
Merge branch 'dispatch_modules' into development
|
2013-02-04 18:20:24 +01:00 |
|
vAugagneur
|
947397c69b
|
[+] BO : new display of payment modules in payment tab
|
2013-02-04 18:18:50 +01:00 |
|
Damien Metzger
|
25a64e9098
|
[-] BO : reduced error catching severity in the module tab
|
2013-01-29 10:16:02 +01:00 |
|
Rémi Gaillard
|
150f8ae528
|
[-] BO: Fix translations for overridden templates #PSCFV-7391
|
2013-01-23 14:58:37 +01:00 |
|
Damien Metzger
|
886f6d864b
|
[+] BO : Added customer language on the customer page
|
2013-01-14 16:45:21 +01:00 |
|
gRoussac
|
84b6222de1
|
[-] FO : Fix backslashes for smartyTranslate and js=1
|
2013-01-09 18:20:25 +01:00 |
|
vAugagneur
|
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 |
|
Rémi Gaillard
|
9edb5e8911
|
// initialize also the link in config.inc.php for retrocompatibility
|
2013-01-08 15:52:31 +01:00 |
|
Francois Gaillard
|
8baf87eef5
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
Rémi Gaillard
|
8bb41fb5f8
|
[-] BO: override the compile check to true for smarty in the BackOffice
|
2013-01-03 17:49:04 +01:00 |
|
Damien Metzger
|
ec760c6eef
|
// Handle fatal error in modules (after an upgrade for example)
|
2012-12-13 19:06:10 +01:00 |
|
vAugagneur
|
bfff958b1f
|
Merge pull request #75 from @sebastienhouzet
|
2012-12-12 11:24:56 +01:00 |
|
Rémi Gaillard
|
4c31212fa5
|
// Only js strings need to add slashes
|
2012-12-10 16:05:38 +01:00 |
|
Rémi Gaillard
|
3497af985a
|
[-] FO: FIX #PSCFV-5703 quotes in modules translations break javascript execution
|
2012-12-07 17:23:06 +01:00 |
|
Rémi Gaillard
|
da5c5fb4a0
|
[-] Core: Locales should be setted anywhere #PSCFV-5953
|
2012-12-04 15:40:17 +01:00 |
|
PrestaEdit
|
79782858f0
|
// smarty_modifier_truncate (__call)
|
2012-11-25 22:23:56 +01:00 |
|
vAugagneur
|
be946319be
|
//remove svn keyword @version Release: $
|
2012-11-22 11:57:40 +01:00 |
|
DamienMetzger
|
d6df4fec2d
|
[-] FO : cookie lifetime is now set with the front end lifetime value instead of the BO value #PSCFV-5668
|
2012-11-22 10:12:42 +01:00 |
|
Rémi Gaillard
|
cba080ccd8
|
[-] FO: Fix: many fixes - domain for cookies with different url for ssl / add to cart button for minimal quantities with product attributes
|
2012-11-20 19:05:21 +01:00 |
|
rGaillard
|
e2f72b6b1e
|
// Move settings of MODE_DEV in defines.inc.php
|
2012-11-08 16:28:21 +00:00 |
|
rGaillard
|
f2f4e7defb
|
// display_errors and sql debug is automatically set to on when dev mode is activated
|
2012-10-29 11:08:19 +00:00 |
|
vAugagneur
|
68611da5af
|
//
|
2012-10-26 13:20:14 +00:00 |
|
vAugagneur
|
734c0de517
|
//
|
2012-10-26 13:02:37 +00:00 |
|
lLefevre
|
ece74e27c2
|
// Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 10:13:43 +00:00 |
|
lLefevre
|
07ca3c5258
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:35:11 +00:00 |
|
lLefevre
|
6588f9514c
|
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:29:43 +00:00 |
|
lLefevre
|
398d345362
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
dMetzger
|
6a5f5aba4a
|
[-] BO : changed misleading description in the performance tab #PSCFV-4281
|
2012-09-25 10:07:57 +00:00 |
|
rGaillard
|
d0fc9eb928
|
// FIX #PSCFV-4302
|
2012-09-24 12:02:17 +00:00 |
|