gRoussac
5df213f5ae
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2013-08-07 15:06:50 +02:00
Gregory Roussac
942a946147
Merge pull request #497 from romainberger/development
...
[*] MO: Referral program: display currency in account page next to the voucher value
2013-08-07 05:59:29 -07:00
Jerome Nadaud
5f1506ffc2
[-] BO : FixBug #PSCFV-10037 for to choose a state when state is enabled for country
2013-08-07 14:09:40 +02:00
Rémi Gaillard
d916e65a14
// missing return
2013-08-07 13:56:12 +02:00
Rémi Gaillard
6ccf3e839d
// change passwd in cookie after changed it
2013-08-07 13:51:18 +02:00
gRoussac
e43f0619ca
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2013-08-07 11:53:23 +02:00
Jerome Nadaud
cd1ed74d8e
[-] BO : FixBug #PSCFV-10038 escaped quote in address fields
2013-08-07 11:53:12 +02:00
gRoussac
82621c08ec
[-] BO : Do not display root category bool if addrootcategory not in url
2013-08-07 11:51:48 +02:00
Gregory Roussac
d99a5a740e
Merge pull request #638 from vinvin27/patch-1
...
// parse error
2013-08-07 02:51:21 -07:00
vinvin27
843989489d
Update AdminPPreferencesController.php
...
Parse error: syntax error, unexpected T_ARRAY, expecting ')' in /controllers/admin/AdminPPreferencesController.php on line 120
2013-08-07 11:47:56 +02:00
Rémi Gaillard
e6a819e5dd
// Fix double quote translations
2013-08-07 11:29:34 +02:00
Jerome Nadaud
a32ff1e930
[-] BO : FixBug Missing tpl dir in default layout
2013-08-07 11:17:42 +02:00
gRoussac
ac21fa9808
[-] MO : Missing image in my account for MODULE WishList
2013-08-07 10:56:09 +02:00
Gregory Roussac
3213b5dffb
Merge pull request #635 from cippest/development
...
[-] BO : missing order lang in Mail::l for in_transit email
2013-08-06 11:23:19 -07:00
cippest
f8efd7a329
[-] BO : Fix send e-mails updating tracking number
...
Hi,
We've fixed some bugs parameters about the Send function of Mail class in the AdminOrdersController.php.
Regards,
Massimo.
2013-08-06 19:51:16 +02:00
gRoussac
7089ce10ef
// remove warnings in blockwishlist
2013-08-06 19:05:08 +02:00
Gregory Roussac
b1ea66d510
Merge pull request #528 from ldecoker/patch-7
...
[-] FO : missing $tpl_dir shopping-cart.tpl pathes
2013-08-06 09:57:36 -07:00
Gregory Roussac
bf355e934e
Merge pull request #634 from PhpMadman/RefSort
...
[*] FO : Sort by Product reference
2013-08-06 09:13:06 -07:00
Vincent Augagneur
67b44b5f17
//fixed carrier bug and added typewatch plugin on range validation
2013-08-06 18:04:12 +02:00
Damien Metzger
bfa5bae702
// Fixed display of root category
2013-08-06 17:45:24 +02:00
Damien Metzger
5be8e169f5
// Fixed totally unexplicable behavior
2013-08-06 17:40:49 +02:00
Vincent Augagneur
ea5f4476a6
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 16:56:05 +02:00
Vincent Augagneur
5ed75901fb
//typo
2013-08-06 16:55:51 +02:00
Damien Metzger
2303677ebf
// Rollback a modification in object model
2013-08-06 16:52:13 +02:00
Damien Metzger
a1cf8d462f
// Keep remote file retrieval in the right order
2013-08-06 16:42:10 +02:00
Damien Metzger
b701acc8cf
// Clean language pack retrieval
2013-08-06 16:15:30 +02:00
PhpMadman
e4a42ab2b1
Update AdminPPreferencesController.php
2013-08-06 16:08:09 +02:00
PhpMadman
d4270289c1
Update category-product-sort.tpl
2013-08-06 16:06:03 +02:00
Vincent Augagneur
bcaa625f4c
//default language fix in carrier wizard
2013-08-06 16:05:36 +02:00
Damien Metzger
c8564fa6b2
// Quick CSS fix
2013-08-06 16:02:22 +02:00
Damien Metzger
d783160af0
// Updated installer
2013-08-06 15:53:59 +02:00
Jerome Nadaud
375fa451d8
[-] FO : FixBug No warning message when no carriers available from advanced stock management
2013-08-06 15:53:25 +02:00
Damien Metzger
38753716e2
// Hide "is root category" option outside multistore
2013-08-06 15:42:31 +02:00
PhpMadman
598a5b3188
[*] FO : Add reference sort to theme
2013-08-06 15:38:25 +02:00
PhpMadman
cd254f8795
[*] FO : Add reference sort to theme
2013-08-06 15:37:10 +02:00
PhpMadman
5e73f0cb07
[*] BO: Add reference to Options
2013-08-06 15:34:58 +02:00
PhpMadman
6a54f6efd5
[*] BO: Add reference to FrontController
2013-08-06 15:32:30 +02:00
gRoussac
4bd59c14cc
[*] FO : Blur for tab navigation, followup a0ee3d3, thanks @Seynaeve
2013-08-06 15:21:46 +02:00
gRoussac
a739117f0d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 15:20:07 +02:00
gRoussac
8103e89874
[*] FO : Blur for tab navigation, followup a0ee3d3c34, thanks @Seynaeve
2013-08-06 15:19:47 +02:00
Gregory Roussac
a0ee3d3c34
Merge pull request #633 from Seynaeve/patch-1
...
[*] FO : Allow B2B to navigate through the form with Tab betwwen company and VAT field
2013-08-06 06:17:06 -07:00
gRoussac
dbb2b50555
[-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl
2013-08-06 15:15:03 +02:00
gRoussac
c966eea140
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 15:11:46 +02:00
Damien Metzger
9caf97ff30
// Add check in object model
2013-08-06 15:11:23 +02:00
gRoussac
c9bf17f400
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 15:09:38 +02:00
Gregory Roussac
12a3ef3a12
Merge pull request #486 from PhpMadman/patch-1
...
[-] FO : In stock sort is now removed when Stock managment is disabled
2013-08-06 15:08:55 +02:00
Damien Metzger
3839dbee9a
/ Add check in object model
2013-08-06 15:06:46 +02:00
Damien Metzger
85e15c00f1
// Added missing french translation in the installer
2013-08-06 14:30:43 +02:00
Seynaeve
4d29142907
Allow B2B to navigate through the form with Tab
...
With
$('#company').blur(function(){
VAT only appears when we leave the input and therefore does not allow to navigate through the form with Tab
With
$('#company').on('input',function(){
that work
2013-08-06 14:15:45 +02:00
Gregory Roussac
ba69e48f72
Merge pull request #488 from camlafit/pr-countriesbrowser
...
[*] FO : Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE
2013-08-06 03:07:13 -07:00
