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

33 Commits

Author SHA1 Message Date
aFolletete
864c8270ea // installer clean 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11462 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 10:24:21 +00:00
vAugagneur
d7fe661aa4 //fixed js bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11434 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 17:22:35 +00:00
lLefevre
f787bbd3e6 // added 1.5.0.2 version in install script + fix deleted Adminlogin accesses 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10762 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-29 17:47:14 +00:00
rGaillard
3a5a061717 // Change URLs calling for prestashop.com 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10686 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 18:45:07 +00:00
rMalie
9d10de0848 // Merge -> 10309 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:05:10 +00:00
rMalie
30835cb4c8 [*] Classes: Tools::property_exists() is deprecated, since PrestaShop now requires 5.1 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9408 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-18 09:02:57 +00:00
rMalie
45645f1f50 // Merge -> revision 9352 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-14 08:20:54 +00:00
rMalie
543c42430c [*] Smarty: move tools/smarty/compile/ and tools/smarty/cache/ folders to cache/smarty/compile/ and cache/smarty/cache/ folders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9300 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-13 08:14:03 +00:00
rMalie
798de9aaea // Merge -> revision 9288 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9289 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-12 16:04:28 +00:00
rMalie
de69396a04 // Merge -> revision 9221 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9226 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 12:45:12 +00:00
rMalie
14542fea44 // Merge -> revision 9124 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-07 09:54:43 +00:00
mMarinetti
f9bcf3f84f [-] Installer : Fix country_to_timezone in last step 
[+] BO : now AdminProducts and AdminCategories are separated from AdminCatalog
[+] FO : new method Category::getAllChildren() (the return value is an array, but can evolve to a collection
// Uses of Media:: in header.inc.php 

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9097 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-06 13:02:24 +00:00
rMalie
ae5fc92bf7 // Merge -> revision 8984 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 15:48:07 +00:00
rMalie
4f2a090e24 // Merge -> revision 8720 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-22 15:45:10 +00:00
aFolletete
b3d60e169b [*] Project : Version 2 of Smarty has been removed for using only version 3 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8569 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 13:27:32 +00:00
rMalie
b50c7e4334 // Merge -> revision 8507 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-12 16:17:37 +00:00
rMalie
79fd72e461 // Merge -> revision 8342 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-05 14:56:02 +00:00
tDidierjean
c2258ae8e9 //// Merge -> revision 8290 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-01 09:53:43 +00:00
rMalie
68c7be42c2 // Merge -> revision 8199 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8200 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-26 07:59:29 +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
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
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
a875fecb20 // MERGE with 1.4 r7770 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 09:20:57 +00:00
rMalie
be4811aa6e // REVERT MERGE 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 13:35:06 +00:00
rMalie
e159c925d8 // MERGE with trunk revision 7754 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 12:48:42 +00:00
rGaillard
8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00
rGaillard
69f2f09dc5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:10:43 +00:00
fBrignoli
43b6a41bbc // merge 1.4 (5397) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-22 16:00:58 +00:00
aFolletete
6f98aff114 // merge form 1.4 version (rev. 5937) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5938 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-15 16:46:20 +00:00
mMarinetti
50531eae8f // merge, fix from 1.4 PSCFI-1466 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5928 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-15 14:39:53 +00:00
fBrignoli
ca5e60f0b9 // merge 1.4 (5916) => 1.5.x 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5918 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-15 10:30:56 +00:00
aFolletete
10445ad61d // 1.5 branche creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-12 18:24:40 +00:00