Commit Graph

123 Commits

Author SHA1 Message Date
mDeflotte
a35d136a7a // Fixed bug with priority and assignation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12561 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 14:44:29 +00:00
vChabot
6806cdeab3 [*] BO : categories multishop improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12557 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 14:03:33 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 10:14:10 +00:00
rMalie
2113badb7d // Root old files now keep full $_REQUEST parameters in redirection (not only $_GET) in order to keep full retrocompatibility with 1.4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12463 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-17 09:25:46 +00:00
bMancone
9d481b0b9a // Fixed 'Nesting level .. too deep recursive dependency' error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12442 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-16 15:50:44 +00:00
fGaillard
c5bd068892 [-] Classes : BugFix : Added htaccess ErrorDocument 404 in case rewrite mod is not available
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12269 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 14:33:08 +00:00
mMarinetti
71ca343035 // phpdoc for floorf and ceilf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12239 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-06 16:24:56 +00:00
rMalie
494205d52e // Fix PrestaShopException typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12128 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:53:19 +00:00
rMalie
870e8e685e // Fix multishop with virtual uri when called url don't end with / #PSFV-306
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12063 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 14:01:32 +00:00
rMalie
204f331ae2 // Fix #PSFV-310
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12062 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-03 13:54:09 +00:00
rMalie
07207496d7 // Rename correctly all hooks
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12006 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 15:52:40 +00:00
rMalie
93dd0f1472 // Fix htaccess generation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11990 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 13:47:03 +00:00
dMetzger
347e5ba45b [-] Project : fixed rare bug in Tools::displayPrice that occur when the currency is not valid
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11987 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 13:37:51 +00:00
rMalie
dc7356929c [-] Classes: Tools::generateHtaccess() can be called without its arguments (use default configuration settings)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11882 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-29 10:54:48 +00:00
vChabot
2e8597a9ed // remove htaccess generation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11847 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 14:36:14 +00:00
rMalie
7f25509976 // Fix pub@prestashop.com default account password
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11829 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 10:49:34 +00:00
rGaillard
ca3ab742f0 // ImageType is now applied to a them
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11708 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 22:08:40 +00:00
aFolletete
d2f89e79ba // revert from r11699
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11702 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:56:00 +00:00
rGaillard
e8a3c10175 // ImageType is now applied to a them
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11700 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:48:40 +00:00
rMalie
8f8c1e705c // htaccess is not generated during install
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11674 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 19:18:08 +00:00
mDeflotte
d1f8e02485 // Fixing problems with blockcart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11642 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:56:10 +00:00
mMarinetti
0f3558ff9c // technical message "deprecated" are not translated anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11632 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:22:59 +00:00
vChabot
10f22fed70 // fix htaccess generation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11630 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:18:27 +00:00
vChabot
99007ec463 // preference admin controller updated and tools convertbyte too
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11623 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:56:34 +00:00
lLefevre
9d8452eef0 [-] BO : #PSTEST-22 : Orthographe à revoir dans combinaisons de la fiche produit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11607 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 14:16:11 +00:00
mDeflotte
418860718c // Translations for helper
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11585 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 12:40:57 +00:00
mDeflotte
daa8c7f8c9 // BugFix - Changing error message "name is to long (32 chars max)" + Adding context to Tools::displayError()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11409 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 14:06:57 +00:00
mDeflotte
d33fcc2da6 // DisplayDate don't have to 'die' if date == '0000-00-00'
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11344 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:14:42 +00:00
vChabot
dc29921f7e [+] BO : You can now have UTF-8 URL Rewriting
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11207 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 15:00:47 +00:00
rGaillard
43ff904c57 // Fix little bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 14:18:13 +00:00
vSchoener
de36bcb13b // Add getShopProtocol to have the current protocol use by the current shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10984 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:22:03 +00:00
rMalie
1172e7a8d0 // Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10982 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:08:48 +00:00
mDeflotte
b6f25900ee // Removing numerics from order reference
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10978 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 13:18:00 +00:00
mDeflotte
caf0402115 // BugFix: Context->language is not re-setted in switchLanguage method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10956 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:40:54 +00:00
mDeflotte
db38a475f1 // BugFix in Product compare
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10927 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:30:01 +00:00
aFolletete
04a3aab393 // WAOW ! Adding change currency feature in AdminOrdersController ! It's amaizing :D Wonderful ;)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10635 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 23:04:33 +00:00
rMalie
c1e4594a22 // Fix Tools class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10344 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 13:20:51 +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
tDidierjean
5b908a0844 // fix tpl folder detection in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:11:49 +00:00
mDeflotte
5e6ab08a00 // Merging multishipping branche on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 11:13:31 +00:00
tDidierjean
9900226eba [-] Classes : fixed bug with displayAsDeprecated functions when not called from a class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10223 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 15:49:40 +00:00
tDidierjean
c34205e59d // Fix AdminController folder name for uppercases (CMSCategories)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10126 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-15 10:31:37 +00:00
dSevere
321bca2989 // stock : debug + interfaces optimizations + stockManager update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10055 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-10 17:30:16 +00:00
fSerny
0ba4fe9c7e [*] PROJECT : New Module API (part 1)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9790 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 10:49:01 +00:00
aFolletete
ed36aa6971 [*] BO : #PSFV-94 - new controller for AdminOrders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9546 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-21 13:53:54 +00:00
rGaillard
2a22c9a502 [*] Core: Upgrade smarty to version 3.1.3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9469 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:16:52 +00:00
rMalie
42564ca3d0 // Merge -> revision 9435
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:14:42 +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
a7bc16dadd // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:46:08 +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