dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jerome Nadaud 95f775daa1 [+] BO : Catalog Bulk actions 2013-08-07 10:52:23 +02:00
Jerome Nadaud d95aae9a7b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-07 10:44:42 +02:00
Jerome Nadaud 816a39fb4f [+] BO : Footer list bulk actions 2013-08-07 10:43:53 +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
Kevin Granger 349c98d567 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
# By Jerome Nadaud
# Via Jerome Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [+] BO : New Bulk actions button
 2013-08-06 19:07:59 +02:00
Kevin Granger ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
gRoussac 7089ce10ef // remove warnings in blockwishlist 2013-08-06 19:05:08 +02:00
Jerome Nadaud bb4a72f46d [+] BO : New Bulk actions button 2013-08-06 19:04:44 +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
Jerome Nadaud 0c4aeb31b8 [+] BO : Better action list button 2013-08-06 18:34:31 +02: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 MetzgerandFrancois Gaillard 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