dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph

85 Commits

Author SHA1 Message Date
Jerome Nadaud
0448ee697f // Merging PR 1070 from DevNet 2013-12-02 15:23:29 +01:00
Damien Metzger
9ad56871de Merge pull request #1004 from djfm/bootstrap 
// when adding a translation pack, do not install translations for modules that are not on the disk
 2013-11-26 01:31:24 -08:00
Kevin Granger
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
fram
64e84ff296 // when adding a translation pack, do not install translations for modules that are not on the disk 2013-11-20 17:35:09 +01:00
fram
743c4f4607 [*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'iso' code, allows to distinguish between chinese variants etc. 2013-11-12 14:59:36 +01:00
emilien-puget
92c2f6953f changed path from dirname(__FILE__) to PS_ROOT_DIR 2013-10-24 11:44:52 +02:00
Damien Metzger
84d8ccfa2b // Fixed language code consistency 2013-09-27 10:25:37 +02:00
Damien Metzger
95a2b2a8a8 [*] BO : improved automatic language creation 2013-09-25 17:07:18 +02:00
gRoussac
6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack 2013-09-03 18:20:58 +02:00
gRoussac
98f60d039b // fix warning 2013-09-03 12:29:17 +02:00
Rémi Gaillard
598469e41e // typo debug 2013-08-27 15:38:29 +02:00
Vincent Augagneur
ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Damien Metzger
415ca83b62 // Code cleaning 2013-08-19 15:23:43 +02:00
Damien Metzger
1a81191c09 // Code cleaning 2013-08-19 15:14:05 +02:00
Rémi Gaillard
3d591be8c6 [-] Core: Fix language link with multishop from another shop #PSCFV-10063 2013-08-14 11:25:46 +02:00
Damien Metzger
78ddec3ac7 [-] BO : translation copy is now easier #PSCFV-8886 2013-07-18 18:51:37 +02:00
Damien Metzger
c0c6c10bba [-] IN : fixed local install without connection #PSCFV-9286 #PSCFV-9709 2013-07-09 10:21:22 +02:00
Damien Metzger
d656297884 // Removed call to a deprecated file 2013-07-01 14:00:01 +02:00
Damien Metzger
534c10562f [*] Installer : added cookie mode instead of session for the installer 2013-06-13 15:28:16 +02:00
gRoussac
a04e6b1a67 [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 18:13:13 +02:00
Rémi Gaillard
6f901cea37 [-] BO: Fix language deletion with multishop when shops still associate to the language #PSCFV-9244 2013-05-24 11:28:07 +02:00
Rémi Gaillard
a172632600 // Fix smarty cache after modules translation update 2013-04-17 14:44:20 +02:00
Rémi Gaillard
a5f5ebb1d8 [-] Core: clean Language:: after adding a new lang 2013-03-26 16:06:50 +01:00
vAugagneur
a07a3204ea //fix install bug when no internet connection 2013-03-26 10:46:44 +01:00
Rémi Gaillard
2120d1f948 // remove error on adding language if no htaccess 2013-03-25 16:24:00 +01:00
vAugagneur
fc2cb9659f //small fix 2013-03-25 15:15:10 +01:00
Rémi Gaillard
ecf433b9b8 // Another fix for installation with safe_mode 2013-03-22 15:20:40 +01:00
Rémi Gaillard
36d2e58a90 // small fix for language installation 2013-03-22 14:46:19 +01:00
Rémi Gaillard
2dac1e211c // install languages on installer part 2 2013-03-21 18:32:27 +01:00
Rémi Gaillard
8244e15408 // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
ef0eb49ba9 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes 2012-12-18 14:59:34 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01: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
2498920c84 // Fixed what is I hope the last image bug 2012-09-27 10:09:15 +00:00
dMetzger
9f2800d0e9 // Improved localization pack import at the installation #PSCFV-4404 2012-09-26 08:12:54 +00:00
lLefevre
4eeae0fd87 [-] BO : fix #PSCFV-4045 2012-09-25 15:23:28 +00:00
lLefevre
9a2bc7cecb [-] BO : #PSCFV-4356 : index.php added when export translations 2012-09-25 08:11:42 +00:00
dMetzger
72d1bd6e92 [-] Installer : deprecated tab removed in the 1.4 > 1.5 upgrade #PSCFV-3564 2012-08-08 13:47:01 +00:00
vAugagneur
07b11f2d72 //fixed multishop CRUD bug 2012-07-24 16:45:52 +00:00
mDeflotte
4c5cce43e1 [-] BO : #PSCFV-3000 - Send an email on changing an order from the BO 2012-07-12 12:05:19 +00:00
lLefevre
37d60956fa // Add tabs file when add a new language 2012-07-04 09:47:24 +00:00
lLefevre
b6f312233c // Add tabs.php when use getFilesList() method in LanguageCore class 2012-06-12 12:27:23 +00:00
rMalie
69492b2b53 // Allow to force routes #PSCFV-2592 2012-05-28 13:41:00 +00:00
tDidierjean
271d8e8d02 // revert multishop declaration in definitions 2012-05-18 15:03:30 +00:00
tDidierjean
c7c7bc7a08 [-] BO : fix bug #PSCFV-2397 - broken language import with multishop 2012-05-18 08:51:57 +00:00
lLefevre
c7266617e8 [-] BO : fix #PSCFV-2344 2012-05-15 16:19:57 +00:00
rMalie
e580832934 // Use protected instead of private for classes we can override #PSCFV-1976 2012-04-26 08:55:55 +00:00
lLefevre
5ab1d83880 [-] BO : export pack of language : add override of PDF file lang 2012-03-15 10:05:12 +00:00