dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,934 Commits 9 Branches 19 Tags
91c3bf48b1e7bf9c101fcfdbf78c3bc0529bcbac
Commit Graph

20934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Granger 91c3bf48b1 // w3C product 2013-12-09 14:26:17 +01:00
Gregory Roussac 27e8beb6a9 Merge pull request #1111 from Gamesh/patch-1 
[*] FO: now you can download files >1G without running into max executio...
 2013-12-09 05:17:14 -08:00
Gamesh 5c496f45a1 [*] FO: now you can download files >1G without running into max execution limitation 
Added @ to suppress warning i safe mode.
 2013-12-09 15:04:16 +02:00
Jerome Nadaud b0c9e73e30 [+] BO : Add error control to modules uploading 2013-12-09 11:30:42 +01:00
Kevin Granger ea450edc4c // more W3C 2013-12-09 10:15:53 +01:00
Rémi Gaillard b2199a2f12 Merge pull request #1112 from djfm/1.6 
// take force_compile setting into account in Back-Office
 2013-12-09 01:04:20 -08:00
djfm 40edeff122 // take force_compile setting into account in Back-Office 2013-12-09 08:59:49 +00:00
Jerome Nadaud e448ac8de5 // Blocklayered message small fix 2013-12-09 09:09:38 +01:00
Gamesh 9713d38078 [*] FO: now you can download files >1G without running into max execution limitation 
when reading large files ( >1G ), you often get max execution timeout error, this fix will prevent this.
 2013-12-09 08:53:11 +02:00
Gregory Roussac 1876d4834c Merge pull request #1109 from jeanbe/patch-1 
[*] FO : Set zoom on stores
 2013-12-08 08:52:30 -08:00
gRoussac d4b39184a0 // AdminCarts order way DESC 2013-12-08 16:39:41 +01:00
jeanbe f055e86cc7 Met automatiquement la carte sur l'ensemble des magasins 
Met automatiquement la carte a l'ouverture sur l'ensemble des magasins plutot que sur un point fixe au US.
 2013-12-07 17:47:45 +01:00
Kevin Granger c46159ccce Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 19:09:48 +01:00
Kevin Granger 5fb2081054 // order-carrier preparation to be W3C validated! 2013-12-06 19:09:36 +01:00
rGaillard ae98bcd86b // php warning 2013-12-06 18:40:44 +01:00
rGaillard 746c74dfac // id of root category could be different of 1 2013-12-06 18:34:50 +01:00
Jerome Nadaud c5ff838fca // Blocklayered starting code refacto 2013-12-06 18:12:04 +01:00
Jerome Nadaud a569ab7e33 // Fix tree shop missing attributes 2013-12-06 18:11:06 +01:00
rGaillard adf158a0c3 // small fix 2013-12-06 17:31:09 +01:00
Kevin Granger 95d5e9d819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 17:25:23 +01:00
Kevin Granger 71ac20c819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 
Conflicts:
	themes/default-bootstrap/js/products-comparison.js
 2013-12-06 17:24:00 +01:00
sLorenzini cfee36f609 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 17:19:59 +01:00
sLorenzini 31c5f204b1 // update pages for w3c 2013-12-06 17:19:49 +01:00
Kevin Granger db37e42b21 // checkout W3C valid - wip 2013-12-06 17:19:47 +01:00
Kevin Granger ed5496479d // removed console.log() 2013-12-06 17:18:20 +01:00
gRoussac 03e0cb7515 // break line 2013-12-06 17:09:14 +01:00
gRoussac b2204aac6e Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 17:06:46 +01:00
gRoussac 99fe216413 [*] FO : Move both sliders module on new hook 2013-12-06 17:05:39 +01:00
Jérôme Nadaud aecbc18779 Merge pull request #1107 from djfm/import 
// fixed bug with ordering of JS files in AdminImport
 2013-12-06 07:54:27 -08:00
djfm 6419f6a7ad // fixed bug with ordering of JS files in AdminImport 2013-12-06 15:47:29 +00:00
sLorenzini 97937a8aa1 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 15:57:50 +01:00
sLorenzini ff08c1311b // update my account page for w3c 2013-12-06 15:57:38 +01:00
gRoussac 74b16defa8 // themeconfigurator install failed 2013-12-06 15:53:33 +01:00
Kevin Granger 9f106d06ef // valid W3C checkout - WIP 2013-12-06 15:43:12 +01:00
rGaillard 0d374e5501 // new hook 2013-12-06 14:54:45 +01:00
gRoussac 0af0601cc7 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 12:18:59 +01:00
gRoussac 33e9c2c132 [-] FO : Remove bad links on home tabs 2013-12-06 12:12:54 +01:00
Kevin Granger d4f73213cb // checkout - shopping cart W3C valid 2013-12-06 12:12:21 +01:00
gRoussac da3ca98dfd // remove default theme 2013-12-06 12:00:34 +01:00
gRoussac 946d5520f8 // nomrs 2013-12-06 11:42:28 +01:00
Vincent Augagneur 669a49be59 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 10:17:12 +01:00
Vincent Augagneur c2e0edcc7a [-] BO : carrier wizard no fees display 2013-12-06 10:17:07 +01:00
rGaillard 5e18a94d2a // employee avatar on the logs listing 2013-12-05 19:16:43 +01:00
Kevin Granger 0067eff263 // working on W3C validation 2013-12-05 18:50:50 +01:00
Jerome Nadaud ddcade285f [-] CORE : Ensure correct parent category for home categories 2013-12-05 18:37:49 +01:00
sLorenzini df2e2280ea Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-05 17:59:25 +01:00
sLorenzini 1f1b3974cf // update itemprop on product page + w3c bug on address.tpl 2013-12-05 17:59:13 +01:00
rGaillard d50999fde0 [-] Core: Fix #PSCFV-11165 numerical configuration values should not be overridden if the value is the same between shop and global context 2013-12-05 17:17:35 +01:00
gRoussac 3975599023 [- ] CORE : Fix bug #PSCFV-10627, bad default shoip currency && Shop::getEntityIds returning deleted currency 2013-12-05 16:47:05 +01:00
Kevin Granger 9dd82367f3 // Product compare almost W3C valid -> #availability_value must be change with a class 2013-12-05 16:27:10 +01:00