dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,850 Commits 9 Branches 19 Tags
5832ab3eb5d62a81b427ff5f7c8bdea7d94ec00a
Commit Graph
17850 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 81e8d76d31 // revert 2013-06-06 10:15:40 +02:00
gRoussac 896658633e [*] MO : Followup https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418 2013-06-06 10:07:48 +02:00
Damien Metzger 83d3bed712 Merge pull request #478 from djfm/development 
[*] LO : Fix PSCFV-9330 (decimals=2)
 2013-06-05 06:56:07 -07:00
Francois Gaillard 73a372bab2 // Disable autocomplete on radio button in installer, error fixed with Chrome browser 2013-06-05 10:41:46 +02:00
Rémi Gaillard ba1c4b9f3a [-] FO: http page should be redirected to http when accessed with https #PSCFV-9212 2013-06-04 16:27:47 +02:00
Vincent Augagneur 23afba3c59 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-04 16:14:45 +02:00
Vincent Augagneur 5ec36dac88 [-] MO - fixed bug #PSCFV-9111 - Mailalert emails do not follow the new {color} 2013-06-04 16:14:34 +02:00
djfm 2f2d19cdbb [*] LO : Fix PSCFV-9330 (decimals=2) 2013-06-04 13:32:35 +00:00
Rémi Gaillard 5d9d3938e5 // small change on optimization tips for smarty 2013-06-04 15:20:09 +02:00
Vincent Augagneur 682d10143e [-] BO fixed bug #PSCFV-9130 - Ordering Categories by Name does not work correctly 2013-06-04 14:50:20 +02:00
Rémi Gaillard 05767a213e [*] Installer: you can now choose to send an email to the administrator after installation with php-cli 2013-06-04 14:21:18 +02:00
Rémi Gaillard 4c5b060e92 [-] Core: Hook actionPaymentConfirmation should also be called for PS_OS_WS_PAYMENT order statuse 2013-06-04 12:08:31 +02:00
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 https://github.com/PrestaShop/PrestaShop-1.4/commit/ec8deb289185daa03cd11d239797bbe5bdbaecd0 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
gRoussacandFrancois Gaillard a04e6b1a67 [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 18:13:13 +02:00
gRoussacandFrancois Gaillard 4eabc11573 [-] PDF : Fix dejavusans font for en lang 2013-05-27 18:13:13 +02:00