dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,699 Commits 9 Branches 19 Tags
5bb4d48dddb1bb997d1bc5f38e85493b9c02c67a
Commit Graph
18699 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory Roussac 5bb4d48ddd Merge pull request #870 from djfm/development 
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
 2013-10-22 10:17:11 -07:00
Gregory Roussac e557db6429 Merge pull request #866 from studiokiwik/sk-ps15x-007 
[-] MO : Loyalty if customer is logged do not recreate it
 2013-10-22 10:15:55 -07:00
Gregory Roussac 70d2e6e10b Merge pull request #868 from ldecoker/patch-8 
[-] BO : Notices onBO translation page
 2013-10-22 08:03:06 -07:00
ldecoker 7cbaada844 [BO][-] Notice messages when accessing the BO translation page 
When accessing the translation part with "core translation" , you got 2 errors:
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in controllers\admin\AdminTranslationsController.php on line 1018

Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in \controllers\admin\AdminTranslationsController.php on line 1026

It's because the variable $this->theme_selected is not set for that case.
 2013-10-22 17:00:56 +02:00
Gregory Roussac bc7e8eb355 Merge pull request #867 from PhpMadman/patch-4 
[-] FO: Removed missplaced </li> on mobile theme
 2013-10-22 07:50:21 -07:00
Fabio Chelly bc38b542fe Merge remote-tracking branch 'origin/development' into development 2013-10-22 15:53:43 +02:00
Fabio Chelly 2989538ce1 [*] BO Module mailalerts: send e-mail to merchand when product is out of stock 2013-10-22 15:53:20 +02:00
PhpMadman e857fb5978 [*] FO: Removed missplaced </li> on mobile theme 2013-10-22 13:34:52 +02:00
gRoussac 1ae587475b [-] MO : Fix bug #PSCFV-10787, cms associated to all shops 2013-10-22 12:19:58 +02:00
gRoussac d20aea0563 [-] BO : Fix bug #PSCFV-10767, could not retrieve feature value when product IDs not forced 2013-10-22 11:27:45 +02:00
Gaelle ITZKOVITZ ce8d01ad4c [-] MO : if customer is logged we do not recreate it 2013-10-22 11:09:53 +02:00
gRoussac 2aa52356ad [-] BO : Fix bug #PSCFV-10607 one upload name 2013-10-22 09:39:59 +02:00
gRoussac c1ecf43be8 [-] MO : Fix bug #PSCFV-10775, could not upload .jpeg in TinyMCE 2013-10-21 17:39:20 +02:00
gRoussac 16ffbd8ee5 // norms 2013-10-21 16:46:22 +02:00
gRoussac 61884ec223 // norms 2013-10-21 16:31:56 +02:00
gRoussac a05c748e81 // addJqueryPlugin receives array in first argument 2013-10-21 15:05:03 +02:00
gRoussac a9e45fccf3 [-] MO : ScrollTo not loaded 2013-10-21 14:35:23 +02:00
gRoussac d25b41ef97 [-] BO : wrong csv files name 2013-10-21 14:34:59 +02:00
gRoussac 15cd0b9fbc [-] BO : Report of https://github.com/PrestaShop/PrestaShop/commit/fd86a29c5c369ec5da0f91bbe97c584a00d02d0d 2013-10-21 12:21:49 +02:00
Gregory Roussac 3dea171047 Merge pull request #862 from PhpMadman/patch-3 
[-] PDF : Removed unused code in FrontOffice PDF Invoice
 2013-10-21 01:15:39 -07:00
PhpMadman 35df3f463c Removed unsed code 
I looked through the code. And I can't see that that code is used. everything is handled in PDF class.
 2013-10-21 10:10:28 +02:00
Rémi Gaillard 198e75245d [-] FO: Don't auto detect language if it not associated to the shop #PSCFV-10273 2013-10-21 09:41:00 +02:00
Gregory Roussac 8ef22c3548 Merge pull request #823 from kpodemski/patch-8 
[*] IN: Add phone_mobile to address format
 2013-10-20 16:40:16 -07:00
