Commit Graph

64 Commits

Author SHA1 Message Date
mMarinetti
05ceb6ea96 // fix live_edit when not using multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10911 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:53:50 +00:00
vChabot
ed98703212 [*] BO : you can now affect a zone to multiple countries and to multiple states
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10865 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:41:05 +00:00
rGaillard
73148dda1d // Change urls of prestashop api
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10696 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 10:22:58 +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
tDidierjean
9ebe542fdb // fix product live preview and duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10585 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:33:11 +00:00
rGaillard
06ab93a8f6 // ajax process off adminaccess is now in the controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10503 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:01:22 +00:00
vChabot
4334537fe1 // feature position works fine
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10443 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 15:49:59 +00:00
vChabot
4b15da6656 // attributes position works fine
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10433 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 14:53:50 +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
lLefevre
c47131aa9f // fix bug display message error or success in AdminAccessController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10326 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 10:11:38 +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
lLefevre
68fc8b4e12 [*] BO : #PSFV-94 - added AdminReferrersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10046 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-10 15:53:47 +00:00
lLefevre
fc8b5cda7c [*] BO #PSFV-94 : Added AdminImportController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9974 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 17:54:08 +00:00
lLefevre
eb6620fabe [*] BO #PSFV-94 : Added AdminAccessController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9896 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-04 15:52:31 +00:00
lLefevre
f657317b39 [*] BO #PSFV-94 : Added AdminTaxRulesGroupController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9815 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 09:46:58 +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
mMarinetti
1e9e80b266 // #PSCFV-94 - AdminProducts, AdminCatalog
// new menu style


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9515 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 15:22:22 +00:00
vAugagneur
8b8bb3db00 [+] BO : added ssl option for imap sync in SAV
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9507 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 14:55:27 +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
de6dc071fb // Fix ID language from context in preactivation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9363 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 12:59:03 +00:00
mDeflotte
205e54c31c // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:58:29 +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
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
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
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
vAugagneur
a39871ee84 //fixed small bug on search category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9049 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:39:13 +00:00
vAugagneur
1bb02e3abf [+] Classes : Helper::renderAdminCategorieTree() have new params "$use_search" to add a input search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9026 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:42:56 +00:00
vAugagneur
ad7cef7424 //use Tools::isSubmit() instead of array_key_exist('', $_POST);
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8986 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:18:18 +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
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
vAugagneur
1c01c20149 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8723 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 15:46:42 +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
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
vAugagneur
453edf991d [+] BO : now you can sync imap mailbox with the Customer Service (SAV)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8562 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 09:42:53 +00:00
fBrignoli
facb2318e5 [*] BO : Taxes are now historized
[*] BO : Taxes are no longer stored in the order details row



git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8556 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 09:06:20 +00:00
tDidierjean
0c49b5b416 // fix image drag&drop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8543 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 15:34:41 +00:00
tDidierjean
feabf30c20 [*] BO : product images can now be dragged and dropped to change position (CC021)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8542 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 15:22:29 +00:00
rMontagne
9fbc821f61 [+] BO : Add Multiple Ajax Upload Image on AdminProduct
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8508 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 15:46:36 +00:00
lBrieu
9a169ae91f [+] Add handling for notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8247 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 12:04:07 +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
b12bf222a9 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8179 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-24 15:57:10 +00:00
rMalie
7cadad5d3e // Fix all product_lang sql restrictions with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8121 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 14:01:23 +00:00
fBrignoli
f371f3e3bc [*] Project : US + CA TaxSystem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8105 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-18 10:10:50 +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
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
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