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

2070 Commits

Author SHA1 Message Date
Jérôme Nadaud 29e7169a92 // Change logo size 2013-11-19 08:43:17 +01:00
Damien Metzger 3f5963885e // Install multilang 2013-11-19 00:56:53 +01:00
Damien Metzger 54786a6f75 // Install 2013-11-19 00:10:46 +01:00
Damien Metzger 359f408bd1 // Install 2013-11-19 00:05:51 +01:00
Damien Metzger 89e09c32e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 23:55:39 +01:00
Damien Metzger e2c930a165 // Install 2013-11-18 23:55:29 +01:00
Jerome Nadaud 1b96c590bb // fix stock available on install 2013-11-18 23:53:47 +01:00
Damien Metzger dec5ef7469 // Install 2013-11-18 23:26:41 +01:00
Lucas CERDAN 4001a99414 Fixtures product 2013-11-18 22:21:10 +01:00
Damien Metzger 51e5163761 // Moulinette for installer attributes 2013-11-18 22:10:22 +01:00
Jerome Nadaud f2b5e6de51 // Themeconfigurator and homeslider 2013-11-18 20:49:52 +01:00
Lucas CERDAN c451ee1bd8 // Fixtures 2013-11-18 20:46:22 +01:00
Damien Metzger f4560d0899 // Install 2013-11-18 20:35:42 +01:00
Lucas CERDAN bde8d02c81 Fixtures: category_product 2013-11-18 20:27:01 +01:00
Damien Metzger e4fcb31836 // Install 2013-11-18 20:02:14 +01:00
Jerome Nadaud 3dd7a17f6f // Some fixtures 2013-11-18 19:53:44 +01:00
Lucas CERDAN 72b6b3d482 Fixtures (en) 2013-11-18 19:27:10 +01:00
Damien Metzger a3e1fdb690 // Install 2013-11-18 19:22:10 +01:00
Lucas CERDAN 770d48cf3c Fixtures (en) : category_product 2013-11-18 19:15:10 +01:00
Damien Metzger 36baadad1a // Set to new fixtures 2013-11-18 18:51:11 +01:00
Lucas CERDAN c78252f64b Fixtures images 2013-11-18 18:38:24 +01:00
Lucas CERDAN 5ca7f683ac // Fixture (en): add description to categories 2013-11-18 18:09:40 +01:00
Lucas CERDAN 09a558485a New fixtures (en) 
(my first commit, yay! :) )
 2013-11-18 17:24:06 +01:00
fram 1dd0064cb2 // fixed typo in Russian installer 2013-11-18 15:34:46 +01:00
Damien Metzger b4385c346f [+] Installer : new demo products (part 1) 2013-11-18 14:53:39 +01:00
Damien Metzger 89c65536d7 // Added missing configuration vars in the installer 2013-11-18 12:23:50 +01:00
Damien Metzger 5ef4b8eddc // Installer optimization 2013-11-18 12:12:14 +01:00
Damien Metzger b62952accf [*] BO : Added simulation mode to the dashboard 2013-11-15 18:07:23 +01:00
Jerome Nadaud 29f65da5ca // Add wish list button to blockwishlist module 2013-11-14 19:54:28 +01:00
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