e448ac8de5
// Blocklayered message small fix
2013-12-09 09:09:38 +01:00
1876d4834c
Merge pull request #1109 from jeanbe/patch-1
...
[*] FO : Set zoom on stores
2013-12-08 08:52:30 -08:00
d4b39184a0
// AdminCarts order way DESC
2013-12-08 16:39:41 +01:00
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
c46159ccce
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 19:09:48 +01:00
5fb2081054
// order-carrier preparation to be W3C validated!
2013-12-06 19:09:36 +01:00
ae98bcd86b
// php warning
2013-12-06 18:40:44 +01:00
746c74dfac
// id of root category could be different of 1
2013-12-06 18:34:50 +01:00
c5ff838fca
// Blocklayered starting code refacto
2013-12-06 18:12:04 +01:00
a569ab7e33
// Fix tree shop missing attributes
2013-12-06 18:11:06 +01:00
adf158a0c3
// small fix
2013-12-06 17:31:09 +01:00
95d5e9d819
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 17:25:23 +01:00
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
cfee36f609
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 17:19:59 +01:00
31c5f204b1
// update pages for w3c
2013-12-06 17:19:49 +01:00
db37e42b21
// checkout W3C valid - wip
2013-12-06 17:19:47 +01:00
ed5496479d
// removed console.log()
2013-12-06 17:18:20 +01:00
03e0cb7515
// break line
2013-12-06 17:09:14 +01:00
b2204aac6e
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 17:06:46 +01:00
99fe216413
[*] FO : Move both sliders module on new hook
2013-12-06 17:05:39 +01:00
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
6419f6a7ad
// fixed bug with ordering of JS files in AdminImport
2013-12-06 15:47:29 +00:00
97937a8aa1
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 15:57:50 +01:00
ff08c1311b
// update my account page for w3c
2013-12-06 15:57:38 +01:00
74b16defa8
// themeconfigurator install failed
2013-12-06 15:53:33 +01:00
9f106d06ef
// valid W3C checkout - WIP
2013-12-06 15:43:12 +01:00
0d374e5501
// new hook
2013-12-06 14:54:45 +01:00
0af0601cc7
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 12:18:59 +01:00
33e9c2c132
[-] FO : Remove bad links on home tabs
2013-12-06 12:12:54 +01:00
d4f73213cb
// checkout - shopping cart W3C valid
2013-12-06 12:12:21 +01:00
da3ca98dfd
// remove default theme
2013-12-06 12:00:34 +01:00
946d5520f8
// nomrs
2013-12-06 11:42:28 +01:00
669a49be59
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 10:17:12 +01:00
c2e0edcc7a
[-] BO : carrier wizard no fees display
2013-12-06 10:17:07 +01:00
5e18a94d2a
// employee avatar on the logs listing
2013-12-05 19:16:43 +01:00
0067eff263
// working on W3C validation
2013-12-05 18:50:50 +01:00
ddcade285f
[-] CORE : Ensure correct parent category for home categories
2013-12-05 18:37:49 +01:00
df2e2280ea
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-05 17:59:25 +01:00
1f1b3974cf
// update itemprop on product page + w3c bug on address.tpl
2013-12-05 17:59:13 +01:00
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
3975599023
[- ] CORE : Fix bug #PSCFV-10627, bad default shoip currency && Shop::getEntityIds returning deleted currency
2013-12-05 16:47:05 +01:00
9dd82367f3
// Product compare almost W3C valid -> #availability_value must be change with a class
2013-12-05 16:27:10 +01:00
f128dac9c4
// small fix
2013-12-05 15:59:14 +01:00
02b6e24ca4
// category page almost W3C valid
2013-12-05 15:27:40 +01:00
c0e8794947
// make product.tpl human readable ;)
2013-12-05 14:42:22 +01:00
0261096f4d
Merge pull request #1105 from PhpMadman/1.6-CSVAvancedFixes
...
[-] BO : Fixes for Advanced Stock Management Import
2013-12-05 04:28:31 -08:00
9df713e6ec
[-] BO : Fixes for Advanced Stock Management Import
...
[*] BO : Combinations import supports Advanced Stock Management
[*] BO : Advanced Stock Management import now supports stock increase
[*] BO : Advanced Stock Management stock unit price uses wholesale_price (Product Cost) or 0.00001 if not set
[*] BO : Added Advanced Stock Management to csv import docs
2013-12-05 12:30:17 +01:00
185d02b290
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-05 11:27:20 +01:00
3889f6d61f
// follow up https://github.com/PrestaShop/PrestaShop/commit/7140a63272fa2de5f7368a062d7fde79ca89d692#commitcomment-4775950
2013-12-05 11:27:07 +01:00
e52652f96f
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-05 11:26:39 +01:00
Jerome Nadaud