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

189 Commits

Author SHA1 Message Date
Mikko Hellsing
addb65eb5f [-] BO : Set correct table alias name in updatePosition 2013-12-11 02:09:45 +01:00
rGaillard
adf158a0c3 // small fix 2013-12-06 17:31:09 +01:00
Jerome Nadaud
ddcade285f [-] CORE : Ensure correct parent category for home categories 2013-12-05 18:37:49 +01:00
gRoussac
96fd3f3d32 [+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570 2013-12-04 17:41:10 +01:00
Damien Metzger
8dc4eb5c03 [-] BO : Category code cleaning, fixing, moving and multistore-ing 2013-11-27 17:40:35 +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
9c5303df1d // Deactivate customer groups in the install (automatically reactivated if you add a group or set a reduction) 2013-11-21 14:57:55 +01:00
Damien Metzger
9f1c39a7d6 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1] 2013-11-21 12:32:51 +01:00
gRoussac
036e2362c9 [+] CORE : Fixed cache_id 2013-11-12 17:09:38 +01:00
gRoussac
a7869a1f06 [*] CORE : Remove duplicate SQL queries 2013-11-11 13:41:23 +01: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
Krystian Podemski
d87c816038 [*] CORE : Increasing the length of link_rewrite & name in Category.php 
In database this fields have varchar(128) so let's give the user full size of fields
 2013-10-03 10:20:45 +02:00
Jerome Nadaud
49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
Jerome Nadaud
e0d33eae9e // Categories Tree changes 2013-09-10 18:40:05 +02:00
Jerome Nadaud
e91460b8fe [-] BO : Change Nested categories 2013-09-09 18:58:32 +02:00
Jerome Nadaud
7d61be252f [+] BO : Get categories in nested array 2013-09-03 15:27:58 +02:00
Damien Metzger
3556e75ce3 // Moved useless code into the block where it is useful 2013-07-22 10:49:41 +02:00
Rémi Gaillard
958d92c9fa [*] BO: Add an option to allow iframes on descriptions 2013-07-18 18:31:31 +02:00
Gregory Roussac
8fcca7999d Merge pull request #502 from axometeam/patch-2 
[-] BO : Prevent false error for product duplication
 2013-07-12 01:29:39 -07:00
Damien Metzger
25dc4e25ac // Code cleaning 2013-07-02 11:48:48 +02:00
Axome
6e383a2d38 Prevent false error for product duplication 2013-06-17 10:16:13 +02:00
Rémi Gaillard
88369ef1f6 [-] FO: Fix Category::getSubCategories() default group used #PSCFV-9356 2013-06-03 18:18:54 +02:00
Rémi Gaillard
8b95e9f2ca [-] BO: Root category should be the shop category and not the higher category with multiple root and without multishop #PSCFV-8860 2013-05-17 17:10:11 +02:00
Rémi Gaillard
5f181c8e4c [-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images 2013-03-20 20:12:28 +01:00
vAugagneur
1635178391 //small fix on Category::cleanPositions() 2013-03-08 17:35:41 +01:00
Rémi Gaillard
1ce97b8463 [-] FO: Fix categories and products restriction for unidentified customers after upgrade 2013-02-14 16:04:36 +01:00
vAugagneur
1959075a27 [-] BO - fixed bug #PSCFV-5549 - 2013-01-16 15:50:52 +01:00
Shagshag
6516c768d9 _USER_ID_LANG_ doesn't exist anymore 2013-01-04 21:34:02 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Damien Metzger
66dcbed995 [-] Fo : fixed warning in empty categories 2012-12-21 10:55:56 +01:00
Rémi Gaillard
a8096c2800 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
Rémi Gaillard
cba080ccd8 [-] FO: Fix: many fixes - domain for cookies with different url for ssl / add to cart button for minimal quantities with product attributes 2012-11-20 19:05:21 +01:00
rGaillard
b9289df687 [-] Core: Fix products duplication when using multiple taxe rule on the same country 2012-11-16 16:08:21 +00:00
rGaillard
22b8a891cc [-] FO: Fix #PSCFV-5143 2012-10-23 08:29:24 +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
rGaillard
bc3aa99169 [-] Core: fix cache product group reduction #PSCFV-4974 2012-10-16 17:48:30 +00:00
vAugagneur
b57bb9c869 [-] BO : fixed bug #PSCFV-4472 2012-10-02 07:59:44 +00:00
rGaillard
c23c314dc5 // small fix 2012-09-26 14:21:44 +00:00
rGaillard
23a225bf97 // Fix #PSCFV-4384 2012-09-26 12:25:59 +00:00
rGaillard
0323166691 // Fix PSCFV-4384 2012-09-26 12:23:14 +00:00
rGaillard
798e89facb // Small fixes 2012-09-17 16:24:26 +00:00
rGaillard
c54e977255 // Some files was missing in last commit............................................ 2012-09-14 14:28:04 +00:00
vAugagneur
0c6d7c37a9 [-] CORE : fixed bug #PSCFV-4002 - Error in webservices with /api/categories/1 2012-09-14 08:28:14 +00:00
rGaillard
a58cb586e3 // Fix #PSCFV-4052 2012-09-13 15:23:15 +00:00
dMetzger
3e0a0c38aa [-] BO : children categories were not really deleted #PSCFV-4028 2012-09-12 13:30:40 +00:00
rGaillard
479861bcc7 // Fix bugs with category positions 2012-09-11 16:33:21 +00:00
vAugagneur
76bf4353ef [-] CORE : fixed bug #PSCFV-3889 2012-09-11 15:14:51 +00:00
rGaillard
f7eb63d8be // small fix 2012-08-30 16:44:28 +00:00