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
Rémi Gaillard
76c80680a2 [-] BO: Forbid to add a pack into a pack 2013-02-06 20:10:59 +01:00
Rémi Gaillard
655ab84d07 [-] BO: Forbid to add a pack into a pack 2013-02-06 20:10:59 +01:00
Rémi Gaillard
08d5440c7f // something missing in the last commit 2013-02-06 15:48:16 +01:00
Rémi Gaillard
d2954b17f6 // something missing in the last commit 2013-02-06 15:48:16 +01:00
Rémi Gaillard
fbf48fadf8 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails 2013-02-06 15:28:57 +01:00
Rémi Gaillard
022464c578 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails 2013-02-06 15:28:57 +01:00
Rémi Gaillard
604602a6b6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 18:22:58 +01:00
Rémi Gaillard
11d4b76c8e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 18:22:58 +01:00
Damien Metzger
38cc7103fb // Fixed conversion commar/dot for floating value in CSV import 2013-02-05 18:09:32 +01:00
Damien Metzger
15badf72e0 // Fixed conversion commar/dot for floating value in CSV import 2013-02-05 18:09:32 +01:00
Damien Metzger
2df3e7ee8b // Cannot import in a shop that does not exists 2013-02-05 18:09:32 +01:00
Damien Metzger
2704d5e836 // Cannot import in a shop that does not exists 2013-02-05 18:09:32 +01:00
Rémi Gaillard
4fe6006e20 [-] BO: Forbid to delete the defaults return statuses 2013-02-05 17:04:17 +01:00
Rémi Gaillard
9c816410c0 [-] BO: Forbid to delete the defaults return statuses 2013-02-05 17:04:17 +01:00
Rémi Gaillard
61265e587f [-] BO: Fix error message for new language creation and iso code not exists 2013-02-05 16:33:29 +01:00
Rémi Gaillard
801b73055e [-] BO: Fix error message for new language creation and iso code not exists 2013-02-05 16:33:29 +01:00
Rémi Gaillard
d2ba246a08 [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +01:00
Rémi Gaillard
c80e0f48be [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +01:00
Rémi Gaillard
0836efb02f [-] BO: Not allow to give an existing email when editing an employee 2013-02-05 12:20:46 +01:00
Rémi Gaillard
64d7655c6e [-] BO: Not allow to give an existing email when editing an employee 2013-02-05 12:20:46 +01:00
vAugagneur
3f8fce6720 [-] TR : now you can use " or ' in tpl files 2013-02-05 10:59:29 +01:00
vAugagneur
4c87ee0fb0 [-] TR : now you can use " or ' in tpl files 2013-02-05 10:59:29 +01:00
Vincent Augagneur
fdf5a4c3e1 Merge pull request #129 from PrestaEdit/Forum-#213412 
[-] BO: don't have the delivery PDF - User can define which statuses sho...
 2013-02-05 00:59:48 -08:00
Vincent Augagneur
2aa0f3e93c Merge pull request #129 from PrestaEdit/Forum-#213412 
[-] BO: don't have the delivery PDF - User can define which statuses sho...
 2013-02-05 00:59:48 -08:00
vAugagneur
4ef61eb8f8 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur
606b3eedd5 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur
b23aa76d6b Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur
d0d3180509 Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur
0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
vAugagneur
947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Rémi Gaillard
1dbf4855cc [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00
Rémi Gaillard
44d26d5804 [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00
Rémi Gaillard
7bd44ca1b1 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard
d72ce0d892 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard
d6bd352844 // Fix PHP Notice 2013-02-04 14:46:55 +01:00
Rémi Gaillard
a07d1b06fe // Fix PHP Notice 2013-02-04 14:46:55 +01:00
Damien Metzger
ad7cd0b467 Merge pull request #188 from PrestaEdit/patch-11 
[*] BO : use the employee lang
 2013-02-01 10:43:57 -08:00
Damien Metzger
aed9c5dac2 Merge pull request #188 from PrestaEdit/patch-11 
[*] BO : use the employee lang
 2013-02-01 10:43:57 -08:00
Damien Metzger
836791bb7a Merge pull request #218 from samy-r/development 
Disable search indexation
 2013-02-01 09:32:57 -08:00
Damien Metzger
717f42f878 Merge pull request #218 from samy-r/development 
Disable search indexation
 2013-02-01 09:32:57 -08:00
Damien Metzger
dc8fca0912 Merge pull request #234 from bloodywing/development 
[-] BO : Fixes Syntax Error in Line 126 in AdminSearchConfController.php
 2013-02-01 09:32:06 -08:00
Damien Metzger
e0d51c6392 Merge pull request #234 from bloodywing/development 
[-] BO : Fixes Syntax Error in Line 126 in AdminSearchConfController.php
 2013-02-01 09:32:06 -08:00
Damien Metzger
35c31ff108 // Added a configuration variable when logged on addons from the back end 2013-02-01 17:47:51 +01:00
Damien Metzger
3b2be13f2e // Added a configuration variable when logged on addons from the back end 2013-02-01 17:47:51 +01:00
Rémi Gaillard
6a261cbc66 // small fix 2013-02-01 16:56:30 +01:00
Rémi Gaillard
7f59b7254b // small fix 2013-02-01 16:56:30 +01:00
Damien Metzger
d586489556 // Do not search in deactivated tabs (you can still search in forbidden tab however) 2013-01-31 17:04:59 +01:00
Damien Metzger
b3aa281713 // Do not search in deactivated tabs (you can still search in forbidden tab however) 2013-01-31 17:04:59 +01:00
gRoussac
ebb576f014 [-] BO : 'MCached' is 'CacheMemcache' for PS_CACHING_SYSTEM_ 2013-01-30 17:30:21 +01:00
gRoussac
8b5793094a [-] BO : 'MCached' is 'CacheMemcache' for PS_CACHING_SYSTEM_ 2013-01-30 17:30:21 +01:00