dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,638 Commits 9 Branches 19 Tags
2a28e476500cd854d9e80d4bb0ded5da170e0615
Commit Graph

4969 Commits

Author SHA1 Message Date
Damien Metzger
7d0e0a7f38 // Removed useless Tools::safeOutput before insertion in the database 2013-08-13 18:21:23 +02:00
gRoussac
e8685b1430 [*] BO : Add clear smarty cache button 2013-08-13 15:11:00 +02:00
Damien Metzger
b1b636a911 // Added helpbox and fixed translation 2013-08-13 14:16:40 +02:00
Rémi Gaillard
9c523cf7eb // Log for product deletion was missing 2013-08-13 10:21:01 +02:00
Vincent Augagneur
da02895432 //fix carrier wizard with multistore part2 2013-08-13 10:10:27 +02:00
Vincent Augagneur
6cfde246a2 //fix carrier wizard with multistore 2013-08-13 10:09:19 +02:00
Vincent Augagneur
e2e5fbe33a //now you can delete all carriers 2013-08-12 15:25:26 +02:00
Vincent Augagneur
30c9156a41 [-] BO : fixed bug #PSCFV-10091 - you can now enable all zone in one clic 2013-08-12 14:56:49 +02:00
Vincent Augagneur
627e3d8a77 [-] BO : fixed multistore thumbnail on product list 2013-08-12 11:27:25 +02:00
Vincent Augagneur
3664f4c394 //reorganization of shipping menus & options 2013-08-12 11:02:28 +02:00
Jerome Nadaud
501cbea5aa [-] BO : FixBug root category listed after list reset 2013-08-09 18:45:40 +02:00
Jerome Nadaud
c35d846f60 [-] BO : FixBug root category listed after list reset 2013-08-09 12:16:05 +02:00
Jerome Nadaud
75f0b38ff1 // Syntax error 2013-08-09 11:38:59 +02:00
Vincent Augagneur
1571dd60c8 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-09 10:44:24 +02:00
Vincent Augagneur
13be8db639 //added checkbox for all zones 2013-08-09 10:44:20 +02:00
gRoussac
16fec55c6f // report of 0023950c72 2013-08-08 12:16:19 +02:00
Rémi Gaillard
cbdea59753 // revert 1c80b5fdfe 2013-08-08 11:50:35 +02:00
PrestaEdit
0023950c72 [-] BO: correct link in Block Discover. 2013-08-08 11:44:24 +02:00
gRoussac
5b3dda1cfb Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-08 11:05:37 +02:00
gRoussac
1c80b5fdfe [-] BO : list of carriers should only contain the active one in AdminProducts 2013-08-08 11:05:09 +02:00
Damien Metzger
4709f4a3c0 [-] MO : fixed module upgrade with common version number 2013-08-08 11:03:22 +02:00
gRoussac
5df213f5ae Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-08-07 15:06:50 +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
gRoussac
82621c08ec [-] BO : Do not display root category bool if addrootcategory not in url 2013-08-07 11:51:48 +02: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
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
Gregory Roussac
bf355e934e Merge pull request #634 from PhpMadman/RefSort 
[*] FO : Sort by Product reference
 2013-08-06 09:13:06 -07:00
Damien Metzger
bfa5bae702 // Fixed display of root category 2013-08-06 17:45:24 +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
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
Vincent Augagneur
bcaa625f4c //default language fix in carrier wizard 2013-08-06 16:05:36 +02:00
Damien Metzger
38753716e2 // Hide "is root category" option outside multistore 2013-08-06 15:42:31 +02:00
PhpMadman
5e73f0cb07 [*] BO: Add reference to Options 2013-08-06 15:34:58 +02:00
Vincent Augagneur
478e338df0 //added active field on carrier wizard 2013-08-06 11:40:03 +02:00
Vincent Augagneur
33bdfa9c96 //added some help 2013-08-06 11:06:36 +02:00
gRoussac
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
Vincent Augagneur
5bcfc7d4e9 //carrier wizard step validation part 2 2013-08-06 10:30:10 +02:00
Vincent Augagneur
fe58053439 //carrier wizard step validation 2013-08-06 10:27:32 +02:00
Francois Gaillard
29bbe81ae6 // CloudCache removed from AdminPerformanceController 2013-08-06 09:25:47 +02:00
jeromenadaud
8be06bba2d [-] BO : FixBug Multiple list pagination error. 2013-08-05 18:22:30 +02:00
gRoussac
d585b015c1 // move toolbar delete button on AdminProducts 2013-08-05 18:18:35 +02:00
jeromenadaud
114eb3b78b [-] BO : FixBug Manufacturer multilist pagination, filter, order problems and manufacturer address filter exception 2013-08-05 16:32:39 +02:00
jeromenadaud
48f041f035 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:12:04 +02:00
jeromenadaud
b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist 2013-08-05 16:11:48 +02:00