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

6077 Commits

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
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
Jerome Nadaud 95f775daa1 [+] BO : Catalog Bulk actions 2013-08-07 10:52:23 +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
Jerome Nadaud bb4a72f46d [+] BO : New Bulk actions button 2013-08-06 19:04:44 +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
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
Vincent Augagneur 478e338df0 //added active field on carrier wizard 2013-08-06 11:40:03 +02:00
gRoussac 6449437f58 // norms 2013-08-06 11:38:34 +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
Vincent Augagneur 5a88dc0f8b //fixed bug on carrier wizard when edit carrier 2013-08-05 14:06:50 +02:00
Sarah Lorenzini 6533ee4bec // update stock tab 2013-08-05 12:13:43 +02:00
Damien Metzger 144c85ed4f // Removed useless param 2013-08-05 11:40:03 +02:00
gRoussac 19918dea8e [-] BO : Fix bug #PSCFV-8139 bad renderform on errors in AdminStatuses 2013-08-05 10:47:04 +02:00
Kevin Granger 9f11ecfd78 // Add label attributes for, refacto browse file 2013-08-02 18:46:37 +02:00
gRoussac 055134719d [-] BO : Fix warning in AdminAttributesGroups after https://github.com/PrestaShop/PrestaShop/pull/392 2013-08-02 18:33:53 +02:00
Gregory Roussac 47b7e6aab5 Merge pull request #392 from ldecoker/patch-4 
[-] [BO] : The div for colorAttributeProperties is not closed
 2013-08-02 09:15:51 -07:00
Sarah Lorenzini 94a43f2991 // update advanced parameters and administration tabs 2013-08-02 17:44:26 +02:00
Vincent Augagneur be93a00277 //new place for validate and add new range && global range validation part 1 on carrier wizard 2013-08-02 17:29:15 +02:00
Sarah Lorenzini 142006e69a // update advanced parameters 2013-08-02 15:10:58 +02:00
Vincent Augagneur f2146ac2ae //fixed somes bug on carriers wizard 2013-08-02 10:54:07 +02:00
Vincent Augagneur 9e720da3d6 //carrier wizard free shipping fix & added currency sign on new range 2013-08-02 10:22:06 +02:00
Damien Metzger fc63b8ad7f // Improved configuration checklist 2013-08-02 09:11:55 +02:00
jeromenadaud 3f2da1095f [-] BO: FixBug #PSCFV-10005 Filter on COUNT field 2013-08-01 18:06:14 +02:00
Sarah Lorenzini 680497f1e3 // update preferences tab 2013-08-01 16:40:48 +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