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

2323 Commits

Author SHA1 Message Date
gRoussac
c83a0fda3f // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
Rémi Gaillard
90462ad746 [-] BO: Fix connection with Addons on AdminModules 2013-02-07 18:01:53 +01:00
Rémi Gaillard
5ba95dddc9 // AdminRequestSql::returnBytes is useless 2013-02-07 14:19:08 +01:00
Rémi Gaillard
76c80680a2 [-] 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
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
604602a6b6 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
2df3e7ee8b // 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
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
d2ba246a08 [-] 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
vAugagneur
3f8fce6720 [-] 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
vAugagneur
4ef61eb8f8 [-] 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
0de5c242ca [+] 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
7bd44ca1b1 [-] 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
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
836791bb7a 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
35c31ff108 // 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
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
gRoussac
ebb576f014 [-] BO : 'MCached' is 'CacheMemcache' for PS_CACHING_SYSTEM_ 2013-01-30 17:30:21 +01:00
gRoussac
6b691cb7a8 [-] 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
6ab30bdcf4 [-] BO: Fix #PSCFV-7522 update cover image after deleting it 2013-01-30 15:08:24 +01:00
Pierre
7d3fba413a 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
6d61b22a4f [-] BO : Fix warnings when importing #PSCFV-6648 again 2013-01-29 12:33:15 +01:00
Gregory Roussac
15c64e9f81 [-] BO : Fiw warning on $current_order_state 2013-01-29 12:21:33 +01:00
Gregory Roussac
84005fea26 [-] Bo : Fix warnings #PSCFV-6648 2013-01-29 11:55:51 +01:00
Damien Metzger
57020bce60 // Added comments in a function 2013-01-29 10:16:02 +01:00
Rémi Gaillard
2de82a404f [-] BO: Fix possible PHP notice on AdminGroups #PSCFV-7412 2013-01-25 15:27:37 +01:00
vAugagneur
578139a462 [-] 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
bc203bfc3a [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
Rémi Gaillard
e660265a1c [-] BO: Fix translations for overridden templates #PSCFV-7391 2013-01-23 14:58:37 +01:00
Rémi Gaillard
8f80654965 [-] BO: Allow override for emails translations on the default theme without MODE_DEV 2013-01-22 15:07:25 +01:00
Samy Rabih
8e80cdb6b7 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
7cb6f55193 Merge pull request #190 from PrestaEdit/patch-13 
[-] BO: Standard Norm
 2013-01-22 03:02:05 -08:00
vAugagneur
4523f4c849 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
gRoussac
1de477a77b [*] BO : Fix #PSCFI-6225 for 1.5.X 2013-01-21 15:41:13 +01:00
Rémi Gaillard
67d4f21dfa [-] 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
dcfcda4ae2 [-] BO: Standard Norm 2013-01-18 00:08:38 +01:00
PrestaEdit
db8b027896 [*] BO : use the employee lang 2013-01-17 22:00:44 +01:00
Rémi Gaillard
30c516619d // Something was missing in commit ee62ed8d27 2013-01-17 17:27:59 +01:00
François Gaillard
b9dde1d50e Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development 2013-01-16 18:47:39 +01:00
François Gaillard
338ba1ce85 // AdminHomeController, syntax changed 2013-01-16 18:47:29 +01:00