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

38 Commits

Author SHA1 Message Date
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
rMalie
f5f9ee023d // Rename treeview to treeview-categories 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15022 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:10:10 +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
mDeflotte
ca2e8c70f2 [-] FO : #PSFV-706 - Fix problem with jqzoom and dom with relative position 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14241 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-23 13:53:55 +00:00
fGaillard
7a6339d50f [-] Classes : #PSFV-634 : BugFix Currency was not set for loyalty discounts 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14110 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-13 17:06:42 +00:00
fBrignoli
47be39894f [-] BO : Bug Fixed #PSTEST-822 - You can now set datetime to configure specific price boundaries 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13584 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 09:13:03 +00:00
rMalie
97c7e11df0 // Improve multishop ergonomy (new toolbar) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13333 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 10:04:05 +00:00
vKham
967a025211 // change layout dashboard flexible, add button change view module list normal favorite 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12818 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 17:26:28 +00:00
mBertholino
b2125f0302 [-] BO : #PSTEST-563 : if a customer clicks outside of the fancybox, he won't loose all the data that were already in the box. To leave the fancybox, the customer must click on the close button 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12633 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-24 09:16:22 +00:00
tDidierjean
4ab6988b63 // Update lib jquery.flot.js => fix stats graph on homepage with IE9. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12193 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-05 14:22:41 +00:00
mMarinetti
c5390b036f // removed draggable option in jquery.alerts config 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12136 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 14:34:26 +00:00
rMalie
38086c5dc6 [+] BO: Add Jquery alerts for nice alert box 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11845 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 14:18:20 +00:00
vAugagneur
1d545efe66 //move jquery plugin in the good folder 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11333 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-18 21:17:06 +00:00
vKham
ad65287eeb // new layout page stats, substitute fieldset by div, legend by h2, delete stylesheet on html 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10760 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-29 17:42:38 +00:00
vAugagneur
66b1f844e4 [+] BO : login and lost password is now in ajax and convert in AdminController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10608 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 21:32:11 +00:00
vAugagneur
0242329b30 // 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10468 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 19:33:19 +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
vAugagneur
a48be7ddf3 //fixed css treeview 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10159 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 09:45:07 +00:00
mMarinetti
ca652516d9 // treeview.css fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10142 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-15 16:40:43 +00:00
lLefevre
9885ab5324 // fix Update the call of JavaScript and CSS files in the class of HelperForm and controller templates (PSFV-94) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10101 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-14 14:21:26 +00:00
vAugagneur
834bf6596d git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10097 b9a71923-0436-4b27-9f14-aed3839534dd 2011-11-14 12:48:13 +00:00
mMarinetti
9963c84fd9 // norms on AdminProductController 
// bugfix addfeaturestodb custom values
// uses of smartyV3 features (createTemplate, createData) in AdminProducts + admin products forms now extends base form.tpl
[+] BO : now tiny_mce can be loaded 'onclick' instead of 'onload'
// improvement in adminproduct pages

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10040 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-10 14:57:54 +00:00
vAugagneur
c9f065173b [+] BO : Back-office search use now AdminController.php 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9858 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-03 17:14:13 +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
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
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
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
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
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
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