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
acd0bbc366
// php warning
2013-12-05 11:26:26 +01:00
9850eeb3e5
// Fix category delete cancel button
2013-12-05 11:00:58 +01:00
a82919b023
Merge pull request #1100 from djfm/1.6
...
// more descriptive labels in dashactivity
2013-12-05 01:47:05 -08:00
5e9db96f61
// home is valid W3C!
2013-12-05 10:38:59 +01:00
7117a6f4fd
[-] BO : fixed bug #PSCSX-76 - carrier wizard fees not display after reload carrier
2013-12-05 10:35:51 +01:00
04d2ff59ee
// fix product list + facebook block HTML5 version WIP
2013-12-04 19:31:02 +01:00
ec8ca92e67
// norms
2013-12-04 18:49:34 +01:00
7140a63272
Merge branch '1.6-CSVAdvanced' of https://github.com/PhpMadman/PrestaShop into PhpMadman-1.6-CSVAdvanced
2013-12-04 18:39:33 +01:00
36a70d83d5
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 18:31:19 +01:00
b1304f0379
//carrier wizard range table auto size
2013-12-04 18:27:08 +01:00
72be705759
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 17:53:01 +01:00
d81426bab2
Merge pull request #1102 from glafarge/patch-1
...
[-] FO : Fix newline trim
2013-12-04 08:52:02 -08:00
8f34b61eec
Merge pull request #1101 from kpodemski/patch-1
...
[*] CORE: original search_query assign to .tpl
2013-12-04 08:48:23 -08:00
39ded96964
Fix newline trim
...
When using with <br /> format it now allows for 'b' and 'r' chars at the end of last line.
I think rtrim is not suitable when used with a word rather than a charlist.
2013-12-04 17:42:32 +01:00
96fd3f3d32
[+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570
2013-12-04 17:41:10 +01:00
d1959f87d4
// fixed bug url "add to cart" in product-list
2013-12-04 17:35:16 +01:00
2db8c21376
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 17:29:46 +01:00
4285882949
// update indent code
2013-12-04 17:29:35 +01:00
665c5d155d
[*] CORE: original search_query assign to .tpl
...
Avoid problems with special characters for eg. in polish language like ąźćłó etc.
2013-12-04 17:24:30 +01:00
e90dafe7b1
// more descriptive labels in dashactivity
2013-12-04 16:18:22 +00:00
ab71b813be
[-] BO : fixed top right link with the "open in a new tab" button
2013-12-04 17:00:59 +01:00
e702aca520
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 16:59:14 +01:00
ad1c7b3962
// update product-list itemproperty
2013-12-04 16:59:00 +01:00
33b5327b4d
// data-id-product instead of using rel tag
2013-12-04 16:58:34 +01:00
08cb7ee566
Merge pull request #1099 from djfm/blocktopmenu
...
// fixed undefined variable in blocktopmenu
2013-12-04 07:11:51 -08:00
fa804b9bf8
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 16:06:55 +01:00
2f088c4ac3
[*] BO : changed dashgoals system
2013-12-04 16:06:42 +01:00
a8e6dfe7f5
// fixed undefined variable in blocktopmenu
2013-12-04 15:03:04 +00:00
b450a9fa80
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
...
Conflicts:
themes/default-bootstrap/products-comparison.tpl
2013-12-04 15:48:16 +01:00
ad6ed3dcf1
// data-id-product instead of using rel tag
2013-12-04 15:46:42 +01:00
gRoussac