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

2321 Commits

Author SHA1 Message Date
Rémi Gaillard
7ad5729b06 // AdminRequestSql::returnBytes is useless 2013-02-07 14:19:08 +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
d2954b17f6 // something missing in the last commit 2013-02-06 15:48:16 +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
11d4b76c8e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 18:22:58 +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
2704d5e836 // Cannot import in a shop that does not exists 2013-02-05 18:09:32 +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
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
c80e0f48be [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +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
4c87ee0fb0 [-] TR : now you can use " or ' in tpl files 2013-02-05 10:59:29 +01: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
606b3eedd5 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur
d0d3180509 Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur
947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +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
d72ce0d892 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard
a07d1b06fe // Fix PHP Notice 2013-02-04 14:46:55 +01: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
717f42f878 Merge pull request #218 from samy-r/development 
Disable search indexation
 2013-02-01 09:32:57 -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
3b2be13f2e // Added a configuration variable when logged on addons from the back end 2013-02-01 17:47:51 +01:00
Rémi Gaillard
7f59b7254b // small fix 2013-02-01 16:56:30 +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
8b5793094a [-] BO : 'MCached' is 'CacheMemcache' for PS_CACHING_SYSTEM_ 2013-01-30 17:30:21 +01:00
gRoussac
d74f9c837b [-] BO : Fix bug #PSCFI-6902 fatal error when memcache not installed and Memcached previously activated 2013-01-30 16:28:11 +01:00
Rémi Gaillard
808c286468 [-] BO: Fix #PSCFV-7522 update cover image after deleting it 2013-01-30 15:08:24 +01:00
Pierre
0dc94f163b Fixes Syntax Error in Line 126 
There was a Typo / Syntax Error in Line 116.
 2013-01-29 13:43:12 +01:00
Gregory Roussac
d38ed338bf [-] BO : Fix warnings when importing #PSCFV-6648 again 2013-01-29 12:33:15 +01:00
Gregory Roussac
b51bf1af25 [-] BO : Fiw warning on $current_order_state 2013-01-29 12:21:33 +01:00
Gregory Roussac
54fb5b7eb7 [-] Bo : Fix warnings #PSCFV-6648 2013-01-29 11:55:51 +01:00
Damien Metzger
6f7e8cb741 // Added comments in a function 2013-01-29 10:16:02 +01:00
Rémi Gaillard
d10daeedbb [-] BO: Fix possible PHP notice on AdminGroups #PSCFV-7412 2013-01-25 15:27:37 +01:00
vAugagneur
8cedf1c43a [-] BO - fixed bug #PSCFV-6248 don't delete product when delete category and choose option to delete products 2013-01-24 18:51:09 +01:00
vAugagneur
ab3226d9d2 [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
Rémi Gaillard
150f8ae528 [-] BO: Fix translations for overridden templates #PSCFV-7391 2013-01-23 14:58:37 +01:00
Rémi Gaillard
9e45ad974a [-] BO: Allow override for emails translations on the default theme without MODE_DEV 2013-01-22 15:07:25 +01:00
Samy Rabih
db3be40c06 Disable search indexation 
Search indexation is very CPU-intensive, it should not be used here
 2013-01-22 14:34:17 +01:00
Vincent Augagneur
b4864f83f6 Merge pull request #190 from PrestaEdit/patch-13 
[-] BO: Standard Norm
 2013-01-22 03:02:05 -08:00
vAugagneur
517e90da43 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
gRoussac
17be5368c7 [*] BO : Fix #PSCFI-6225 for 1.5.X 2013-01-21 15:41:13 +01:00
Rémi Gaillard
0d058a5d50 [-] BO: Fix #PSCFV-6367 don't display the payment modules on BackOffice orders if they are disabled 2013-01-18 17:01:47 +01:00
PrestaEdit
fb27c9d5cc [-] BO: Standard Norm 2013-01-18 00:08:38 +01:00
PrestaEdit
4fd9908953 [*] BO : use the employee lang 2013-01-17 22:00:44 +01:00
Rémi Gaillard
3fe27697a8 // Something was missing in commit ee62ed8d27 2013-01-17 17:27:59 +01:00
Francois Gaillard
1060bb3141 Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development 2013-01-16 18:47:39 +01:00
Francois Gaillard
9390dd63af // AdminHomeController, syntax changed 2013-01-16 18:47:29 +01:00
vAugagneur
6d46644cc4 [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format 2013-01-16 18:24:11 +01:00
vAugagneur
1c6a4c842c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-16 10:36:29 +01:00