dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,089 Commits 9 Branches 19 Tags
bb35a5b00414bbca76569fa2b9d5df875f6b0140
Commit Graph

19089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 2e7f3c296b [-] FO : Force browser language detection in Tools::setCookieLanguage 2013-07-25 11:44:45 +02:00
Jérôme Nadaud a470cd7d12 // oops 2013-07-25 11:28:40 +02:00
Jérôme Nadaud 059872b1ba [-] BO : Add missing tmp directory 2013-07-25 11:24:43 +02:00
Shagshag 21cf113c44 twice class attribute in color input 2013-07-25 10:26:53 +02:00
Gregory Roussac 5ee247ad23 Merge pull request #592 from Captain-FLAM/patch-8 
[*] MO : blocklayered : Supress unsuseful # at the end of URLs
 2013-07-25 01:23:46 -07:00
sLorenzini 312ad4eb37 // update order tab 2013-07-25 09:41:31 +02:00
Jérôme Nadaud cfeaf0fa36 // norm 2013-07-25 08:51:22 +02:00
Jérôme Nadaud 7b980217b5 // norm 2013-07-25 08:49:40 +02:00
Jérôme Nadaud 541a4525b5 [-] FO : FixBug #PSCFV-9879 Email confirmation message not present 2013-07-24 19:24:22 +02:00
Gregory Roussac ef22b9d5d4 Merge pull request #162 from bumbu/patch-2 
[-] CORE : updateMultishopTable() where argument is not mandatory anymore
 2013-07-24 10:07:56 -07:00
Jérôme Nadaud ae7f47a275 [-] BO : FixBug #PSCFV-9042 Supply orders now accept 0 value to automatically load products 2013-07-24 18:52:47 +02:00
gRoussac aaaa5cb086 [-] WS: Enable feature request #PSCFV-5581, thanks @codl for pull request #593 2013-07-24 18:22:04 +02:00
gRoussac a406778e17 // norm 2013-07-24 17:32:58 +02:00
Kevin Granger edc2113330 // fix merge 2013-07-24 17:02:23 +02:00
Kevin Granger 77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
Jérôme Nadaud 08aa1f90c6 [-] BO : FixBug #PSCFV-9839 Update product warehouse on suply order - thanks @O'Donnell 2013-07-24 16:40:59 +02:00
Damien Metzger 71c0a483e1 // Small fix 2013-07-24 16:16:40 +02:00
Damien Metzger 056ced75b5 // Fixed double module call 2013-07-24 15:55:40 +02:00
Captain FLAM daec59d13d Update blocklayered.js 2013-07-24 11:55:05 +01:00
Gregory Roussac 063fd9941c Merge pull request #189 from PrestaEdit/patch-12 
[*] BO: use lang for input file
 2013-07-24 03:10:00 -07:00
Gregory Roussac cfa6e61acb Merge pull request #351 from PrestaEdit/patch-23 
[*] WS: POST for php://input and XML ressource
 2013-07-24 03:08:23 -07:00
Kevin Granger f7d1743c8a // fix tags in helper 2013-07-24 11:42:47 +02:00
Gregory Roussac 6ac3f1133a Merge pull request #591 from djfm/locpacks 
[*] LO: Improved Argentina Localization Pack
 2013-07-24 02:08:42 -07:00
djfm 2af3afcc13 [*] LO: Improved Argentina Localization Pack 2013-07-24 08:06:52 +00:00
Gregory Roussac 26247a18c3 Merge pull request #564 from sylwit/patch-1 
[*] CORE : Translations shouldn't be cached if they contain dynamic vars (sprintf) in Translate.php
 2013-07-23 10:22:54 -07:00
Gregory Roussac 1c71dc54dc Merge pull request #556 from piotrmocko/patch-2 
[-] Bo : Payment currency restriction incorret type of input for radio
 2013-07-23 10:21:20 -07:00
Gregory Roussac c025b8cb2b Merge pull request #568 from urecheatu007/development 
[-] CORE : setMedia() proper order for typewatch and cart-summary.js
 2013-07-23 10:15:43 -07:00
Gregory Roussac 166a133080 Merge pull request #577 from PhpMadman/patch-2 
[-] MO : If no homefeatured nb, get default 8 not 10
 2013-07-23 10:14:24 -07:00
Gregory Roussac f8bff15894 Merge pull request #581 from Captain-FLAM/patch-1 
[-] Installer : Missing default value for id_employee in log table
 2013-07-23 10:12:50 -07:00
Gregory Roussac 9b9e5a122a Merge pull request #586 from Captain-FLAM/patch-7 
[-] BO : Hook.php : Missing _DB_PREFIX_, thanks @Captain-FLAM
 2013-07-23 09:52:15 -07:00
Francois Gaillard 2e3f13db95 [-] Controller : AdminTranslationsController - Fixed bug with simple & double quotes 2013-07-23 18:47:35 +02:00
Jérôme Nadaud 71271ded7f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-23 18:38:33 +02:00
Jérôme Nadaud d241013692 [-] BO : FixBug #PSCFV-9894 undefined quantity_all_version variable in product.tpl 2013-07-23 18:36:51 +02:00
gRoussac 4aab4f88cd [-] BO : Fix SQL query when $join_category == false, pull request https://github.com/Captain-FLAM/PrestaShop/commit/d5f75c63b6e21dd87c77a027bf8dd293afb1a94f thanks @Captain-FLAM 2013-07-23 18:25:32 +02:00
Gregory Roussac abf6f0d626 Merge pull request #587 from ChristopheBoucaut/patch-2 
[-] CORE : Search terms can now have dashes in Search.php
 2013-07-23 09:18:16 -07:00
Gregory Roussac a5e7f7fdac Merge pull request #588 from joseantgv/patch-1 
[-] BO : Update AdminCustomerThreadsController.php
 2013-07-23 09:16:39 -07:00
sLorenzini 5b804d3628 // update order tab 2013-07-23 17:54:47 +02:00
Damien Metzger 2e6e5a2604 // Removed useless check in the installer 2013-07-23 15:29:09 +02:00
Damien Metzger c829ac5b7d // Fixed fix 2013-07-23 14:19:13 +02:00
Damien Metzger 87a4b75df4 [*] FO : updated Fancybox plug-in 2013-07-23 12:53:20 +02:00
Rémi Gaillard 6ed713e847 [-] Fix #PSCFV-9038 carrier warehouse association after carrier edition 2013-07-23 11:57:44 +02:00
gRoussac dbe26e0a1d [-] BO : Could not find cover when image table corrupted 2013-07-23 11:47:16 +02:00
Damien Metzger 0ddf5d1025 // Fixed getMainShopDomain 2013-07-23 11:33:07 +02:00
gRoussac a805941c1f // typo in EN string 2013-07-23 10:34:05 +02:00
Gregory Roussac 3b213a505c Merge pull request #583 from djfm/development 
[*] TR : Small localization fixes & correction in templates so that translation regexes work OK
 2013-07-23 00:59:31 -07:00
joseantgv 63b2f63058 Update AdminCustomerThreadsController.php 
If language is not defined returns an array instead of a string which makes function Mail::Send to throw a warning.
 2013-07-23 09:58:53 +02:00
Damien Metzger 209615d4f4 // Missing } 2013-07-23 09:52:41 +02:00
Damien Metzger 07e3354d0e // Code cleaning 2013-07-23 09:50:26 +02:00
Damien Metzger 9169995adc // Small fixes and code cleaning 2013-07-23 09:50:26 +02:00
Damien Metzger 91c5d184b6 // Small backend optimization 2013-07-23 09:50:26 +02:00