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

113 Commits

Author SHA1 Message Date
Kevin Granger
9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
 2013-11-21 17:43:51 +01:00
gRoussac
5a8c335d78 [-] FO : Bad value for back when controller name is sent 2013-11-13 12:30:39 +01:00
Kevin Granger
889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
 2013-11-04 14:43:01 +01:00
Rémi Gaillard
930c9f3ff5 // validators 2013-11-02 10:50:02 +01:00
djfm
0288696c90 // English 2013-10-29 14:37:55 +00:00
gRoussac
9b8a7edad8 // small refacto 2013-10-21 01:05:18 +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
gRoussac
3a38af9982 [-] FO : Could not redirect back to url in adress.php 2013-10-17 14:16:54 +02:00
Damien Metzger
e68c124218 [-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396 2013-09-16 11:42:11 +02:00
Jerome Nadaud
1359f46bae [-] FO : FixBug #PSCFV-10090 urlencode syntax error - Thanks Duarte 2013-08-12 14:37:32 +02:00
Gregory Roussac
ba69e48f72 Merge pull request #488 from camlafit/pr-countriesbrowser 
[*] FO : Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE
 2013-08-06 03:07:13 -07:00
Staging
68cb702350 [-] Mobile : Bug fix : Authentication & phone number 2013-07-01 11:08:14 +02:00
Fabio Chelly
668181d8ec Newsletter field is always shown in create account form even if blocknewsletter module is disabled 2013-06-28 18:11:44 +02:00
Vincent Augagneur
3d2e46b14f [-] FO : fixed bug #PSCFV-9388 - newsletter is required error, showing two times 2013-06-26 11:46:02 +02:00
gRoussac
4dbaf98cc8 [-] FO : Fix one_phone_at_leastphone again when PS_REGISTRATION_PROCESS_TYPE = 1 && PS_ORDER_PROCESS_TYPE =0 2013-06-25 10:44:41 +02:00
gRoussac
21856959a2 [-] Fix bug #PSCFV-9414 bad check on states when PS_REGISTRATION_PROCESS_TYPE = 0 2013-06-24 13:54:02 +02:00
gRoussac
2e8c89e543 [-] FO : Fix #PSCFV-9414 submitGuestAccount is not submitAccount 2013-06-21 10:39:58 +02:00
gRoussac
55414552d4 [-] FO : Fix #PSCFV-7388 again Instant checkout - State validation 2013-06-19 14:45:01 +02:00
cam.lafit
663ec76bb9 Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE 
With HTTP_ACCEPT_LANGUAGE we have two choices :
* Country == language (displayed with two letter as fr,de,en,...)
* Country with multi language (displayes as fr-CH, de-CH, it-CH)

Previous regexp find only first case.
 2013-06-10 11:00:49 +02:00
gRoussac
72bf6dc56d // bad commit 2013-05-29 17:25:41 +02:00
gRoussac
ea5405a917 [-] CORE : Report of ec8deb2891 2013-05-27 19:06:59 +02:00
Vincent Augagneur
444f59c9aa Merge pull request #422 from e-gaulue/AuthController_patch 
[*] FO : AuthController can now have its own template
 2013-05-23 05:45:05 -07:00
PrestaEdit
e996eeeed1 [-] Translations: .. instead of . 2013-05-19 00:14:39 +02:00
Edouard Gaulué
443e22aa72 [*] FO : AuthController can now have its own template 2013-05-06 00:32:16 +02:00
Rémi Gaillard
63993a425b [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
gRoussac
5b48649242 [-] FO : Fix login cookie issues 2013-04-12 12:03:16 +02:00
vAugagneur
f15722858e [-] FO : standardize behavior of selected country in the list when create a new address 2013-04-11 10:30:22 +02:00
gRoussac
0a6e69e7c1 // remove warnings 2013-03-29 09:34:48 +01:00
gRoussac
80d2b1aba3 //bad commit for Auth controller sorry about this 2013-03-26 18:05:54 +01:00
gRoussac
c49c267532 [-] FO : Fix bug #PSCFV-8415 zipcode is required without zip code format too 2013-03-26 18:05:39 +01:00
gRoussac
a87aee5fb3 [-] FO : Fix bug #PSCFV-8098 inversion in customer and address name 2013-03-21 18:25:40 +01:00
gRoussac
434426c21b [-] FO : GuestAccount required phone 2013-03-21 16:37:41 +01:00
gRoussac
76c06ec8c6 [-] FO : Check for cart rules before diplaying shopping cart in OPC 2013-03-13 18:42:40 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Francois Gaillard
a0d25c399c [-] FO : Fixed mobile theme authentication CSS 2013-03-12 14:16:52 +01:00
gRoussac
bfee79f5e7 [-] BO : Bug with duplicate carts in back office due to id_guest 2013-03-06 18:52:54 +01:00
gRoussac
47ec8f0e78 [-] FO : Fix exception when PS_CART_FOLLOWING 2013-03-06 16:52:02 +01:00
gRoussac
834706f446 [-] FO : Fix bug #PSCFV-8132 authRedirection not implemented and wrong back redirection 2013-03-06 16:04:29 +01:00
Damien Metzger
aa4f94e189 // Missing files for new installer 2013-02-21 11:24:37 +01:00
Gregory Roussac
310de3da54 [-] FO : Fix #PSCFV-6356 recall adresses in cart after login 2013-01-28 18:29:35 +01:00
gRoussac
4b73d72a65 // parse error in last commit sorry 2013-01-24 09:41:35 +01:00
gRoussac
7b48cdd068 [-] FO : Fix bug #PSCFV-7388 Guest checkout & state validation thankx to Sergio 2013-01-24 09:28:06 +01:00
gRoussac
caf95de092 [-] FO : Try to fix "phone required" bug once again when only signing in 2013-01-22 18:33:14 +01:00
gRoussac
e6d23f175c [-] FO : Fix #PSCFV-5544 same alias is no more rejected in OPC 2013-01-07 16:54:42 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
gRoussac
88cd7ce1f4 [-] FO : Fix again #PSCFV-6209 #PSCFV-5686 no required phone 2013-01-03 15:19:04 +01:00
vAugagneur
fc7ea8ef14 //retro compat smarty variable name 'onr_phone_at_least' 2013-01-02 11:53:43 +01:00
Gregory Roussac
33f09fb92f [-] FO : Fix #PSCFV-6209 required phone with Guest Checkout 2012-12-27 18:05:26 +01:00
vAugagneur
89e9f90cf1 //small variable name fix 2012-12-04 18:35:10 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00