dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,158 Commits 9 Branches 19 Tags
85dc552667a5f7cef30dfbec862ea0920ff043e6
Commit Graph

98 Commits

Author SHA1 Message Date
Kevin Granger
1b2bab6943 // performance 2013-09-06 11:03:36 +02:00
Kevin Granger
3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
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
Francois Gaillard
29bbe81ae6 // CloudCache removed from AdminPerformanceController 2013-08-06 09:25:47 +02:00
Sarah Lorenzini
142006e69a // update advanced parameters 2013-08-02 15:10:58 +02:00
gRoussac
e59274fb2b [-] FO : Fix bug #PSCFV-7825 removing import of grid_prestashop.css and displaying errors in AdminPerformances 2013-04-03 15:20:15 +02:00
gRoussac
c3ce452405 [-] FO : Fix bug #PSCFV-7825 removing import of grid_prestashop.css and displaying errors in AdminPerformances 2013-04-03 15:20:15 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
gRoussac
c6784fa509 // wrong commit for ed09cee7b1 2013-03-12 14:48:28 +01:00
gRoussac
0749a6f29d // wrong commit for ed09cee7b1 2013-03-12 14:48:28 +01:00
gRoussac
ed09cee7b1 [*] BO : Set warning when trying to activate Xcache misconfigured 2013-03-12 14:41:07 +01:00
gRoussac
7d095f92c4 [*] BO : Set warning when trying to activate Xcache misconfigured 2013-03-12 14:41:07 +01:00
Damien Metzger
828563d228 // Added hook call in adminperformance 2013-03-12 12:19:22 +01:00
Damien Metzger
5907d4b8d7 // Added hook call in adminperformance 2013-03-12 12:19:22 +01:00
gRoussac
b2cdf51cc8 [*] BO : file_put_contents returns length when success not true 2013-03-12 12:09:47 +01:00
gRoussac
a83d8d0cd8 [*] BO : file_put_contents returns length when success not true 2013-03-12 12:09:47 +01:00
Damien Metzger
63ef3f3e8c // Moved layered rules from top to bottom in order to avoid conflicts 2013-03-12 10:17:10 +01:00
Damien Metzger
213b232278 // Moved layered rules from top to bottom in order to avoid conflicts 2013-03-12 10:17:10 +01:00
Damien Metzger
fd68d3b3d5 // Installer can be translated at /install-dev/dev/translate.php 2013-02-27 14:53:51 +01:00
Damien Metzger
52435c2fad // Installer can be translated at /install-dev/dev/translate.php 2013-02-27 14:53:51 +01:00
gRoussac
ebb576f014 [-] BO : 'MCached' is 'CacheMemcache' for PS_CACHING_SYSTEM_ 2013-01-30 17:30:21 +01:00
gRoussac
8b5793094a [-] BO : 'MCached' is 'CacheMemcache' for PS_CACHING_SYSTEM_ 2013-01-30 17:30:21 +01:00
gRoussac
6b691cb7a8 [-] BO : Fix bug #PSCFI-6902 fatal error when memcache not installed and Memcached previously activated 2013-01-30 16:28:11 +01:00
gRoussac
d74f9c837b [-] BO : Fix bug #PSCFI-6902 fatal error when memcache not installed and Memcached previously activated 2013-01-30 16:28:11 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
ed836e081c //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
vAugagneur
42f3587e8e //remove PS_HIGH_HTML_THEME_COMPRESSION and all code related to this option 2012-12-12 14:37:15 +01:00
DamienMetzger
1df709fcfd [*] BO : added backup of the settings file whenever there is a modification #PSCFV-5676 2012-11-23 10:16:48 +01:00
DamienMetzger
fc7d62eddf [*] BO : added backup of the settings file whenever there is a modification #PSCFV-5676 2012-11-23 10:16:48 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
c6a704f223 // small fix 2012-10-12 15:26:55 +00:00
rGaillard
d2fb0bd91e // small fix 2012-10-12 15:26:55 +00:00
dMetzger
f26b556cf5 [-] BO : changed misleading description in the performance tab #PSCFV-4281 2012-09-25 10:07:57 +00:00
dMetzger
6a5f5aba4a [-] BO : changed misleading description in the performance tab #PSCFV-4281 2012-09-25 10:07:57 +00:00
rGaillard
469e7934a7 // Fix #PSCFV-4103 2012-09-19 15:31:29 +00:00
rGaillard
5aef05b188 // Fix #PSCFV-4103 2012-09-19 15:31:29 +00:00
gCharmes
8630955f9e [+] BO : Add CloudCache in Performance Tab 2012-09-18 14:09:09 +00:00
gCharmes
bdbe2167ba [+] BO : Add CloudCache in Performance Tab 2012-09-18 14:09:09 +00:00
lLefevre
1da5ce07d4 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre
12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre
0d4ff05960 [-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages 2012-05-15 10:04:43 +00:00