 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 |
|
|
Kevin Granger
|
5defc39def
|
[+] BO Images / Marketing / Spe. Prices Rules
|
2013-08-01 14:42:43 +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 |
|
|
Damien Metzger
|
ebe8d6294d
|
// CSS fix for carrier wizard
|
2013-08-01 09:34:07 +02:00 |
|
|
Damien Metzger
|
0d7ca1d8cf
|
// Install version ready for 1.5.5
|
2013-08-01 09:21:51 +02:00 |
|
|
Kevin Granger
|
e4878ba393
|
// I'm not sure as I've never had a look at how that works before ;)
|
2013-07-31 21:17:03 +02:00 |
|
|
Damien Metzger
|
168759a383
|
// Stock performance optimization
|
2013-07-31 18:46:45 +02:00 |
|
|
Damien Metzger
|
e930d40482
|
// Added debug function Tools::debug_backtrace()
|
2013-07-31 18:46:45 +02:00 |
|
|
jeromenadaud
|
50bdfb9a1a
|
[-] BO FixBug Action button in list content
|
2013-07-31 18:44:20 +02:00 |
|
|
jeromenadaud
|
017e5ccbc8
|
[+] BO Pagination, filter and display
|
2013-07-31 18:37:01 +02:00 |
|
|
Vincent Augagneur
|
33951c1834
|
//fixed carrier wizard summary range limit
|
2013-07-31 18:14:13 +02:00 |
|
|
Vincent Augagneur
|
d3b000e72f
|
//fixed bug on carrier wizard when is_free
|
2013-07-31 18:09:00 +02:00 |
|
|
jeromenadaud
|
683818ebd4
|
[+] BO : Remove advanced header on empty list
|
2013-07-31 18:04:28 +02:00 |
|
|
Sarah Lorenzini
|
ca253bcda2
|
// update preferences tab
|
2013-07-31 17:43:48 +02:00 |
|
|
Vincent Augagneur
|
e1fa26d002
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-31 17:33:19 +02:00 |
|
|
Vincent Augagneur
|
32f23a79a4
|
//carrier wizard added validation fields
|
2013-07-31 17:33:09 +02:00 |
|
|
Vincent Augagneur
|
60ecfaafd2
|
//fixed bug on carrier wizard tabindex
|
2013-07-31 17:16:52 +02:00 |
|
|
gRoussac
|
c41537f4e4
|
[-] INSTALLER : missing parenthesis in SQL in set_product_suppliers, thanks to @EvaldasUzkuras
|
2013-07-31 16:08:54 +02:00 |
|
|
gRoussac
|
e85ffae69d
|
[-] INSTALLER : Fix bug while updateing supplier reference, back from https://github.com/PrestaShop/PrestaShop/pull/618 thanks @EvaldasUzkuras
|
2013-07-31 15:55:06 +02:00 |
|
|
gRoussac
|
5e0b5db23b
|
[*] BO : refact for modules exeptions regarding https://github.com/PrestaShop/PrestaShop/pull/614
|
2013-07-31 15:16:42 +02:00 |
|