Commit Graph

69 Commits

Author SHA1 Message Date
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
mMarinetti 9236b287b1 // revert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9135 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:40:46 +00:00
mMarinetti 0e494ed7db // revert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9129 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:27:01 +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
jmCollin 5e8cd2a3f2 // Fix shipping cost for virtual products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 16:02:12 +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
jmCollin 7dba311ab1 // fix bug with combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9028 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:51:28 +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 fffe36a72b //fixed small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8985 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:40:40 +00:00
vAugagneur 2fbc132933 [+] Classes : added new class Media => It contains all the method related to media like CSS, JS
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin()
[~] Deprecated : All method related to CCC has been moved in class Media

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8926 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 13:01:10 +00:00
jmCollin 3e9e437ac1 [+] FO : add files for combination
[*] FO : Create virtual products with no associated file

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8901 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:40:44 +00:00
rMalie be8d2136be // Merge -> revision 8851
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:03:30 +00:00
lLefevre c304a2c620 //fix correction norm in AdminProducts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8830 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 08:26:46 +00:00
vChabot 2045401f9e // cleaning code (norm / perf)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8810 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:08:24 +00:00
vAugagneur 4c255554fe [-] BO : fixed ajax file-upload request
[-] BO : now you can really delete image in BO
//added translations

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8804 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 13:33:39 +00:00
vChabot fc88323443 // perf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8801 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 12:54:47 +00:00
aFolletete 78f6a4e20a [*] Classes : improve performances of "Feature detachable" feature
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8754 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-24 15:03:21 +00:00
fBrignoli f8989018a7 // Tax::initializeAddress =>Address::initialize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8700 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 15:43:12 +00:00
vAugagneur 8b6ec916e0 [+] BO : now you can choose type of attribute group (select , color, radio)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8691 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 14:29:32 +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
tDidierjean 62a578b314 // fix image positions when adding or deleting images
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8576 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:03:03 +00:00
lLefevre 01eb0bedc3 [*] BO & FO : Add image in the description of product (CC008)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8570 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 13:29:31 +00:00
tDidierjean aa05a52c9b // change image drag&drop to look like other drag&drop lists
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8546 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 17:14:58 +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
vChabot e4a09c5222 // changing name "available_date_combi" to "available_date" and some features
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8541 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 14:52:42 +00:00
vChabot 7564ceb76a [*] BO : add an available date when product is out of stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8520 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 08:07:34 +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
lLefevre 80d8b0a1a9 [*] BO : change a number of character by short description(BL007)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8489 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 11:57:30 +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
aFolletete 3eff951265 [+] Project : adding Features detachables in order to improve performance
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-03 17:21:32 +00:00
rMalie 60e357bd4b // Fix preview link in BO + tax bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8137 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 10:14:15 +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
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 7481712923 // Fix display of breadcrumb (dont show categories disabled) + it's now impossible to browse categories outside of root category for shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8089 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 12:32:04 +00:00
rMalie 2b05b5308c // Merge -> revision 8076
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8081 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 08:15:38 +00:00
rMalie e86d668a49 // Fix download products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8080 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 16:22:13 +00:00
rMalie 21ca4d15d7 // Merge -> revision 8059
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8062 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 09:10:40 +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 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 f2b5ee338b // Merge -> revision 7875
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 16:16:49 +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
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
rMalie 3557765c59 // Fix #PSFV-25
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7752 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 08:36:23 +00:00
rMalie dd5109b3f5 // Fix adminMeta page + bug #PSFV-39
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7745 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 08:03:00 +00:00