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

2041 Commits

Author SHA1 Message Date
Jerome Nadaud
01d8376ee7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 16:48:56 +01:00
Jerome Nadaud
b51b388eaa // Blockcategories thumnail uploader fix 2013-11-07 16:44:55 +01:00
Jerome Nadaud
c7249bcc84 // Done in 1.5.6.1 2013-11-07 11:05:39 +01:00
Jerome Nadaud
cf44f8d0b4 // Uploader helper small fix 2013-11-04 19:50:04 +01:00
fram
5f1efc6b63 // installer typography 2013-11-04 16:20:10 +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
gRoussac
2a3192d98c [-] IN : Refacto for update_customer_default_group bad logical 2013-11-03 14:55:25 +01:00
gRoussac
b16e4b5a8e [-] IN : Lower memory usage in migrate_orders, fix update_order_messages loop 2013-11-03 01:49:16 +01:00
gRoussac
8f72282594 [-] IN : update_customer_default_group returning false 2013-11-02 21:51:13 +01:00
gRoussac
a5bb4f0323 [-] IN: Fix [insert order detail 1] error while upgrading 2013-11-02 20:39:53 +01:00
gRoussac
062fb90c2e [-] IN : Fix Unknown column 'module_name' in 'ps_webservice_account' during upgrade 2013-10-31 19:24:41 +01:00
Damien Metzger
8670db2316 // Image sizes 2013-10-31 17:41:02 +01:00
Damien Metzger
fe78dceede // Fixed image sizes 2013-10-31 17:08:22 +01:00
Damien Metzger
9c57c71deb Merge pull request #913 from djfm/development 
// Installer Translations
 2013-10-31 01:48:56 -07:00
djfm
7812731095 // removed hard-coded space before ellipsis (...) in English installer steps 2013-10-31 08:29:05 +00:00
djfm
a8a204edf3 // small correction in English installer text 2013-10-31 08:25:57 +00:00
djfm
11f60492be // removed unnecessary punctuation in English installer strings, both in source code and translations 2013-10-31 08:09:14 +00:00
gRoussac
f919cc899d [-] IN : Set conversion rate to 1 if equal 0 in base 2013-10-30 20:06:47 +01:00
gRoussac
fbdddba753 [-] IN : Set default conversion rate to 1 not 0 2013-10-30 19:03:36 +01:00
djfm
c958436a76 // Dutch installer translations 2013-10-30 17:26:22 +00:00
djfm
a56fb7c639 // Polish installer translations 2013-10-30 17:06:52 +00:00
djfm
16efe89bed // improved installer translations: no colons in translations and filled some missing fields 2013-10-30 16:57:30 +00:00
Rémi Gaillard
a0f4eab4c1 // typo 2013-10-30 15:40:40 +01:00
gRoussac
9ef10ee806 [-] IN : Handle RC PHP_VERSION 2013-10-30 15:03:07 +01:00
gRoussac
c98b5e0c78 [*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski 2013-10-29 19:05:21 +01:00
gRoussac
c6319a754e [-] BO : Stats are empty when no conversion rate 2013-10-29 16:04:15 +01:00
gRoussac
d409614222 [-] FO : CustomerMessage ip_address to string 2013-10-29 11:18:53 +01:00
Rémi Gaillard
edf54eb2ca // re-generate class_index on the first step of install 2013-10-28 18:43:02 +01:00
Damien Metzger
0aea146a4c // Code cleaning stats modules 2013-10-28 13:39:39 +01:00
Damien Metzger
9c54dcce66 // Fixed default stats graph engine 2013-10-28 12:15:35 +01:00
Damien Metzger
e9a802cf23 [*] BO : Added the number of associated products in the product attachments list 2013-10-25 18:04:27 +02:00
Jerome Nadaud
6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
Damien Metzger
b548f72ac5 // Attributes and values => Product Attributes 2013-10-24 17:18:45 +02:00
Damien Metzger
c39a74e479 // Renamed Feature into Product Features 2013-10-24 17:07:47 +02:00
gRoussac
c5324a653b [-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x 2013-10-24 16:31:50 +02:00
Damien Metzger
a1df97776a // Set default values 2013-10-24 13:54:55 +02:00
Damien Metzger
a34784a15d // Fixed chart for period before the store creation 2013-10-24 11:17:33 +02:00
Damien Metzger
e17dd1fdde // theme installation 2013-10-24 09:49:46 +02:00
Damien Metzger
9e0125d0b6 // theme installation 2013-10-23 19:09:14 +02:00
Damien Metzger
758b5f7241 // Started to adapt the install to the new template 2013-10-23 17:29:59 +02:00
Damien Metzger
69d5cb4ccd [+] FO : New Responsive, Bootstrap template 2013-10-23 16:56:02 +02:00
Damien Metzger
9930c375c7 // Dashgoals :) 2013-10-23 15:37:43 +02:00
Jerome Nadaud
67fc91e2c9 // Categories thumbnails 2013-10-22 17:43:10 +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
Rémi Gaillard
8a682081de // typo 2013-10-18 12:17:51 +02:00
Jerome Nadaud
f9b115a2f8 // Date Range picker improvements 2013-10-17 11:39:02 +02:00
Jerome Nadaud
a85b931765 // Adding compare options 2013-10-16 19:07:23 +02:00
Damien Metzger
9492557284 // Removed administrator account from the installer, replaced by the superadministrator account 2013-10-16 15:40:30 +02:00
Jerome Nadaud
dfd00bb064 // Add stats date in install 2013-10-16 14:44:49 +02:00
gRoussac
62aaf16d60 [*] FO : New hooks for home tabs 2013-10-16 11:44:55 +02:00