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

104 Commits

Author SHA1 Message Date
Jerome Nadaud
611cfd90a0 [-] BO : FixBug #PSCSX-40 categories unchanged after select a new home category 2013-11-25 12:08:34 +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
gRoussac
6393746f04 [-] BO : 406 when mod_security follow up 034e6a7e7f 2013-11-14 11:43:05 +01:00
Jerome Nadaud
f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
Damien Metzger
3287e1664c // Added target blank in a transverse link 2013-08-21 10:18:46 +02:00
Rémi Gaillard
17579de481 [-] FO: Fix #PSCFV-9325 all was included on 301 for root deprecated controllers 2013-06-27 15:41:37 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
vAugagneur
46aa9eeca7 [-] BO : fixed bug #PSCFV-6623 - fixed Parse error 2013-01-16 10:36:24 +01:00
vAugagneur
61b3135f6b [-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding 2013-01-15 17:15:30 +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
Rémi Gaillard
7cd629b15b [-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885 2012-12-11 12:01:04 +01:00
Rémi Gaillard
b2f01058a8 [-] BO: Fix various bugs in categories ntree generation 2012-12-11 11:19:21 +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
vAugagneur
5d6d5ffb45 [-] BO : fixed bug #PSCFV-4653 2012-10-11 15:16:00 +00:00
rGaillard
1d680976e8 [-] BO: Fix #PSCFV-3711 2012-08-22 09:36:06 +00:00
rGaillard
b3fc737511 [-] BO: Fix #PSCFV-3711 2012-08-22 09:31:27 +00:00
dMetzger
1351081843 // fixed #PSCFV-2987 2012-08-21 15:02:40 +00:00
vAugagneur
c4021363f3 //small fix 2012-08-06 15:08:14 +00:00
vChabot
160943868a [-] BO : BugFix : #PSCFV-3537 : Product Indexing lost when editing a product 2012-08-06 14:09:44 +00:00
vAugagneur
a458d2bdb9 //fixed create root category 2012-08-02 14:53:47 +00:00
vAugagneur
093723aadc //small link fix 2012-08-01 16:08:35 +00:00
vAugagneur
3ce665375f //Added more info on category for shop configuration 2012-08-01 12:58:58 +00:00
vAugagneur
f92652f2c5 //fixed multishop CRUD bug 2012-07-24 16:45:52 +00:00
mDeflotte
4fd35fc7c1 [-] BO : #PSCFV-3206 - Add description for the field "Shop name" on the shop configuration. 2012-07-24 07:42:50 +00:00
rGaillard
bfc1b96be4 // This is now not possible to delete default shop 2012-07-19 16:24:59 +00:00
lLefevre
1da5ce07d4 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
rMalie
a0efaf6af7 // Fix critical spelling bug on jquery cookie file name 2012-06-12 13:12:32 +00:00
rMalie
6309e8f9d9 // Fix multishop access when option is not enabled #PSCFV-2701 2012-06-07 09:40:48 +00:00
rMalie
8922588507 // Rename jquery.cookie with jquery.cooki (because of apache security mod ...) 2012-06-05 13:27:53 +00:00
rMalie
920464bcc3 // The capacity of enable / disable shops and shop groups is temporary disabled 2012-06-01 07:46:01 +00:00
rMalie
2cbfd5f0c2 // The capacity of enable / disable shops and shop groups is temporary disabled 2012-05-30 12:30:08 +00:00
rMalie
98eefeb46c // Automatically duplicate some shop data if the primary data is checked (E.g. export carriers langs if carrier is checked) #PSCFV-2616 2012-05-30 08:06:57 +00:00
mDeflotte
3d44e31425 [-] BO : #PSCFV-2562 - Select all categories on creating a new shop 2012-05-24 16:44:00 +00:00
fBrignoli
d29ad8a556 [-] BO : Bug fixed related to #PSCFV-2490 - Default group should be copied 2012-05-21 15:51:50 +00:00
vChabot
902dbec956 [-] BO : BugFix : #PSCFV-2476 : Shop creation : adding an error message if you do not select at least the root category 2012-05-21 12:29:37 +00:00
vChabot
71b901e4e0 [-] BO : BugFix : #PSCFV-2441 : Shop creation : unable to save parameters 2012-05-19 13:52:52 +00:00
vChabot
b536245d4c // little fix render admin category tree with selectedCat var 2012-05-10 14:43:20 +00:00
vChabot
29dbb9abca [-] BO : BugFix : #PSCFV-2209 : Multishop : cannot delete shops with dependencies 2012-05-10 14:09:11 +00:00
rMalie
7757b3e019 // Fix notice in AdminShopController 2012-05-10 13:16:07 +00:00
rMalie
e30c390d39 // Fix notice on shop creation page 2012-05-09 15:42:57 +00:00
rMalie
d7337c4d4f // Multishop interface reworked 2012-05-09 15:05:39 +00:00
rMalie
36be5ec803 // Norm 2012-04-26 14:13:59 +00:00
rMalie
cd76ebbf1e // Remove shop url from .htaccess after shop deletion #PSCFV-2034 2012-04-26 09:37:09 +00:00
rMalie
3b1acc528f // Add all missing duplicated data for shop duplication 2012-04-25 13:24:09 +00:00
rMalie
640a744c0b // Fix duplication of product_attributes for multishop #PSTEST-1174 2012-04-25 13:01:28 +00:00
rMalie
c3a44cdf37 // Add hooks for shop duplication, fix homeslider duplication #PSTEST-1173 2012-04-25 09:04:38 +00:00
vChabot
9b2f0d9ed3 // BO : product form improved (categories association) 2012-04-19 16:18:58 +00:00