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

93 Commits

Author SHA1 Message Date
gRoussac
8370c18fe8 [-] CORE : Remove notices on ob clean 2013-11-28 11:11:49 +01: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
Damien Metzger
a3e1fdb690 // Install 2013-11-18 19:22:10 +01:00
Damien Metzger
36baadad1a // Set to new fixtures 2013-11-18 18:51:11 +01:00
Damien Metzger
5ef4b8eddc // Installer optimization 2013-11-18 12:12:14 +01:00
Rémi Gaillard
b5eb7c5c28 // typo 2013-11-12 16:25:13 +01:00
fram
ab730dc3da // do not use sprintf when it is useless 2013-11-12 09:21:05 +01:00
gRoussac
c452444620 [-] IN : Could not install when session_start() does not fail on ajax requests 2013-11-04 15:47:29 +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
Rémi Gaillard
edf54eb2ca // re-generate class_index on the first step of install 2013-10-28 18:43:02 +01:00
Damien Metzger
180a778e51 [*] Installer : replaced radio buttons by a select for the installer language list (too many languages) 2013-10-08 17:06:02 +02:00
Vincent Augagneur
ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Damien Metzger
4de8013b5e // Fixed phone number in installer 2013-08-22 12:19:32 +02:00
Damien Metzger
1a81191c09 // Code cleaning 2013-08-19 15:14:05 +02:00
Rémi Gaillard
faec5a9226 // small change on fixtures installation 2013-08-05 20:33:39 +02:00
gRoussac
41219ad258 [-] INSTALLLER : Remove seesion name based on base_uri 2013-07-01 19:01:49 +02:00
Damien Metzger
5335820915 // Fixed sessions/cookies 
// Added support iframe
 2013-06-24 11:51:36 +02:00
Damien Metzger
75526c4bca // Changed the way the cookie mode is activated in the installer 2013-06-24 10:54:22 +02:00
Damien Metzger
be0d6f1c6c // Just to be sure that we will not have any regression 2013-06-13 15:35:17 +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
05767a213e [*] Installer: you can now choose to send an email to the administrator after installation with php-cli 2013-06-04 14:21:18 +02:00
gRoussac
b2bb233dc9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 14:49:20 +02:00
gRoussac
dd2d7491b4 [-] INSTALLER : Prevent crash when populating data, MACOSX OS creates hidden files 2013-05-23 14:49:07 +02:00
Damien Metzger
8d012e30d4 // Inverted 2 steps in the installer 2013-05-22 16:55:01 +02:00
Rémi Gaillard
eafaf2de03 // small changes in installer 2013-04-15 14:33:20 +02:00
Rémi Gaillard
0ba95d6989 // small changes on php cli installer 2013-04-02 17:28:45 +02:00
Rémi Gaillard
f29a77cbe8 [*] Installer: Add PHP CLI installer 2013-03-29 14:28:48 +01:00
Rémi Gaillard
5dc31491ca [-] Installer: Install only the language choosen in the installer 2013-03-21 15:17:07 +01:00
Damien Metzger
479e8dc17d [-] Installer : Fixed languages parsing 2013-02-27 17:56:47 +01:00
Damien Metzger
f4bf4c47a9 [*] Installer : installer improvements - Step 1 2013-02-21 11:05:47 +01:00
Rémi Gaillard
b77cfcdaef // images.inc.php don't need to be called anymore 2013-02-20 17:54:12 +01:00
gRoussac
c6c27548f4 [-] CORE : file_put_contents() returns the number of bytes that were written to the file, or FALSE on failure. 2013-02-06 19:21:23 +01:00
Damien Metzger
7b6b9ceaf6 [*] Installer : Automatically drop the system compatibility check when everything's alright 
// Fixed 'next' button when the page is refreshed
 2013-02-01 17:47:51 +01:00
Rémi Gaillard
3f4f5f5df0 [*] Installer: pre-compile the smarty templates to improve the loading time of first connection 2013-01-11 18:13:28 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01: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
lLefevre
f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
vAugagneur
5cc1cfbf41 [-] INSTALLER : fixed bug #PSCFV-4809 2012-10-12 09:55:31 +00:00
vAugagneur
56d4263cb9 //small fix on quantity with installer 2012-10-04 14:36:21 +00:00
dMetzger
84b0aa79b2 // Changed image system to new default + #PSCFV-4068 2012-09-24 09:08:57 +00:00
dMetzger
e36a16bcbc // Fix previous commit 2012-09-21 16:04:14 +00:00
sLorenzini
4896b787f3 // Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242 2012-09-21 14:59:51 +00:00
dMetzger
3e32c023ef [-] FO : fixed cache management conflict for packed product #PSCFV-3294 2012-08-10 14:26:15 +00:00
dMetzger
9c15151d89 // Changed the way the multistore associations are loaded, far from perfect, but still better and overridable 2012-07-10 07:11:16 +00:00
rMalie
41f03792d6 // Add a warning in welcome page for installer if use has already a previous version of PrestaShop installed #PSCFV-2161 2012-06-04 09:45:52 +00:00