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

4904 Commits

Author SHA1 Message Date
Rémi Gaillard
252ab56d75 // error message in double 2013-09-26 13:47:42 +02:00
Dinis Lage
81ca3ac1f9 BO: Modules - show update button even if module is not installed but don't 
warn for modules with updates available but not installed.
 2013-09-24 17:42:43 +01:00
Gregory Roussac
4c399875d9 Merge pull request #737 from codeurWeb/patch-3 
[-] BO : fix postProcess override on AdminImportController
 2013-09-24 01:54:18 -07:00
Julien
6acebca8fa [-] BO : fix postProcess override on AdminImportController 
When we override the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
Default case of switch is never used.
 2013-09-23 21:04:55 +02:00
Julien
6850db0612 [-] BO : fix contructor override on AdminImportController 
When we overload the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
 2013-09-23 20:23:45 +02:00
gRoussac
0361d5db8d [-] BO : do not reaffect import_type for categories 2013-09-19 16:59:04 +02:00
gRoussac
803b6ce8ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	controllers/admin/AdminImportController.php
 2013-09-19 16:38:01 +02:00
gRoussac
0c511dead5 [*] FIX #PSCFV-8106 do not regenerate thumbnails if not 2013-09-19 16:28:19 +02:00
Rémi Gaillard
e7286c44f2 // typo 2013-09-18 18:08:22 +02:00
gRoussac
2e311410b2 [*] BO : Set import entity in cookie (#PSCFV-8214) 2013-09-18 17:02:00 +02:00
Rémi Gaillard
0452979ce7 [*] FO: Allow to enable SSL on all the pages 2013-09-18 16:30:34 +02:00
gRoussac
f293562ea4 [-] BO : Fix bug #PSCFV-8214 import entity pre selected 2013-09-18 15:03:16 +02:00
Rémi Gaillard
66f46eee03 // Avoid exception if amount is null on addind an orderpayment 2013-09-18 14:29:01 +02:00
Rémi Gaillard
47c5f400ee // Add gender on order view 2013-09-17 16:30:47 +02:00
Damien Metzger
0e3d53321a [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error 2013-09-16 09:56:22 +02:00
gRoussac
73dd524de8 [-] BO : Could not order in AdminStatuses by ID or template 2013-09-14 00:05:45 +02:00
Jerome Nadaud
97ec6341e8 [-] BO ; Fix bug #PSCFV-10393 manufacturer filter 2013-09-13 15:39:30 +02:00
gRoussac
d9bc07d030 [-] BO : quote badly decoded in customerThreads 2013-09-13 10:45:07 +02:00
Jerome Nadaud
3eb4d65fc9 [-] BO : Fix Bug #PSCFV-10331 check all from list 2013-09-13 10:26:08 +02:00
gRoussac
db4b69d10c [-] BO : Customer message twice encoded 2013-09-12 18:03:30 +02:00
gRoussac
5095b45e47 [-] BO : Fix bug, orders states not ordered by order state name 2013-09-12 15:09:21 +02:00
Rémi Gaillard
f9b1f0ab5e [*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists() 2013-09-12 15:03:23 +02:00
Francois Gaillard
53c1e56c51 [-] BO : Bug fix - Encoding & tips of the day 2013-09-12 14:32:02 +02:00
gRoussac
90091d4f2c [-] BO : Do not copy link_rewrite from title if cms already has one 2013-09-12 10:50:04 +02:00
gRoussac
dfdbe39ee3 [-] BO : Small changes when creating vouchers in back office orders 2013-09-11 16:28:11 +02:00
Rémi Gaillard
c42d71b8f5 // oups 2013-09-11 16:06:23 +02:00
Rémi Gaillard
669c3791b5 [-] BO: Fix preview url with multishop 2013-09-11 15:55:25 +02:00
gRoussac
54f7c65165 [-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_ 2013-09-09 12:20:38 +02:00
gRoussac
6b03af9ef9 [-] BO : ini_get('safe_mode') can return false 2013-09-08 22:26:21 +02:00
gRoussac
ec556bb307 // remove Warning on array_map() 2013-09-08 20:01:55 +02:00
Francois Gaillard
768a8b36d5 [-] BO : AdminModulesController - Bug fix, $params was not set 2013-09-06 15:41:24 +02:00
Fabio Chelly
7e1c0d5a24 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-06 09:24:43 +02:00
Rémi Gaillard
0f81518ba2 // Add a buton to erase all log 2013-09-05 15:58:36 +02:00
gRoussac
6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack 2013-09-03 18:20:58 +02:00
Gregory Roussac
5caae97813 Merge pull request #680 from djfm/development 
// fixed unstranslatable string in AdminSupplyOrdersController
 2013-09-03 06:00:50 -07:00
djfm
572a2e45aa // fixed unstranslatable string in AdminSupplyOrdersController 2013-09-03 12:51:21 +00:00
gRoussac
98f60d039b // fix warning 2013-09-03 12:29:17 +02:00
Gregory Roussac
e08c8b2d25 Merge pull request #674 from PrestaEdit/patch-50 
[*] BO: sort modules name in Stats
 2013-09-03 00:49:11 -07:00
Jerome Nadaud
c3772fb355 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-02 19:11:17 +02:00
Jerome Nadaud
da12fbdd5e [-] BO : FixBug #PSCFV-10213 check product/attribute id - Thanks F. Cespedes 2013-09-02 19:09:47 +02:00
gr4devel
f535d60a29 [-] fix typo in adding TinyMCE editor for supplier descrpition in AdminSuppliersController 2013-09-02 14:24:18 +02:00
gr4devel
36ca7f294a [+] BO : add TinyMCE editor for supplier descrpition in AdminManufacturerSupplier 2013-09-02 14:15:33 +02:00
PrestaEdit
4c633b8b46 [*] BO: sort modules name in Stats 2013-09-01 16:55:22 +02:00
gr4devel
805e80e54c [+] BO : add TinyMCE editor for short and long descrpition in AdminManufacturerController 2013-08-30 21:24:21 +02:00
Francois Gaillard
d0087267df // Fixed tips of the day & encoding 2013-08-30 14:22:24 +02:00
Francois Gaillard
e6abe1c5a0 // Release branch merged 2013-08-29 18:46:34 +02:00
Rémi Gaillard
51083e17af // 2013-08-29 17:18:05 +02:00
Francois Gaillard
4a8f6c3116 // Modules categories sort 2013-08-29 17:00:34 +02:00
Rémi Gaillard
01cbffad9b //miss on last commit 2013-08-29 16:11:24 +02:00
Rémi Gaillard
c736c28ab5 // small ajax.php clean 2013-08-29 11:47:11 +02:00