Commit Graph

18638 Commits

Author SHA1 Message Date
gRoussac
22352d1443 [-] BO : Fix bug #PNM-788 Loyalty points in adminCustomers when only one order 2013-06-04 10:58:41 +02:00
PrestaEdit
66522c4a2c // Add translate() as deprecated 2013-06-03 22:46:52 +02:00
Rémi Gaillard
88369ef1f6 [-] FO: Fix Category::getSubCategories() default group used #PSCFV-9356 2013-06-03 18:18:54 +02:00
Maxence
371edf9edb Keep retro-compatibility 2013-06-03 13:28:51 +02:00
Vincent Augagneur
67ae393b79 Merge pull request #436 from prestarocket/development
[-] FO : first_item class don t exist if shopping cart have only one ite...
2013-06-03 02:53:37 -07:00
Rémi Gaillard
6d84d5833d [-] FO: Fix Order::getOrdersTotalPaid() reference is now a string #PSCFV-9342 2013-06-03 11:49:55 +02:00
Vincent Augagneur
53426b6430 Merge pull request #465 from PhpMadman/patch-4
[-] FO : In stock is now removed when Stock managment is disabled
2013-06-03 02:04:10 -07:00
Vincent Augagneur
e0c4e4c0f4 Merge pull request #470 from emily-d/patch-2
[ - ] TR :  wrong translation, Ireland is the english name, it should be...
2013-06-03 01:33:28 -07:00
Maxence
879aa9f98a Use PrestaShop norme 2013-06-02 20:18:59 +02:00
Maxence
10e3fec8a2 Add page limit to Collection
I do not see any way to limit the number of object in a Collection. Collection::setPageSize() and Collection::setPageNumber() add a limit clause to the query.
2013-06-02 21:04:48 +03:00
emily-d
2b82287459 [ - ] TR : wrong translation, Ireland is the english name, it should be Irlande in french. 2013-06-01 23:29:09 +02:00
PrestaEdit
6ae0dbb4ca [*] BO: use Translate::getAdminTranslation instead of translate() 2013-06-01 00:21:28 +02:00
PrestaEdit
58e5ea606c [~] Controller: AdminTranslationsController / Back translations
Files login.php and password.php are now redirect to an AdminController. No need to check it anymore.
2013-06-01 00:46:24 +03:00
gRoussac
ff2c3725d3 [-] Bo : Fix #PSCFV-9306 report of #PSCFI-7115 Add a new specific price = faulty validation 2013-05-31 18:10:41 +02:00
gRoussac
f84e8331de Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-31 17:39:55 +02:00
gRoussac
5a1440efe4 [-] Fix bug #PSCFI-5839 delete attached file from curstomer thread deletion 2013-05-31 17:39:34 +02:00
PrestaEdit
f7f6175191 [*] BO: hook displayAdminForm / add param fieldset 2013-05-31 14:58:19 +02:00
PhpMadman
9b0b56afd2 [-] FO : In stock is now removed when Stock managment is disabled
Fixes the bug where Stock managment is disabled, it stil show "In Stock" in the sort by list.
Added $PS_STOCK_MANAGEMENT to line 64.
2013-05-31 00:02:03 +03:00
Francois Gaillard
dfac99dc64 [-] Classes : Db classe fixed (check InnoDB support MySQL >= 5.6) 2013-05-30 16:23:24 +02:00
Vincent Augagneur
5812b5be71 Merge pull request #450 from djfm/development
// small changes in russian installer translation
2013-05-30 02:17:45 -07:00
Vincent Augagneur
edf02fe90b Merge pull request #454 from MyBB-Services/dev/gb/ajaxcartjs
[*] MO : blockcart - simpler selectors
2013-05-30 02:15:07 -07:00
Vincent Augagneur
32863ed476 Merge pull request #461 from cinscaen/development
[-] MO: Fix "sendtoafriend" and "blocknewsletter" module
2013-05-30 00:57:56 -07:00
Agence CINS
bce42c7f8d [-] MO: Fix newsletter module mail like newsletter_voucher.html
- Edit html/css/translation for newsletter_conf.html and
newsletter_verif.html
- Use {color} variable
2013-05-29 21:31:44 +02:00
Agence CINS
f43da83d80 [-] MO: Fix sendtoafriend module #PSCFV-8340
http://code.google.com/p/jquery-json/issues/detail?id=43
2013-05-29 18:51:00 +02:00
Vincent Augagneur
980b45f372 //small addons module install fix 2013-05-29 17:46:27 +02:00
gRoussac
760a415e89 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-29 17:25:57 +02:00
gRoussac
72bf6dc56d // bad commit 2013-05-29 17:25:41 +02:00
Rémi Gaillard
8ecc6313c1 [-] BO: Fix combinations duplication on multishop with context all for the product duplication #PSCFV-9020 2013-05-29 12:08:15 +02:00
Gregory Roussac
cd17b78522 Merge pull request #458 from runningz/patch-1
[-] MO : Remove link "Notify me when available" when in stock
2013-05-29 02:16:50 -07:00
runningz
040ff3396a [-] MO : Remove link "Notify me when available" when in stock 2013-05-28 23:06:05 +03:00
Rémi Gaillard
08023b4bc3 [-] FO: Fix Carrier::getDeliveredCountries for multishop #PSCFV-9279 2013-05-28 17:41:20 +02:00
Rémi Gaillard
1cd0135aff [-] MO: Fix double html entities on link edition in the blocktopmenumodule #PSCFV-8808 2013-05-28 11:05:51 +02:00
gRoussac
cbaae172cd [-] BO : Report of #PSCFI-6790 REQUEST_URI badly recorded 2013-05-28 10:29:51 +02:00
Grégoire Bélorgey
1652f3575c [*] MO : blockcart - simpler selectors 2013-05-28 09:37:32 +02:00
gRoussac
ea5405a917 [-] CORE : Report of ec8deb2891 2013-05-27 19:06:59 +02:00
gRoussac
9845966a88 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-27 19:02:40 +02:00
gRoussac
a04e6b1a67 [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 18:13:13 +02:00
gRoussac
4eabc11573 [-] PDF : Fix dejavusans font for en lang 2013-05-27 18:13:13 +02:00
gRoussac
94f7b2fa3c // norms 2013-05-27 18:13:13 +02:00
gRoussac
f591249248 // report of ee604d6b13 2013-05-27 18:13:13 +02:00
gRoussac
f8359173be [-] CORE : Report of a6e8a2eda7 2013-05-27 18:13:13 +02:00
Rémi Gaillard
fce9a0e285 // same for attributes and attributegroups 2013-05-27 18:13:13 +02:00
gRoussac
5743696596 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country 2013-05-27 18:13:12 +02:00
Francois Gaillard
97e4284f16 [-] BO : Fixed unregistered version field for some modules 2013-05-27 18:12:40 +02:00
fram
e667e80280 // small changes in russian installer translation 2013-05-27 11:58:09 +00:00
gRoussac
f0dbe3b86c [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 11:23:33 +02:00
gRoussac
ccf2baec3a [-] PDF : Fix dejavusans font for en lang 2013-05-27 10:52:57 +02:00
gRoussac
d040e5e1ae // norms 2013-05-27 10:35:19 +02:00
gRoussac
a412cbb62e // report of ee604d6b13 2013-05-27 10:21:23 +02:00
gRoussac
5c6db0510f [-] CORE : Report of a6e8a2eda7 2013-05-27 10:12:41 +02:00