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

1557 Commits

Author SHA1 Message Date
rMalie
5638172b38 // Add copy data of group shops 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8101 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-18 07:57:04 +00:00
rMalie
0aada6cc1e // Merge -> revision 8097 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 16:10:20 +00:00
rMalie
89bc665d48 // Fix admin modules positions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8098 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 15:30:44 +00:00
rMalie
acfa8d8600 // Fix share_datas in backoffice 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8096 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 14:53:18 +00:00
tDidierjean
39d005f222 // Context part 32 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8095 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 13:40:05 +00:00
rMalie
51f2bf2617 // Fix carrier lang copy when a new shop is created + can duplicate data when editing a shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8094 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 13:37:15 +00:00
rMalie
7481712923 // Fix display of breadcrumb (dont show categories disabled) + it's now impossible to browse categories outside of root category for shops 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8089 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 12:32:04 +00:00
tDidierjean
cb3d802346 // Context part 31 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8087 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 10:07:12 +00:00
rMalie
751ae5d740 // Fix shop selection in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8083 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 08:59:04 +00:00
rMalie
2b05b5308c // Merge -> revision 8076 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8081 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 08:15:38 +00:00
rMalie
e86d668a49 // Fix download products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8080 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-16 16:22:13 +00:00
fBrignoli
28025e0ff6 // Comment 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8079 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-16 16:05:16 +00:00
rMalie
f6162845ab // Add a message when a shop is created to indicate that the user should create an URL for this shop + fix some bugs 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8078 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-16 15:53:33 +00:00
rMalie
a1303a0cb0 // Add Core prefix for Stock and ProductCompare classes + fix main URL on shop URL + add some translation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8072 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-16 14:13:04 +00:00
rMalie
21ca4d15d7 // Merge -> revision 8059 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8062 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-16 09:10:40 +00:00
gBrunier
9e0333a664 [+] BO : CB-30 - Customer receive an email when a voucher is created in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8055 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-12 14:24:48 +00:00
lBrieu
a9b94cee4b [+] Add the TinyMCE editor on categories description 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8023 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 12:34:52 +00:00
rMalie
52d1d13891 // Merge -> revision 8014 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 12:00:05 +00:00
rMalie
d1d4d57eca // Revert normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 10:20:59 +00:00
rMalie
f62cdb1963 // Normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8017 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 09:58:20 +00:00
rMalie
e093ecd554 // Fix on shops + remove id_group_shop from stock + fix stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8015 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 09:38:24 +00:00
lBrieu
eec48ed7b5 [+] Add the TinyMCE editor on categories description 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8013 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 09:10:28 +00:00
rMalie
7411db9a69 // Merge -> revision 7979 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7981 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-10 08:36:17 +00:00
rMalie
671162a5f5 [-] Add a new option in admin preference to recompile smarty templates only when they are updated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7976 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-09 16:25:40 +00:00
rMalie
a86e95fc5a // Fix shop_url when no physical_uri + fix shop association when multistore is disactivated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7958 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-09 13:20:26 +00:00
rMalie
47a4f7f31e // Merge -> revision 7941 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7948 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-08 16:01:47 +00:00
rMalie
f0ee603966 // Fix some bugs on multistore 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7944 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-08 15:31:32 +00:00
rMalie
f48792054a // Fix some bugs on multistore 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7942 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-08 15:24:21 +00:00
tDidierjean
653ef8d115 // Context part 29 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7935 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-08 13:17:12 +00:00
rMalie
0811404de8 // Refactoring of admin options 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7922 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-05 15:52:45 +00:00
rMalie
239f92eaf1 // Merge -> revision 7906 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7909 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-05 13:26:44 +00:00
rMalie
e4825ac555 // Refactoring of preferences 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7907 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-05 13:21:40 +00:00
rMalie
06cc9cff99 // Improve ergonomy of configuration for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7879 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-03 18:06:51 +00:00
rMalie
f2b5ee338b // Merge -> revision 7875 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-03 16:16:49 +00:00
rMalie
6f08bcb12e [+] Add a route system to personalize rewrited URL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7876 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-03 16:02:49 +00:00
rMalie
fa42cc38ae // Routes for dispatcher (part 5) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7860 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-03 07:53:59 +00:00
rMalie
e2b883f617 // Remove PS_HTACCESS_SPECIFIC configuration (we don't need it anymore since .htaccess now keep automatically all what he need) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7856 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 15:06:31 +00:00
rMalie
6fc10e23f8 // Some fix on canonical URL + remove PS_HOMEPAGE_PHP_SELF configuration 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7853 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 14:24:28 +00:00
rMalie
26efd329a3 // Move theme choice from AdminTheme page to Shop page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7848 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 13:47:34 +00:00
rMalie
921fbcd564 // Remove AdminAppearance 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7845 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 12:23:11 +00:00
rMalie
ffeb22bfb9 // Merge with revision 7841 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 11:43:58 +00:00
rMalie
c945049ef1 // Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7842 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 09:54:23 +00:00
rMalie
ab5fc723b4 // Routes for dispatcher (part 4) + some fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7830 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-01 13:28:02 +00:00
mMarinetti
6eebc96bd0 [-] BO : Fixed bug in __construct() related to context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7825 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-01 09:57:39 +00:00
dMetzger
287a5f42dc [+] BO : you can now set detailed permissions for each module in the back end 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7818 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-31 16:39:53 +00:00
tDidierjean
d3b2ff2664 // Context part 25 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7794 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:17:58 +00:00
rMalie
a1a32714ab // Fix #PSFV-30 + context part 24 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7792 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:12:17 +00:00
rMalie
31ed17058c // Revert test 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7791 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:05:38 +00:00
rMalie
939d2a0cf5 // test 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7789 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:04:21 +00:00
rMalie
8bfd44085d // Some fix after merge 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7781 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 13:03:43 +00:00