e2ac223f4e
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-20 11:34:54 +02:00
5b7580d487
[-] MO: Fix time of smarty cache invalidation
2013-09-20 11:33:30 +02:00
1cebd5920e
[*] Installer : added file check in order to check if everyhting has been successfuly uploaded
2013-09-20 11:09:22 +02:00
4f639329e9
Merge remote-tracking branch 'origin/development' into development
2013-09-20 10:47:17 +02:00
91ae972655
[-] MO mailalert : products alerts can be registered for multiple guests
...
#PNM-1669
2013-09-20 10:46:56 +02:00
f8ca06d927
// Better cache depth management for smarty
2013-09-20 10:26:58 +02:00
eb6600e840
// Blockcustomerprivacy should not be installed by default
2013-09-20 10:26:58 +02:00
14cd72121a
Merge pull request #732 from Ha99y/20130919_X-Robots
...
[*] CORE : Send noindex header to avoid ghost carts by bots
2013-09-20 00:52:49 -07:00
42cdc988ac
Send noindex header to avoid ghost carts by bots
2013-09-19 22:15:00 -07:00
8c6aaa3c7d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-19 17:31:42 +02:00
63f4743134
[-] MO : PNM-1715 - Bug fix accented chars & ajax-cart
2013-09-19 17:31:35 +02:00
e0b59082f9
[-] BO : Issue with domready on adminImport
2013-09-19 17:19:51 +02:00
0361d5db8d
[-] BO : do not reaffect import_type for categories
2013-09-19 16:59:04 +02:00
ea6ea955bb
// licence
2013-09-19 16:39:21 +02:00
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
0c511dead5
[*] FIX #PSCFV-8106 do not regenerate thumbnails if not
2013-09-19 16:28:19 +02:00
6b47f5713e
// another fix for multishop fields in context all on product page
2013-09-19 09:48:46 +02:00
5eb4c93b8c
[-] BO: Bad id for multishop checkbox on admin products - weird bug with active flag #PSCFV-9935
2013-09-18 19:35:56 +02:00
e7286c44f2
// typo
2013-09-18 18:08:22 +02:00
4e1d6de9b0
[-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated
2013-09-18 17:57:00 +02:00
75a9629b8a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-18 17:23:23 +02:00
27f14b9a31
[-] BO : Fix proces and save buttons for Modules and AdminControllers
2013-09-18 17:23:08 +02:00
70d48d0af1
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-18 17:19:18 +02:00
f6dc81d0f1
// small fix for SSL
2013-09-18 17:19:03 +02:00
2e311410b2
[*] BO : Set import entity in cookie (#PSCFV-8214)
2013-09-18 17:02:00 +02:00
0452979ce7
[*] FO: Allow to enable SSL on all the pages
2013-09-18 16:30:34 +02:00
3aec242600
[-] MO : Editorial could not delete image
2013-09-18 16:16:36 +02:00
93aae26269
[-] Bo : Modules 'save' button not active
2013-09-18 15:41:30 +02:00
f293562ea4
[-] BO : Fix bug #PSCFV-8214 import entity pre selected
2013-09-18 15:03:16 +02:00
66f46eee03
// Avoid exception if amount is null on addind an orderpayment
2013-09-18 14:29:01 +02:00
672da852c5
[-] BO - fixed bug #PSCFV-10178
2013-09-18 11:40:58 +02:00
965b8a1bf3
[-] BO - fixed bug #PSCFV-10286 - End range in summary of shipping wizard not correct when range number is a float
2013-09-18 11:18:26 +02:00
47c5f400ee
// Add gender on order view
2013-09-17 16:30:47 +02:00
322654cacf
//small fix with mode catalog and cart button
2013-09-17 14:54:38 +02:00
3151064daf
//small fix on helper form && option
2013-09-17 12:18:37 +02:00
e6e8efc19a
[-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop
2013-09-17 11:58:12 +02:00
6ee6317fee
// orderby position
2013-09-17 11:07:29 +02:00
2d5bd901f4
[*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3
2013-09-16 18:51:06 +02:00
b9b4265517
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-16 17:18:56 +02:00
15dd1cf96f
[-] BO : Fix bugPSCFV-10249 images copy when unix path
2013-09-16 17:16:11 +02:00
1c58c1ea6b
Merge pull request #726 from cinscaen/patch-1
...
[-] BO : Move product images in POST method in admin.js
2013-09-16 07:01:45 -07:00
852faeab7a
Update admin.js
...
Lorsqu'un produit possède trop d'images, il est impossible de réordonner celle-ci car la valeur JSON fourni en URL (GET) est beaucoup trop longue. Il faut envoyer les données JSON en POST pour solutionner le problème de longueur.
---------
When a product has many pictures, we can't reorder them. The JSON value is too long in URL (GET). We need to send data with POST to avoid problem.
2013-09-16 15:57:44 +02:00
8504574ae1
[-] IN : Could not remove some tabs
2013-09-16 15:02:12 +02:00
e68c124218
[-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396
2013-09-16 11:42:11 +02:00
08efa4e313
[-] IN : Fix bug #PSCFV-10382 add_module_to_hook retunrning false when hook not exists
2013-09-16 11:12:55 +02:00
e0739ea1e0
Merge pull request #720 from makk1ntosh/development
...
//Added ui.button as dependency of ui.dialog
2013-09-16 01:35:25 -07:00
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
d7c1cd90bf
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-16 09:25:57 +02:00
c0afb55d11
[-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link
2013-09-16 09:25:10 +02:00
3b9c125198
Merge pull request #723 from codeurWeb/patch-2
...
[+] MO : Blocknewproducts add hookHome
2013-09-14 08:58:14 -07:00
Rémi Gaillard