dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,777 Commits 9 Branches 19 Tags
3114aa6fc80eefa254fcb9c3ac83265b4ea735cd
Commit Graph

73 Commits

Author SHA1 Message Date
rMalie
a15520b3b1 // Rename jquery.cookie with jquery.cooki (because of apache security mod ...) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15851 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-05 13:27:53 +00:00
rMalie
72c2781406 // The capacity of enable / disable shops and shop groups is temporary disabled 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15786 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-01 07:46:01 +00:00
rMalie
c9484e29b2 // The capacity of enable / disable shops and shop groups is temporary disabled 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15760 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-30 12:30:08 +00:00
rMalie
e59a4da65d // Automatically duplicate some shop data if the primary data is checked (E.g. export carriers langs if carrier is checked) #PSCFV-2616 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15748 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-30 08:06:57 +00:00
mDeflotte
1912c4b543 [-] BO : #PSCFV-2562 - Select all categories on creating a new shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15673 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-24 16:44:00 +00:00
fBrignoli
db233ab4bd [-] BO : Bug fixed related to #PSCFV-2490 - Default group should be copied 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15534 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 15:51:50 +00:00
vChabot
6f50b2bd9c [-] BO : BugFix : #PSCFV-2476 : Shop creation : adding an error message if you do not select at least the root category 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15491 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 12:29:37 +00:00
vChabot
6e4b178fa4 [-] BO : BugFix : #PSCFV-2441 : Shop creation : unable to save parameters 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15448 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 13:52:52 +00:00
vChabot
219d0c5606 // little fix render admin category tree with selectedCat var 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15180 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 14:43:20 +00:00
vChabot
d968158b55 [-] BO : BugFix : #PSCFV-2209 : Multishop : cannot delete shops with dependencies 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15175 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 14:09:11 +00:00
rMalie
0fe8ad5f90 // Fix notice in AdminShopController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15169 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 13:16:07 +00:00
rMalie
4e49673fee // Fix notice on shop creation page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15126 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 15:42:57 +00:00
rMalie
ccfef659c9 // Multishop interface reworked 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15121 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 15:05:39 +00:00
rMalie
f38483a4e0 // Norm 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14912 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 14:13:59 +00:00
rMalie
833a5aec27 // Remove shop url from .htaccess after shop deletion #PSCFV-2034 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14899 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 09:37:09 +00:00
rMalie
4cdb580608 // Add all missing duplicated data for shop duplication 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14873 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-25 13:24:09 +00:00
rMalie
b0d9af537e // Fix duplication of product_attributes for multishop #PSTEST-1174 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14872 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-25 13:01:28 +00:00
rMalie
64b83ee40e // Add hooks for shop duplication, fix homeslider duplication #PSTEST-1173 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14864 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-25 09:04:38 +00:00
vChabot
e8dfa8311d // BO : product form improved (categories association) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14777 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 16:18:58 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:32:12 +00:00
tDidierjean
a5dcb4295f // Rename fieldsDisplay to fields_list part3 (timeout) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14378 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 16:31:01 +00:00
tDidierjean
59547b2914 // Renaming options to fields_options 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14374 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 16:14:14 +00:00
tDidierjean
d752b192f5 // Refactoring: remove $token arg from process functions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14269 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-26 15:25:36 +00:00
rMalie
b79c1f1aa1 // Fix default state for shops #PSTEST-1013 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14168 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 16:31:54 +00:00
lLefevre
0e9e23aaae // Fix update english key of translations in all files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 12:25:51 +00:00
fGaillard
7773cdba5d [-] BO : #PSTEST-925 : BugFix - Bad redirect when creating new store / shop with submit error 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13969 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-08 14:03:19 +00:00
vAugagneur
69a5ba135e [*] BO : improve duplicate shop form 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13752 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-29 16:08:23 +00:00
rGaillard
2da79de4b7 // Fix stock on shop import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13734 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-29 10:45:22 +00:00
tDidierjean
7a6a998aab // rename $toolbar_fix to $toolbar_scroll part2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13712 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 17:39:40 +00:00
rMalie
d947361236 // Improve AdminShop performance 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13701 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 15:59:26 +00:00
bMancone
63281c1f61 // Fixed #PSTEST-804 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13699 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 15:35:37 +00:00
rMalie
dacdb760b1 // Add default group in group list on shop page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13663 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 09:41:16 +00:00
rMalie
e5b646b0f8 // Fix multishop context in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13648 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 17:14:33 +00:00
rMalie
69e2cf95d6 // Restore shop context in shop list and can filter shop pages per group shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13579 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 08:58:21 +00:00
rMalie
2454cd7863 // Welcome 2012² 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 16:33:10 +00:00
rMalie
53e7fe3230 // Improve multishop API 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13568 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 15:54:10 +00:00
rMalie
4e6628cbfd // Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13530 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-22 14:25:28 +00:00
mMarinetti
10b3e3d8d3 // Welcome 2012 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13520 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-22 09:28:22 +00:00
vChabot
f1cde3f661 // select associated categories on a shop creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13377 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 09:45:34 +00:00
rMalie
97c7e11df0 // Improve multishop ergonomy (new toolbar) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13333 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 10:04:05 +00:00
rMalie
cecc3721d4 // Improve multishop ergonomy with a link to missing url on shop list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13303 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 13:20:17 +00:00
rGaillard
7c51ccaf88 [-] BO: Fix some listing filters bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13192 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 16:56:17 +00:00
tDidierjean
96c8e763b9 // Replace public by protected in override methods 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13022 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 13:41:51 +00:00
vChabot
33426e0d9a // norm fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12865 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:29:35 +00:00
vChabot
8c45f904a0 [*] BO : you can set positions to categories using multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12856 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:11:27 +00:00
rMalie
350f3ec749 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12703 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 09:29:50 +00:00
mDeflotte
b9cd6594b7 // Code review - adminshop - group 3 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12584 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-20 15:35:59 +00:00
tDidierjean
f6e48114e7 // Helper::renderAdminCategorieTree refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12578 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-20 13:02:34 +00:00
vChabot
5f8843de0b // little improvements for category management with multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12338 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-11 09:56:40 +00:00
tDidierjean
ad1fd29cea // Refactor AdminController::_errors to errors 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12331 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-11 08:58:12 +00:00