bfa5bae702
// Fixed display of root category
2013-08-06 17:45:24 +02:00
5be8e169f5
// Fixed totally unexplicable behavior
2013-08-06 17:40:49 +02:00
ea5f4476a6
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 16:56:05 +02:00
5ed75901fb
//typo
2013-08-06 16:55:51 +02:00
2303677ebf
// Rollback a modification in object model
2013-08-06 16:52:13 +02:00
a1cf8d462f
// Keep remote file retrieval in the right order
2013-08-06 16:42:10 +02:00
b701acc8cf
// Clean language pack retrieval
2013-08-06 16:15:30 +02:00
bcaa625f4c
//default language fix in carrier wizard
2013-08-06 16:05:36 +02:00
c8564fa6b2
// Quick CSS fix
2013-08-06 16:02:22 +02:00
d783160af0
// Updated installer
2013-08-06 15:53:59 +02:00
375fa451d8
[-] FO : FixBug No warning message when no carriers available from advanced stock management
2013-08-06 15:53:25 +02:00
38753716e2
// Hide "is root category" option outside multistore
2013-08-06 15:42:31 +02:00
4bd59c14cc
[*] FO : Blur for tab navigation, followup a0ee3d3, thanks @Seynaeve
2013-08-06 15:21:46 +02:00
a739117f0d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 15:20:07 +02:00
8103e89874
[*] FO : Blur for tab navigation, followup a0ee3d3c34, thanks @Seynaeve
2013-08-06 15:19:47 +02:00
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
dbb2b50555
[-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl
2013-08-06 15:15:03 +02:00
c966eea140
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 15:11:46 +02:00
9caf97ff30
// Add check in object model
2013-08-06 15:11:23 +02:00
c9bf17f400
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 15:09:38 +02:00
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
3839dbee9a
/ Add check in object model
2013-08-06 15:06:46 +02:00
85e15c00f1
// Added missing french translation in the installer
2013-08-06 14:30:43 +02:00
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
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
818e82c09c
Merge pull request #486 from PhpMadman/patch-1
...
[-] FO : In stock sort is now removed when Stock managment is disabled
2013-08-06 02:49:48 -07:00
3f6ee7cfdd
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 11:46:15 +02:00
7b600ad07f
//small css fix
2013-08-06 11:45:59 +02:00
fe0afeadc9
[-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl (translation doesnt work), thanks @mypresta-eu
2013-08-06 11:45:29 +02:00
478e338df0
//added active field on carrier wizard
2013-08-06 11:40:03 +02:00
6449437f58
// norms
2013-08-06 11:38:34 +02:00
084880abda
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 11:38:24 +02:00
16d942b7b6
[*] BO : Do not insert duplicates in product_carrier, thanks @edamart
2013-08-06 11:22:40 +02:00
81e4a5f635
[*] BO : Do not insert duplicates in poruct_carrier, thanks @edamart
2013-08-06 11:19:34 +02:00
c0bc3bda29
// Bug fix template override & admin templates
2013-08-06 11:13:49 +02:00
33bdfa9c96
//added some help
2013-08-06 11:06:36 +02:00
1b93d251aa
Merge pull request #630 from rimas-kudelis/development
...
[*] CORE :ProductCore::addSupplierReference() if a reference already exists update it
2013-08-06 01:51:34 -07:00
edfe77b74f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 10:43:14 +02:00
a69d1c6d05
Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug
...
Conflicts:
controllers/admin/AdminPerformanceController.php
install-dev/data/xml/configuration.xml
2013-08-06 10:42:44 +02:00
f557f24df4
// Fixed module cache key (with the country)
2013-08-06 10:41:58 +02:00
77ba55b090
Merge pull request #629 from ChristopheBoucaut/patch-4
...
[-] WS : setFieldsToDisplay() calls $this->resourceConfiguration, never initialized
2013-08-06 01:30:46 -07:00
5bcfc7d4e9
//carrier wizard step validation part 2
2013-08-06 10:30:10 +02:00
83740496de
Update more properties of supplier reference in ProductCore::addSupplierReference() if a reference already exists.
2013-08-06 11:28:42 +03:00
fe58053439
//carrier wizard step validation
2013-08-06 10:27:32 +02:00
0139e3f877
Update WebserviceRequest.php
...
The deleted method calls $this->resourceConfiguration, which is never initialized in specific web services, so if we use the "display" parameter, the webservice returns an error
2013-08-06 10:22:45 +02:00
23b9c3b8f9
Merge pull request #627 from davyrolink/upstream
...
[*] CORE : add $smarty to params in smartyHook function
2013-08-06 01:10:41 -07:00
88d4f57894
//carrier range validation fix
2013-08-06 10:04:54 +02:00
29bbe81ae6
// CloudCache removed from AdminPerformanceController
2013-08-06 09:25:47 +02:00
0b99a7b331
added the smarty var to the hook_params, this makes it possible to create modules that can assign variables to the smarty local scope
2013-08-05 23:20:19 +02:00
5f0ef76731
Merge pull request #626 from davyrolink/upstream
...
[-] CORE : id_address_invoice was not updated, updateAddressId method
2013-08-05 14:13:54 -07:00
Damien Metzger