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

56 Commits

Author SHA1 Message Date
Jerome Nadaud
9b241d5e1d // Add interface restriction in Autoload 2013-11-28 11:46:03 +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
Rémi Gaillard
f5cc6862cb // don't die on autoload 2013-11-04 18:08:24 +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
671062af07 // Add Disable overrides to debug mode 2013-10-31 18:41:56 +01:00
emilien-puget
92c2f6953f changed path from dirname(__FILE__) to PS_ROOT_DIR 2013-10-24 11:44:52 +02:00
Rémi Gaillard
e493305c47 // merge problem 2013-10-16 15:08:39 +02:00
Damien Metzger
49cdfb56c6 // Fix class_index generation 2013-10-11 11:15:14 +02:00
Rémi Gaillard
49a9f0bcaa // unlink class_index tmp file if not rename 2013-10-11 10:58:05 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	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/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Jerome Nadaud
0ba9704c21 // Fix class index error 2013-09-13 12:17:24 +02:00
Rémi Gaillard
5363e75238 // small fix 2013-09-13 12:13:12 +02:00
Rémi Gaillard
30591b7c28 // Typo 2013-09-12 15:04:47 +02:00
Rémi Gaillard
f9b1f0ab5e [*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists() 2013-09-12 15:03:23 +02:00
Rémi Gaillard
3e750490fe // chmod class_index 666 instead of 664 2013-09-11 15:16:15 +02:00
ha99y
75303e82e0 Suppress Error at rename 
If debugging  is one (_PS_MODE_DEV_ set to TRUE)
there is a warning on line 142 in /classes/Autoload.php at function
rename()
 2013-08-28 18:56:49 -07:00
gRoussac
7448d17c68 [*] CORE: can not delete class_index.php 2013-06-23 19:53:28 +02:00
Sébastien Bocahu
fd88ac76be [-] Fixes a race condition 
Fixes a race condition leading to file coruption and PHP crashes when
writing the cache index file.

Handles concurrency properly by using a temporary file and an atomic
rename() instead of file_put_contents(), which is not atomic, on a
file which is potentially accessed by many processes at the same time
 2013-04-26 14:28:01 +02:00
Damien Metzger
44a0afa34b // Added lock to class_index generation 2013-03-14 11:00:23 +01:00
Damien Metzger
8cab8685cd // PrestaShopException is not available in Autoload 2013-03-07 11:35:40 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Damien Metzger
c3c29e3abd [-] Core : cannot throw an exception in the autoload #PSCFV-6018 2012-12-14 14:28:33 +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
dMetzger
17988ab511 // Opti 2012-08-31 12:16:15 +00:00
aKorczak
8bead1af23 [-] WS : Multiple fix on Web Services 2012-08-31 09:41:22 +00:00
François Gaillard
0094fc3beb [-] Classes : Autoload, bug fix 2012-08-29 16:27:16 +00:00
dMetzger
d54d31463c // Opti 2012-08-29 14:22:23 +00:00
aFolletete
ebe3addddd // little optimization in autoloader, we exclude smarty classes of treatement 2012-05-21 15:18:59 +00:00
rMalie
9faeff1faa [+] MO: modules can now have override classes installed automatically #PSCFV-2036 (thank to phrasespot) 2012-05-11 12:41:30 +00:00
rMalie
a2f5ff05e8 // Fix autoload 2012-03-09 10:30:17 +00:00
rMalie
b63c91c992 // Fix write permissions verification on class_index #PSFV-598 2012-03-06 14:02:48 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
4f7b3d4550 [*] classes : new module architecture 2012-01-31 16:57:19 +00:00
rMalie
f87f846853 // Fix Exception in autoload 2012-01-26 13:15:42 +00:00
rMalie
f61b1fc877 // Fix potential issue on autoload if class_index is corrupted 2012-01-26 12:49:22 +00:00
rMalie
ccbf3acc8d // Normalize 2012-01-25 14:40:12 +00:00
rMalie
d6201e893b // Autoload class_index is now sorted 2012-01-13 13:57:16 +00:00
bMancone
d3d094a296 // Fixed pre-commit test.. 2012-01-11 18:08:49 +00:00
rMalie
baf4a68f1a // Test svn pre-commit 2012-01-11 17:29:08 +00:00
rMalie
78662a518a // Fix autoload for classes with several implements 2011-12-02 14:34:48 +00:00
rMalie
473f26bd13 [+] Classes: Add PHP exceptions support + handler 2011-09-27 12:10:47 +00:00
rMalie
ac9df4afdb // Fix controllers file names + add missing files in override/ + ControllerFactory class is now deprecated, use Controller instead + fix NoticationCore 2011-09-16 10:09:26 +00:00
fBrignoli
2e59d72884 // Norm 2011-09-14 15:33:14 +00:00
fBrignoli
9c71a3567f // debug 2011-09-13 13:59:44 +00:00
rMalie
5f7c2386bd // Normalization 2011-09-12 15:49:01 +00:00
fBrignoli
8f8ac0670d [*] Project : US + CA TaxSystem 2011-08-18 10:10:50 +00:00
fBrignoli
4fcf65d1ce // Exception removed 2011-08-16 15:53:04 +00:00
fBrignoli
98e766cabe // debug 2011-08-09 15:24:40 +00:00