dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud b141975d57 // Fix fields_list check 2013-10-21 11:49:08 +02:00
Jerome Nadaud 9c4b975cfc //Module uploader bootstraping 2013-10-21 11:31:50 +02:00
Jerome Nadaud 693a2aa8ff Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 11:25:05 +02:00
Jerome Nadaud 81042db718 // CSV import uploader bootstraping 2013-10-21 11:24:56 +02:00
Vincent Augagneur 9cf2fe4214 //removed commented code 2013-10-21 10:24:20 +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
Vincent Augagneur 459d0232a4 //blockcms use boostrap design 2013-10-21 10:08:45 +02:00
Vincent Augagneur e058224cf2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 09:58:18 +02:00
Vincent Augagneur 103582be33 //blocklink now use bootstrap design 2013-10-21 09:58:08 +02:00
Jerome Nadaud 6275e7bcad // Remove translations on icon class 2013-10-21 09:57:13 +02:00
Kevin Granger a5ca6f11a7 // css email 2013-10-21 09:51:46 +02:00
Vincent Augagneur fd86a29c5c //small fix 2013-10-21 09:50:20 +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
PrestaEdit 6633f40a7a // .bak 2013-10-19 17:21:46 +02:00
J. Danse 02029b1006 //ignore .bak 2013-10-19 13:11:39 +02:00
Kevin Granger 1f02bcaa75 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 19:07:15 +02:00
Kevin Granger 067eecdc70 // small fix 2013-10-18 19:07:03 +02:00
Jerome Nadaud cdab5ed6c9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
 2013-10-18 18:47:42 +02:00
Jerome Nadaud 7e176b157b // Fix save and preview button 2013-10-18 18:44:13 +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
Kevin Granger 04b4e548f3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 18:38:17 +02:00
Kevin Granger 5f52a9e171 // fix products 2013-10-18 18:38:02 +02: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
Damien Metzger d1a2c33322 Merge pull request #849 from djfm/bootstrap 
// Translations fix
 2013-10-18 09:35:20 -07:00
Jerome Nadaud 6c37efdb6a // Categories image upload bootstraping 2013-10-18 18:33:32 +02:00
Jerome Nadaud ff81667b5c // Image thumnail fix 2013-10-18 18:28:57 +02:00
Jerome Nadaud 667353d43f // Store contacts bootstraping 2013-10-18 18:24:21 +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
Jerome Nadaud 1c1fb5fb5c // Update image fix 2013-10-18 17:59:45 +02:00
Jerome Nadaud ed2546d07c // Define language dir constant 2013-10-18 17:59:34 +02:00
Jerome Nadaud 1bee0087c0 // Update image fix 2013-10-18 17:50:36 +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
Jerome Nadaud 964f546b0b // Update image when updated 2013-10-18 17:41:36 +02:00
Jerome Nadaud 0599d4f056 // Fix Localization page header title 2013-10-18 17:41:10 +02:00
Jerome Nadaud 785fe814bc // Define Order state dir constante 2013-10-18 17:40:49 +02:00
Jerome Nadaud ac112c38df // File imput improvement 2013-10-18 17:32:29 +02:00
Damien Metzger 9dfecbb1b8 // Fixed addons url 2013-10-18 17:05:04 +02:00
djfm 5a3d487e9f // sprintf again 2013-10-18 14:31:48 +00:00
djfm d097679ea0 // improvements to producttooltip texts 2013-10-18 14:16:17 +00:00
djfm b5b18b9d2b // use sprintf 2013-10-18 13:55:30 +00:00
Rémi Gaillard 23abf712ec // missing files 2013-10-18 15:53:05 +02:00
Rémi Gaillard d61d2b6627 // rm 1.4 controllers - RIP 2013-10-18 15:50:12 +02:00