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

372 Commits

Author SHA1 Message Date
Damien Metzger
e4fe5f6df6 // Fixed htmlentities in KPIs 2013-11-05 16:01:48 +01:00
Kevin Granger
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
Jerome Nadaud
5760718b85 // Add Save button to page header toolbar 2013-10-28 15:55:58 +01:00
Damien Metzger
e9a802cf23 [*] BO : Added the number of associated products in the product attachments list 2013-10-25 18:04:27 +02:00
ldecoker
7cbaada844 [BO][-] Notice messages when accessing the BO translation page 
When accessing the translation part with "core translation" , you got 2 errors:
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in controllers\admin\AdminTranslationsController.php on line 1018

Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in \controllers\admin\AdminTranslationsController.php on line 1026

It's because the variable $this->theme_selected is not set for that case.
 2013-10-22 17:00:56 +02:00
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	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/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Damien Metzger
4505387046 // Try to fix regexp issues with some PHP configurations 2013-10-10 18:41:50 +02:00
Damien Metzger
9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
Damien Metzger
38143e1245 // Fixed stats bug (bad id for ajax request) 2013-10-09 10:05:24 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Daniel
fa88a0bd93 Update AdminTranslationsController.php 
Fixes issue where path is not printed when error with email template saves occur.
 2013-10-08 20:54:52 +08:00
Rémi Gaillard
2899dfba5e // Fix AdminTranslationsController::addNewTabs() 2013-10-08 14:53:02 +02:00
Damien Metzger
650c18e9f7 // Added Translations KPIs 2013-09-27 14:51:12 +02:00
Jerome Nadaud
3107a4c3f0 // Translations 2013-09-16 15:32:49 +02:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +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
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
Rémi Gaillard
e6a819e5dd // Fix double quote translations 2013-08-07 11:29:34 +02:00
Damien Metzger
b701acc8cf // Clean language pack retrieval 2013-08-06 16:15:30 +02:00
Sarah Lorenzini
635076a7ad // update localization tab 2013-07-30 17:45:50 +02:00
Sarah Lorenzini
816153687c // update localization tab 2013-07-30 12:25:20 +02:00
gRoussac
918ceb3ed5 // norms 2013-07-29 19:15:47 +02:00
Guillaume DELOINCE
8ddd592da1 [-] BO : Fix while of translation, to find in folder if translation exists 2013-07-29 19:00:57 +02:00
Francois Gaillard
2e3f13db95 [-] Controller : AdminTranslationsController - Fixed bug with simple & double quotes 2013-07-23 18:47:35 +02:00
Damien Metzger
78ddec3ac7 [-] BO : translation copy is now easier #PSCFV-8886 2013-07-18 18:51:37 +02:00
gRoussac
c9d2cf8ed2 Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate 
Conflicts:
	admin-dev/header.inc.php
 2013-07-17 16:31:49 +02:00
Gregory Roussac
c89281166b Merge pull request #467 from PrestaEdit/patch-40 
[-] BO : Controller: AdminTranslationsController / Back translations
 2013-07-12 09:23:29 -07:00
Damien Metzger
d772d97bfa [-] BO : you can now have different mail topic for one mail template #PSCFV-9617 2013-07-11 14:27:40 +02:00
Gregory Roussac
1a6518689c Merge pull request #415 from ccauw/patch-11 
[-] BO : Fix bug #PSCFV-8987 in BO translations when Windows OS
 2013-07-08 01:34:48 -07:00
Damien Metzger
8f01b35f46 [-] BO : fixed translation and languages issues 2013-06-27 17:51:25 +02:00
PrestaEdit
6ae0dbb4ca [*] BO: use Translate::getAdminTranslation instead of translate() 2013-06-01 00:21:28 +02:00
PrestaEdit
58e5ea606c [~] Controller: AdminTranslationsController / Back translations 
Files login.php and password.php are now redirect to an AdminController. No need to check it anymore.
 2013-06-01 00:46:24 +03:00
gRoussac
a04e6b1a67 [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 18:13:13 +02:00
Damien Metzger
9ce563e332 Merge pull request #419 from e-gaulue/Module_translation_patch 
[-] BO : don't show translations for module overrides in admin modules translation page
 2013-05-06 07:09:58 -07:00
Edouard Gaulué
0442bee919 [-] BO : don't show unecessary tpl module translations - complience with documentation 2013-05-02 18:46:13 +02:00
Edouard Gaulué
444a99f564 [-] BO : don't show translation for class/controler overrides when on modules translation page 2013-05-02 18:21:54 +02:00
ccauw
051adc7b36 [-] BO : bug in BO translations when Windows OS 
[-] BO : bug in BO translations when Windows OS

Impossible to translate the strings of the back office in the directory override/controllers/admin/...
under windows environment.

The statement " $parent_class = explode(DIRECTORY_SEPARATOR,..) " returns wrong result under windows environment. because the path name has '/' and '\' chars.

$parent_class contains bad values and the string "override" is not found.
 2013-04-29 16:00:55 +03:00
Damien Metzger
94090e2a39 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger
527f87a691 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger
43a897436a [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger
c587934e25 [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger
1921668596 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
Damien Metzger
6251815c37 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
Damien Metzger
4df54ce743 // Fixed warning in translations 2013-04-24 16:27:45 +02:00
Damien Metzger
7cafc7bdf5 // Fixed warning in translations 2013-04-24 16:27:45 +02:00
Damien Metzger
71f0986535 // Small translation fix 2013-04-24 15:45:58 +02:00
Damien Metzger
feb1edc076 // Small translation fix 2013-04-24 15:45:58 +02:00
Damien Metzger
64684fe6c9 // Small fix translations 2013-04-24 15:29:00 +02:00
Damien Metzger
75dd65f207 // Small fix translations 2013-04-24 15:29:00 +02:00