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

102 Commits

Author SHA1 Message Date
lLefevre
d8b5cf93f3 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15279 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 14:38:07 +00:00
lLefevre
897c6acb82 [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 11:45:41 +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
fBrignoli
d22fde6176 [*] Project : Jquery 1.7.2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14792 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-20 15:45:43 +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
vAugagneur
cdeb31c8d5 [-] BO : fixed bug #PSFV-738 - [1.4 compatibility] : some option list parameters not supported in 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14354 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 08:13:04 +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
tDidierjean
27dd4be97d // remove $noTabLink from compatibility tabs 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13835 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-05 13:25:30 +00:00
rMalie
0f865fd2d6 [*] BO : reorganization of admin tabs 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13820 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-02 14:44:07 +00:00
rMalie
c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 12:15:30 +00:00
rMalie
1c2f174bdb // Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 09:49:19 +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
b24dcffc9c // Improve multishop API 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 15:39:44 +00:00
tDidierjean
1c6b736418 // revert wrong change ($_FILES is needed in afterImageUpload() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13274 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 17:38:03 +00:00
rMalie
7682d57803 // Refacto of lang functions (all code moved in Translate class) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13262 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 15:20:25 +00:00
rMalie
e5d5443cbe // Fix assignements in if() on AdminTab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12803 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 14:08:36 +00:00
fGaillard
1c6357c1d9 [*] TR : #PSTEST-553 : Replaced can't with cannot 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12796 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 12:54:32 +00:00
rMalie
a4d97911b1 [*] Classes : Db::autoExecute() call are now replaced by Db::insert() or Db::update() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12624 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-23 17:41:02 +00:00
rMalie
ebec527630 [*] Classes : images.inc.php functions are now all deprecated, use the new class ImageManager instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12596 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-23 10:21:51 +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
tDidierjean
18c81442d1 // Fix AdminCmsControllers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10355 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 14:30:26 +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
8a1bd2eb2d // Remove <img> from confirmation messages 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10258 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 11:00:37 +00:00
tDidierjean
740ac7c843 // AdminTab compatibility: Dispatcher for BO now search tabs in database, not on the disk. AdminTabs now uses the new BO theme. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10236 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 18:15:07 +00:00
mMarinetti
35429b0699 [+] BO : #PSFV-94 - AdminThemes is now an AdminController 
// ajax.php get addons themes has been removed and is now in AdminThemesController + uses of jquery
// removed function AdminTab::uploadIco, moved in AdminThemesController


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10069 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-13 17:46:38 +00:00
vChabot
ef00a2400b [*] BO : when a group is created, every category are linked to this group 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9859 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-03 17:14:16 +00:00
dMetzger
486622522c [+] Project : Vouchers are now replaced by cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9771 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-01 18:50:42 +00:00
lLefevre
5f4ee34f0f //FIxed Added Controller AdminCarrierController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9464 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 14:36:25 +00:00
hAitmansour
d8509b2829 [*] FO BO MO : rename function isMultiShopActivated by isFeatureActive 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9444 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 09:36:12 +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
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
lLefevre
50cb82f508 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminGenderController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9364 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-14 12:59:26 +00:00
vChabot
8e659eb701 [*] BO : carriers are now sortable by position 
// Carriers class is now normalized
// Attribute class is now normalized

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9254 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 16:29:34 +00:00
rMalie
4d91a31031 // Add exceptions in db classes + normalize some files + split defines.inc file 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9216 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 10:04:23 +00:00
lLefevre
a8a11c0ece [*] BO : Rights verification for multi-shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9198 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-10 16:10:57 +00:00
rMalie
577221ff08 // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-10 12:18:56 +00:00
lLefevre
c781f25760 [*] BO : added right of multi-shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9157 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-07 15:39:55 +00:00
vChabot
4134ed3f5d [*] BO : Modules can now be authorized or not by client group 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9108 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-06 15:22:25 +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
b4d436ca21 // Merge -> revision 9061 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-05 15:21:55 +00:00
rMalie
ef17d0b7da // Merge -> revision 8952 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 09:14:01 +00:00
rMalie
3620f0837f // Merge -> 8910 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 08:17:25 +00:00
rMalie
1b6d0d1be3 // Merge -> revision 8800 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-27 14:30:06 +00:00
vChabot
83fc0977c9 [*] BO : Features are now sortable. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8751 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 15:45:40 +00:00
mMarinetti
926063e08f [+] BO : New AdminController system, including smarty backoffice, thanks to Raphael and Thomas 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8742 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 15:01:49 +00:00
mDeflotte
118338a5ea [*] BO : Gender - Allow image resizing 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8736 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 13:04:52 +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
rMalie
fd45c7bb4d // Fix validation of emails preferences 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8685 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 12:55:57 +00:00
vChabot
d0102a81b7 [*] BO : groups attributes are now sortable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8683 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 10:04:54 +00:00
tDidierjean
b45dd02452 // remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_ 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8666 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-20 15:53:57 +00:00