gRoussac 9b8a7edad8 // small refacto 2013-10-21 01:05:18 +02:00
gRoussac 332c8ff49f [-] CORE : Fix bug #PSCFV-10687 again, #PSCFV-10752 replaceAccentedChars() // sorry for that 2013-10-21 00:28:41 +02:00
gRoussac c9d20f35b3 // norms 2013-10-21 00:00:17 +02:00
gRoussac f2d70076bd [-] : Fix bug #PSCFV-4859, could not register invoice address or invoice country in OPC as guest, and phone not required in standard registration 2013-10-20 23:52:48 +02:00
Gregory Roussac c36625a136 Merge pull request #851 from PrestanceDesign/patch-1 
[*] BO : Adding a title tag to display the module name on hover like PS ...
 2013-10-18 09:42:57 -07:00
gRoussac 5daa79c1e1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-18 18:36:51 +02:00
gRoussac 8ef1e043af [*] BO : chmod 664 to config.xml file 2013-10-18 18:36:30 +02:00
PrestanceDesign 6965bb29c1 [*] BO : Adding a title tag to display the module name on hover like PS 1.4 2013-10-18 18:20:15 +02:00
Fabio Chelly 72ccc90cc9 Merge remote-tracking branch 'origin/development' into development 2013-10-18 17:49:14 +02:00
Fabio Chelly 7133e74c17 [-] MO mailalerts: module mailalerts shows all messages regarding the order 
PNM-1632 - MailAlert does not show Paypal error message if order has comments
 2013-10-18 17:49:00 +02:00
gRoussac 2e2151a1bb [-] CORE : error_get_last > PHP 5.1 2013-10-18 15:29:12 +02:00
Rémi Gaillard 8a682081de // typo 2013-10-18 12:17:51 +02:00
Rémi Gaillard 6747d3bbac [-] BO: Default country should be overriden in the context in multishop 2013-10-18 10:23:06 +02:00
Rémi Gaillard b8273a13e6 // 2013-10-17 18:30:22 +02:00
gRoussac 3a38af9982 [-] FO : Could not redirect back to url in adress.php 2013-10-17 14:16:54 +02:00
gRoussac 6b1d69dd7d [-] FO : $back value twice escaped 2013-10-17 12:18:23 +02:00
Rémi Gaillard eb14e25e2a // small fix for some order by on listing 2013-10-17 11:33:05 +02:00
gRoussac f1ea9ba5b4 [-] BO : Fix bug #PSCFV-10709 rename root category with slashes in it 2013-10-17 10:53:20 +02:00
Rémi Gaillard e4faa2bb75 [-] Core: Out of stock status should be setted after the first order history 2013-10-17 10:28:14 +02:00
gRoussac 3ba5905042 [-] BO : Could not order by reserved words like 'key' 2013-10-16 16:25:40 +02:00
Rémi Gaillard 22fd1b84c4 Merge pull request #847 from MustangZhong/patch-1 
[-] WS: Missing field on Cart::getWsCartRows()
 2013-10-16 00:58:16 -07:00
MustangZhong ad27dbe8d1 Update Cart.php 
The field "id_address_delivery" is missing in getWsCartRows.
Since id_address_delivery is required in the web service field definition.
 2013-10-16 10:14:14 +08:00
Rémi Gaillard 6ee538c710 // fix on ps_cleaner 2013-10-15 19:53:59 +02:00
gRoussac 237b950eb6 [-] FO : #PSCFV-10640 again, bad assignement 2013-10-15 16:35:58 +02:00
gRoussac 7ae9832992 // small cast 2013-10-15 14:56:25 +02:00
gRoussac 81497be5ab [-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC 2013-10-15 14:53:44 +02:00
Rémi Gaillard 837ca34e7e [-] Core: Product::getPriceStatic called with 1 quantity return the specific price for 1 qty if called with id_cart = 0 2013-10-15 10:30:48 +02:00