 gRoussac
|
2ea0dc7749
|
[*] CORE : Allow external css loading, manual merge of https://github.com/PrestaShop/PrestaShop/pull/406 thanks @m-hume
|
2013-08-05 14:26:07 +02:00 |
|
|
Gregory Roussac
|
d1631e6920
|
Merge pull request #405 from ottonascarella/patch-1
[*] CORE : Enable Progressive JPG
|
2013-08-05 05:08:10 -07:00 |
|
|
Vincent Augagneur
|
5a88dc0f8b
|
//fixed bug on carrier wizard when edit carrier
|
2013-08-05 14:06:50 +02:00 |
|
|
Gregory Roussac
|
b8e5ad0e44
|
Merge pull request #624 from iNem0o/development
[-] FO : getBestSales() $order_way doesnt work in DESC mode
|
2013-08-05 04:58:39 -07:00 |
|
|
inem0o
|
2de866eff3
|
Correct assignation of $order_way parameter
|
2013-08-05 12:21:19 +02:00 |
|
|
gRoussac
|
13b3adb8c0
|
[-] INSTALLER : Force update of PS_LEGACY_IMAGES to 0
|
2013-08-05 12:17:21 +02:00 |
|
|
Sarah Lorenzini
|
6533ee4bec
|
// update stock tab
|
2013-08-05 12:13:43 +02:00 |
|
|
gRoussac
|
8c2af798a4
|
// small change on pack css
|
2013-08-05 12:01:40 +02:00 |
|
|
Damien Metzger
|
144c85ed4f
|
// Removed useless param
|
2013-08-05 11:40:03 +02:00 |
|
|
Damien Metzger
|
581dcec718
|
// [-] IN : Fixed language detection and help in the installer
|
2013-08-05 11:23:09 +02:00 |
|
|
Damien Metzger
|
7f4e4efbd8
|
[*] TR : Added 10 new localization packs
|
2013-08-05 11:23:09 +02:00 |
|
|
gRoussac
|
19918dea8e
|
[-] BO : Fix bug #PSCFV-8139 bad renderform on errors in AdminStatuses
|
2013-08-05 10:47:04 +02:00 |
|
|
Sarah Lorenzini
|
166d8a69fa
|
[-] FO: fixed bug shopping cart price misplaced - #9971
|
2013-08-05 10:21:46 +02:00 |
|
|
Rémi Gaillard
|
003c05a729
|
[-] BO: Fix #PSCFV-9885 catalog price rules edition
|
2013-08-05 09:55:29 +02:00 |
|
|
jeromenadaud
|
9ff0d60158
|
[-] BO : FixBug #PSCFV-7839 No invoice file attached to payment email confirmation
|
2013-08-05 09:41:46 +02:00 |
|
|
Kevin Granger
|
9f11ecfd78
|
// Add label attributes for, refacto browse file
|
2013-08-02 18:46:37 +02:00 |
|
|
gRoussac
|
055134719d
|
[-] BO : Fix warning in AdminAttributesGroups after https://github.com/PrestaShop/PrestaShop/pull/392
|
2013-08-02 18:33:53 +02:00 |
|
|
Gregory Roussac
|
47b7e6aab5
|
Merge pull request #392 from ldecoker/patch-4
[-] [BO] : The div for colorAttributeProperties is not closed
|
2013-08-02 09:15:51 -07:00 |
|
|
gRoussac
|
33116dfa47
|
[-] FO : Fix bug #PSCFV-9856 could not add Uncombinable cart rules and Minimum amount check badly calculated
|
2013-08-02 18:00:10 +02:00 |
|
|
Sarah Lorenzini
|
94a43f2991
|
// update advanced parameters and administration tabs
|
2013-08-02 17:44:26 +02:00 |
|
|
Vincent Augagneur
|
be93a00277
|
//new place for validate and add new range && global range validation part 1 on carrier wizard
|
2013-08-02 17:29:15 +02:00 |
|
|
Sarah Lorenzini
|
60f567d2ff
|
// update modules tab
|
2013-08-02 15:20:12 +02:00 |
|
|
Sarah Lorenzini
|
142006e69a
|
// update advanced parameters
|
2013-08-02 15:10:58 +02:00 |
|
|
Vincent Augagneur
|
f55a8c2dd5
|
//remove debug
|
2013-08-02 11:38:38 +02:00 |
|
|
Vincent Augagneur
|
02fdc5fe24
|
//fixed float validation on carrier wizard
|
2013-08-02 11:25:08 +02:00 |
|
|
Vincent Augagneur
|
f2146ac2ae
|
//fixed somes bug on carriers wizard
|
2013-08-02 10:54:07 +02:00 |
|
|
Vincent Augagneur
|
46d0663b2f
|
//remove debug
|
2013-08-02 10:29:30 +02:00 |
|
|
Vincent Augagneur
|
9e720da3d6
|
//carrier wizard free shipping fix & added currency sign on new range
|
2013-08-02 10:22:06 +02:00 |
|
|
Damien Metzger
|
fc63b8ad7f
|
// Improved configuration checklist
|
2013-08-02 09:11:55 +02:00 |
|
|
Kevin Granger
|
32b50b4dad
|
// small fix on carriers wizard ( remove original css, and change js add/remove class .error to .errorStep)
|
2013-08-01 20:25:36 +02:00 |
|
|
Francois Gaillard
|
268b3c6bda
|
// Variables name fixed
|
2013-08-01 19:14:04 +02:00 |
|
|
Francois Gaillard
|
b51d4f4c7d
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-01 19:11:27 +02:00 |
|
|
Francois Gaillard
|
28de7890d2
|
[*] MO : Templates overrides works with the new structure (/views/templates/admin|front|hook)
|
2013-08-01 19:10:25 +02:00 |
|
|
jeromenadaud
|
d8f5caee7b
|
[-] BO : FixBug #PSCFV-7824 No total tax not show in order email confirmation
|
2013-08-01 19:09:34 +02:00 |
|
|
Vincent Augagneur
|
ac48c1b786
|
//remove inline css
|
2013-08-01 18:26:39 +02:00 |
|
|
jeromenadaud
|
3f2da1095f
|
[-] BO: FixBug #PSCFV-10005 Filter on COUNT field
|
2013-08-01 18:06:14 +02:00 |
|
|
jeromenadaud
|
b34acf74f2
|
[-] BO : FixBug Undefined variable title
|
2013-08-01 17:33:53 +02:00 |
|
|
Francois Gaillard
|
07ce127723
|
[-] Classes : Bug fix Validate.php - Error with $mail_name
|
2013-08-01 17:31:45 +02:00 |
|
|
Sarah Lorenzini
|
e2abf3ecb7
|
// update preferences tab -> images controller
|
2013-08-01 17:26:53 +02:00 |
|
|
jeromenadaud
|
24bf5e5bdf
|
[-] BO : FixBug Undefined variable currency
|
2013-08-01 17:26:07 +02:00 |
|
|
Francois Gaillard
|
7e7b5af26e
|
// Profiler fixed
|
2013-08-01 17:21:38 +02:00 |
|
|
Vincent Augagneur
|
1447be6f3c
|
//fixed bug when changing range type
|
2013-08-01 17:16:52 +02:00 |
|
|
Vincent Augagneur
|
fa958c9a5e
|
//carrier wizard currency sign bug
|
2013-08-01 17:13:08 +02:00 |
|
|
jeromenadaud
|
174dfa9a6b
|
[+] BO : Filter button default css class style
|
2013-08-01 17:13:02 +02:00 |
|
|
jeromenadaud
|
a29fa2dd09
|
[+] BO Better filters display
|
2013-08-01 16:59:08 +02:00 |
|
|
Sarah Lorenzini
|
047ab9d681
|
// update images controller
|
2013-08-01 16:45:46 +02:00 |
|
|
Sarah Lorenzini
|
50a54240b9
|
// update images controller
|
2013-08-01 16:43:58 +02:00 |
|
|
Sarah Lorenzini
|
680497f1e3
|
// update preferences tab
|
2013-08-01 16:40:48 +02:00 |
|
|
gRoussac
|
6a073143f2
|
[-] BO : Fix bug #PSCFV-9990 bad count on list header helper
|
2013-08-01 16:15:41 +02:00 |
|
|
gRoussac
|
ccc2312053
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-01 16:12:19 +02:00 |
|