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

78 Commits

Author SHA1 Message Date
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
vChabot
a88c90fbe1 [*] BO : Product attributes are now sortable. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8639 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-19 13:11:00 +00:00
rMalie
03eaee9bf4 [+] Project: it's possible to create new genders, "Miss" gender is now added 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8578 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 15:15:51 +00:00
tDidierjean
a3245e4093 [*] BO : Removed size limit for image upload (BL006, CC136) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8482 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-12 09:14:07 +00:00
rMalie
4e0b3ed2f7 // Improve multishop ergonomy (you edit this field for) on languages fields 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8136 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-22 09:33:16 +00:00
rMalie
c7d4290206 // Fix admin referrers for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8120 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-19 13:07:23 +00:00
rMalie
549d5be0c7 // Fix options with bad multishop visibility 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8091 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 13:12:10 +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
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
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
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
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
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
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
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
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
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
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
tDidierjean
51b4c8591d // Context part 20 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7740 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-26 15:55:04 +00:00
rMalie
e08b70a242 // Carrier association + discount association 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7696 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 15:53:07 +00:00