 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 |
|
|
Francois Gaillard
|
07ce127723
|
[-] Classes : Bug fix Validate.php - Error with $mail_name
|
2013-08-01 17:31:45 +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 |
|
|
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 |
|
|
gRoussac
|
1028c8671c
|
[-] CORE : Merge from PrestaEdit last pull request again
|
2013-08-01 16:12:05 +02:00 |
|
|
Vincent Augagneur
|
adede4f7ea
|
//small fix
|
2013-08-01 16:11:50 +02:00 |
|
|
Vincent Augagneur
|
9c86943e2a
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-01 16:03:19 +02:00 |
|
|
Vincent Augagneur
|
c0db0bfca9
|
//Added currency sign and weigh unit on carrier wizard
|
2013-08-01 16:03:14 +02:00 |
|
|
Damien Metzger
|
b27d030fd2
|
// Added units to package dimensions
|
2013-08-01 15:52:07 +02:00 |
|
|
Vincent Augagneur
|
79a4a84163
|
//small fix on carrier wizard oups
|
2013-08-01 15:41:42 +02:00 |
|
|
Vincent Augagneur
|
f5454748b2
|
//small fix on carrier wizard
|
2013-08-01 15:41:01 +02:00 |
|
|
Vincent Augagneur
|
9df90cc575
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-01 15:23:30 +02:00 |
|
|
Vincent Augagneur
|
c9b1546a2e
|
//disabled all fess when carrier is free
|
2013-08-01 15:23:26 +02:00 |
|
|
jeromenadaud
|
550aa01faf
|
[-] BO : FixBug #PSCFV-9859 Carriers free shipping inline edit
|
2013-08-01 15:14:14 +02:00 |
|
|
jeromenadaud
|
48067e1a3d
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-01 15:12:37 +02:00 |
|
|
gRoussac
|
7fb483eaa2
|
// harmonisation within Tools:: instead self::
|
2013-08-01 15:07:38 +02:00 |
|
|
gRoussac
|
c9bb88cac7
|
// harmonisation within Tools:: instead self::
|
2013-08-01 14:52:29 +02:00 |
|
|
Gregory Roussac
|
99ebde1e8e
|
Merge pull request #622 from PrestaEdit/patch-48
[*] CORE : toCamelCase should use utf8 Tools functions
|
2013-08-01 05:48:49 -07:00 |
|
|
PrestaEdit
|
37cd2a3ab3
|
[*] Class: Tools / toCamelCase
Change the name of the var to a correct name.
Use the Tools method like strtolower, ucfirst and strtoupper.
|
2013-08-01 14:42:51 +02:00 |
|
|
gRoussac
|
fd7facc9b1
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-01 14:28:41 +02:00 |
|
|
gRoussac
|
8a9376ae22
|
[-] FO : Fix bug #PSCFV-9993 could not see product quantity in pack content
|
2013-08-01 14:28:36 +02:00 |
|
|
gRoussac
|
2b6b65a303
|
// norms
|
2013-08-01 14:27:50 +02:00 |
|
|
jeromenadaud
|
409bc533cd
|
[-] BO : FixBug #PSCFV-9748 Missing confirmation and update button problem
|
2013-08-01 14:21:48 +02:00 |
|
|
Vincent Augagneur
|
c6c4fd03e8
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-01 14:12:39 +02:00 |
|
|
Vincent Augagneur
|
0898a63060
|
//fixed bug when carrier is free
|
2013-08-01 14:12:32 +02:00 |
|
|
Damien Metzger
|
82a912e3f1
|
// Fixed iframe height in the installer
|
2013-08-01 12:30:38 +02:00 |
|
|
Damien Metzger
|
3cfa17b837
|
// Improved help iframe in the installer
|
2013-08-01 12:30:38 +02:00 |
|
|
Vincent Augagneur
|
afd41af8c5
|
//carrier wizard fix logo duplication when edit carrier
|
2013-08-01 12:20:55 +02:00 |
|
|
Vincent Augagneur
|
5f9d83dd37
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-01 12:10:06 +02:00 |
|
|
Vincent Augagneur
|
59fca8eb85
|
//carrier wizard fix when range as no fees
|
2013-08-01 12:09:58 +02:00 |
|
|
gRoussac
|
3e75881bdc
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-08-01 11:48:50 +02:00 |
|
|
Vincent Augagneur
|
dfb1924884
|
//carrier wizard fix when edit a carrier
|
2013-08-01 11:47:39 +02:00 |
|
|
gRoussac
|
184a1c561c
|
[-] FO : Fix bug #PSCFV-9847 Cart Rule not updated when address is updated on Checkout Page
|
2013-08-01 11:44:00 +02:00 |
|
|
Vincent Augagneur
|
c432c44987
|
//carrier wizard fix
|
2013-08-01 11:42:58 +02:00 |
|
|
Vincent Augagneur
|
bf7c38ef49
|
//carrier wizard fix
|
2013-08-01 11:28:53 +02:00 |
|
|
Damien Metzger
|
af9397a11b
|
[-] BO : fixed domain warning
|
2013-08-01 10:50:21 +02:00 |
|