Damien Metzger
4a3e0c5075
// Updated README.md
2013-09-11 16:11:28 +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
Rémi Gaillard
3e750490fe
// chmod class_index 666 instead of 664
2013-09-11 15:16:15 +02:00
gRoussac
01be908e51
[-] CORE : Could not add several cart rules
2013-09-11 14:50:42 +02:00
gRoussac
9f12ff15be
[-] BO : Fix possible Uncaught exception 'ReflectionException' when viewing AdminMeta
2013-09-11 10:30:40 +02:00
Gregory Roussac
53805f2b93
Merge pull request #712 from Prestaworks/patch-13
...
[-] MO : Customization data is not included in new order email.
2013-09-11 00:58:30 -07:00
Daniel
614e56283a
Update mailalerts.php
...
Fixes issue where customization data is not included in new order email.
2013-09-11 10:49:34 +08:00
gRoussac
85a471a690
//bad commit , sorry for that
2013-09-10 18:51:20 +02:00
gRoussac
86d3a8afe1
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-10 18:49:05 +02:00
gRoussac
f94f0f14a4
[-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address
2013-09-10 18:48:28 +02:00
Gregory Roussac
31d762b88a
Merge pull request #710 from nilsga/development
...
[*] CORE : Add Bcc support in Mail class
2013-09-10 09:24:04 -07:00
Nils-Helge Garli Hegvik
9713f93075
Add Bcc support in Mail class
2013-09-10 17:11:34 +02:00
gRoussac
332d68c7ec
[-] MO : Statsdata, exception on duplicate entry
2013-09-10 11:08:57 +02:00
Rémi Gaillard
3c090535a9
// small fix for image SSL links
2013-09-10 10:39:03 +02:00
Rémi Gaillard
021790a3e2
[-] FO: Fix SSL links on domain_ssl instead domain
2013-09-10 10:15:52 +02:00
gRoussac
4968a792b4
[-] IN : Remove notice when upgrading from
2013-09-10 01:12:52 +02:00
Gregory Roussac
a383d55421
Merge pull request #707 from sjousse/development
...
[-] MO: ShopImporter fix imported prices
2013-09-09 08:31:15 -07:00
sjousse
00f3045690
fix imported prices
2013-09-09 17:24:27 +02:00
Gregory Roussac
5362f4d426
Merge pull request #699 from sjousse/patch-1
...
[*] MO : ShopImporter Optimize image copy in ShopImport module
2013-09-09 08:11:51 -07:00
Gregory Roussac
9880d152d4
Merge pull request #706 from sjousse/development
...
[*] MO : Add some fields to Orders in Import module
2013-09-09 08:10:12 -07:00
sjousse
990a889b1c
Add some fields to Orders in Import module
2013-09-09 17:08:17 +02:00
gRoussac
e6d0a3e5a4
// revert form 2874f14983
2013-09-09 15:11:55 +02:00
Rémi Gaillard
242556e176
[-] MO: Fix unifunc smarty errors if module is displayed on multiplehook without cache
2013-09-09 15:12:26 +02:00
Jerome Nadaud
c502c9766f
[-] BO : FixBug PSCFV-10331 - Tax rules Pagination
2013-09-09 15:04:14 +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
Damien Metzger
dcad699ede
[-] FO : fixed chinese search with multiple symbols #PSCFV-10322
2013-09-09 11:19:11 +02:00
Francois Gaillard
e1d0347757
[-] Classes : Bug fix - FrontController, mobile & JS minifier fixed
2013-09-09 10:17:15 +02:00
gRoussac
b975a9375c
[-] IN : remove warnings while upgrading
2013-09-09 00:10:03 +02:00
gRoussac
9c756a7fcb
[-] IN : Do not duplicate images types when coming from 1.4, update it
2013-09-08 23:22:36 +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
gRoussac
e6f8dba2e6
// remove Notice: Undefined index
2013-09-08 19:55:03 +02:00
gRoussac
25ba388d69
[-] IN : fix bad pathes
2013-09-08 18:29:06 +02:00
gRoussac
e5337f5e76
[-] IN : Do not test module names if they are not directories
2013-09-08 18:25:54 +02:00
gRoussac
683513a9d2
[-] IN : Remove fails on upgrade coming to loop when upgrading again
2013-09-08 17:29:00 +02:00
gRoussac
19a6c4373e
[-] IN : Remove warnings when safe_mode open_basedir missconfigured
2013-09-08 17:25:59 +02:00
gRoussac
2874f14983
[-] CORE : Fix bug #PSCFV-10040 Notice: Undefined index: unifunc && Fatal error: Function name must be a string on some PHP version with empty cache folder and smarty cache enabled
2013-09-06 23:55:58 +02:00
gRoussac
4c49048e39
[-] FO : Partial fix of adding gift on cart rule on the same entity in the cart rule
2013-09-06 18:35:56 +02:00
Fabio Chelly
e5f53afd5f
Merge remote-tracking branch 'origin/development' into development
2013-09-06 17:54:34 +02:00
Fabio Chelly
9377775eca
[-] MO productcomments :
...
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented
#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
2013-09-06 17:54:12 +02:00
Francois Gaillard
768a8b36d5
[-] BO : AdminModulesController - Bug fix, $params was not set
2013-09-06 15:41:24 +02:00
Fabio Chelly
1b0c5be93d
Merge remote-tracking branch 'origin/development' into development
2013-09-06 11:47:11 +02:00
Fabio Chelly
663f592306
[-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not
...
#PNM-627
#PNM-1610
#PNM-1616
2013-09-06 11:40:41 +02:00
Damien Metzger
ec11b7e064
// Better control of the requests when our website is down
2013-09-06 10:18:48 +02:00
Fabio Chelly
7e1c0d5a24
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-06 09:24:43 +02:00
gRoussac
53241af228
// remove strict standard warning
2013-09-05 19:00:25 +02:00
gRoussac
a7d619b208
[-] MO : fix bug #PSCFV-9906 again, bad url parsing
2013-09-05 18:39:07 +02:00
sjousse
6b080e1f02
Optimize image copy in ShopImport module
...
2 things :
- copy images to new folder structure instead of legacy one since it's a PS 1.5 branch
- don't create all sizes of images at migration, there's an Admin controller for that (Admin > Settings > Images). That's speed up the import and remove duplicate code (less code to support).
+ some cleaning of unused variables
2013-09-05 18:24:02 +02:00
Rémi Gaillard
0f81518ba2
// Add a buton to erase all log
2013-09-05 15:58:36 +02:00
