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

50 Commits

Author SHA1 Message Date
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
gRoussac
c98b5e0c78 [*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski 2013-10-29 19:05:21 +01:00
Rémi Gaillard
8b1f9d0560 // small changes on admincms 2013-10-25 18:42:54 +02:00
Jerome Nadaud
f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00
Jerome Nadaud
07073afa1f // Fix CMS filter, reset and sort 2013-10-14 17:28:21 +02:00
Jerome Nadaud
45c7cb7757 // Cms categories list 2013-09-23 10:13:45 +02:00
Jerome Nadaud
64f1ba1e08 // Parameters fix 2013-09-18 16:36:33 +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
90091d4f2c [-] BO : Do not copy link_rewrite from title if cms already has one 2013-09-12 10:50:04 +02:00
Sarah Lorenzini
680497f1e3 // update preferences tab 2013-08-01 16:40:48 +02:00
Vincent Augagneur
453bb826ef [-] BO : fixed bug #PSCFV-9586 - Unable to sort CMS page in back office 2013-06-27 10:19:22 +02:00
vAugagneur
e9b8af0e97 [-] BO - fixed bug #PSCFV-8614 2013-04-18 15:14:37 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
DrÿSs'
a24374121b [-] BO: fixed bad set of display status set in AdminCMS 2013-03-04 16:15:29 +01:00
vAugagneur
109f16e026 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-27 09:49:08 +01:00
vAugagneur
d5329298b2 [-] BO : fixed bug #PSCFV-7871 - bad breadcrumb when create a new CMS 2013-02-27 09:48:51 +01:00
DrySs
00e889f711 [-] BO: fixed lots of UI bugs in CMS: 
- no more id_category (doesn't exists, it's id_cms_category)
- change category position now redirects in parent category (not at root category)
- change category status now redirects in parent category (not at root category)
- delete multiples category now redirects in parent category (not at root category)
- add form new category now auto select parent category (not root category)
- add a new category now redirects in parent category (not at root category)
- delete multiple categories now redirects in parent category (not at root category)
- now execute parent::postProcess() only if none action found (duplicate postProcess was done)
- now redirects to CMS form if found errors (not at root category)
- fixed unexists $object variable (was $cms) for saveAndStay
- delete multiple cms content now redirects in parent category (not at root category)
- change cms content position now redirects in parent category (not at root category)
- change cms content status now redirects in parent category (not at root category)
 2013-02-22 19:59:46 +01:00
DrÿSs'
0263e3b28d [*] BO: add a save and stay button in CMS edit page 
This button was missing to edit easily CMS pages.
 2013-02-22 15:47:50 +01:00
Damien Metzger
54843a3e21 // Changed CMS list behavior (edit instead of front office view) 2013-02-21 16:51:22 +01:00
djfm
385c593129 //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
vAugagneur
eb451604af [-] BO : fixed bug #PSCFV-5991 - CMS friendly URL does not automatically copied 2012-12-10 10:51:46 +01:00
vAugagneur
49e1a536e3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
vAugagneur
a1db83ef41 //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
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
54675df666 // ajax.php clean and bug fixes 2012-06-15 13:22:07 +00:00
mDeflotte
d80e5c9f52 // Remove undefined method called 2012-05-29 08:59:49 +00:00
mDeflotte
d938203474 [-] BO : #PSCFV-2568 - CmsController and CmsCategoriesController cannot be called dirrectly 2012-05-29 08:58:32 +00:00
vAugagneur
deb2dbbc1b [-] BO : fixed bug #PSCFV-2304 2012-05-14 12:56:33 +00:00
lLefevre
247ab71069 // Fix normalize and replace $_GET and $_POST by Tools::isSubmit() in CMS's controllers 2012-05-10 12:50:26 +00:00
lLefevre
18fa1ae264 [-] BO : #PSCFV-2286 : Added errors message when the CMS form isn't filled && normalize 2012-05-10 09:38:13 +00:00
rMalie
5b8e96602f // Use protected instead of private for classes we can override #PSCFV-1976 2012-04-26 08:55:55 +00:00
lLefevre
537a1fd248 [-] BO : #PSFV-827 : Fix translations 2012-04-10 09:52:54 +00:00
tDidierjean
c442f0365a // Rename fieldsDisplay to fields_list part1 (timeout) 2012-03-29 16:26:54 +00:00
tDidierjean
b2e056ec8b [*] BO : #PSFV-481 - Refactor HelperList position management 2012-03-13 16:22:23 +00:00
François Gaillard
0457a4281d [-] BO : BugFix - Alert message for new CMS pages + errors 2012-02-29 13:43:46 +00:00
bMancone
c1cf959871 // Fixed CMS 2012-02-29 09:11:13 +00:00
vAugagneur
9f4e580594 [*] BO : cms meta keywords now use tagify 2012-02-29 09:08:37 +00:00
bMancone
069b4add05 // Fixed revision 13573 2012-02-28 13:13:47 +00:00
rMalie
5788d00d96 // Improve shop associations in BO 2012-02-24 09:11:18 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
François Gaillard
f5ef482183 [-] BO : #PSFV-492 : BugFix CMS pages & categories 2012-02-22 16:57:51 +00:00
mMarinetti
1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
rMalie
26a012c62e // Normalize 2012-01-25 16:39:34 +00:00
tDidierjean
8a757aaa9c // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
mMarinetti
e5eb476caf // fix rte in AdminCMSContent 2011-12-28 16:42:21 +00:00
tDidierjean
aefa581603 // Rename AdminController methods initForm() initList() etc. to renderForm() renderList() 2011-11-30 11:06:38 +00:00
tDidierjean
c44e9b8587 // Fix AdminCmsControllers 2011-11-21 14:30:26 +00:00
tDidierjean
055f477cf0 // Change CMS controllers to lowercase and restore translations 2011-11-21 13:36:45 +00:00