Commit Graph

50 Commits

Author SHA1 Message Date
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
vAugagneur 1cdc37f80d //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9114 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:45:53 +00:00
vAugagneur 4d7bf6f76a //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9102 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:54:33 +00:00
vAugagneur ef8f39babe //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9101 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:41:24 +00:00
vAugagneur 646eda2e4e //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9094 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 12:06:18 +00:00
vAugagneur e228825648 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9093 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 12:05:37 +00:00
vAugagneur fda5b287c9 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9076 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:55:57 +00:00
vAugagneur 5423757ab8 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9070 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:35:03 +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 2ea5c7d0ba //fixed small bug on search category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:34:38 +00:00
vAugagneur 99593ce1b5 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9033 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 16:25:08 +00:00
vAugagneur 9391324c8d //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9029 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:54:49 +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 af180672b1 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8977 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:11: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
lBrieu 2a8a547fe3 [-] Fix problem with js files due to the retro compatibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8935 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 15:06:59 +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
vAugagneur 202b54326f //delete unused file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8834 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 08:52:31 +00:00
mMarinetti 877074f659 [*] BO : moved 2 javascript functions to display success or error on AdminAccess are now available everywhere (thanks to Loic)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8825 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 07:32:39 +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 7a217595cd //removing unused plugin
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8790 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 08:28:25 +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
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 9641b3c55b // fix notifications in smarty BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8672 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 17:04:21 +00:00
tDidierjean 92cc465a3c // Creation of AdminController : Admin tabs will now extend this class (see AdminTools.php for example)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8667 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 16:04:35 +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
lLefevre 605204e8f1 [-] BO : Error JS in TinyMce Plugin
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8586 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:44:02 +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
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
tDidierjean 74f7dda09e // fix ajax fileuploader error with duplicate positions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8521 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 08:21:26 +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 90724761b0 [*] B0 : change the tooltip (CC014)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8499 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 13:21:48 +00:00
rMalie 22d23f8324 // Merge -> revision 8149
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8151 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 16:22:16 +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 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 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 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 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 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
rGaillard 8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00
rGaillard 69f2f09dc5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:10:43 +00:00
gBrunier 991e2c701d [-] BO : Fixed bug #PSCFI-1684 - Tinymce didn't initialize in IE8 because of an extra comma at the end of the function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6092 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 09:08:28 +00:00
fBrignoli 43b6a41bbc // merge 1.4 (5397)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-22 16:00:58 +00:00
aFolletete 10445ad61d // 1.5 branche creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-12 18:24:40 +00:00