Commit Graph

104 Commits

Author SHA1 Message Date
Damien Metzger
5ef4b8eddc // Installer optimization 2013-11-18 12:12:14 +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
djfm
7812731095 // removed hard-coded space before ellipsis (...) in English installer steps 2013-10-31 08:29:05 +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
Rémi Gaillard
8a682081de // typo 2013-10-18 12:17:51 +02:00
Damien Metzger
79b0a571c0 // Updated languages in the installer 2013-10-10 09:47:10 +02:00
Damien Metzger
180a778e51 [*] Installer : replaced radio buttons by a select for the installer language list (too many languages) 2013-10-08 17:06:02 +02:00
Damien Metzger
d783160af0 // Updated installer 2013-08-06 15:53:59 +02:00
Damien Metzger
581dcec718 // [-] IN : Fixed language detection and help in the installer 2013-08-05 11:23:09 +02:00
Damien Metzger
82a912e3f1 // Fixed iframe height in the installer 2013-08-01 12:30:38 +02:00
Damien Metzger
3cfa17b837 // Improved help iframe in the installer 2013-08-01 12:30:38 +02:00
Damien Metzger
bfa2f33c65 [*] IN : the installer can now attempt to create the database for you 2013-07-03 11:04:34 +02:00
Damien Metzger
19ee2c953f [*] IN : removed the possibility to choose his own storage engine, automatically select the best one 2013-06-26 14:26:37 +02:00
Damien Metzger
bf580094fa // Design improvement of the javascript alert in the installer 2013-06-24 15:10:25 +02:00
Damien Metzger
ec426f170f [*] IN : removed timezones selection for countries that have only one 2013-06-24 14:41:59 +02:00
Damien Metzger
1d5e34cb37 // Installer improvements 2013-06-24 13:41:40 +02:00
Damien Metzger
5335820915 // Fixed sessions/cookies
// Added support iframe
2013-06-24 11:51:36 +02:00
Vincent Augagneur
8702e26c41 // added missing img in installer 2013-06-24 11:04:31 +02:00
Damien Metzger
c6878bc06d // Installer improvements 2013-06-18 14:46:45 +02:00
Damien Metzger
319413ca25 // Added errors to user assistance 2013-06-14 15:08:36 +02:00
Damien Metzger
534c10562f [*] Installer : added cookie mode instead of session for the installer 2013-06-13 15:28:16 +02:00
Francois Gaillard
73a372bab2 // Disable autocomplete on radio button in installer, error fixed with Chrome browser 2013-06-05 10:41:46 +02:00
vAugagneur
d58377bf37 //small css fix in installer 2013-04-26 09:44:51 +02:00
Francois Gaillard
8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
djfm
e664335f4d [*] TR : Improved English text of installer 2013-04-25 10:24:13 +02:00
Damien Metzger
0e9a4a8272 // Changed default value of checkbox in install 2013-04-25 08:41:31 +02:00
Damien Metzger
c6710bf26f // Switch iframe to https 2013-04-24 18:31:51 +03:00
Francois Gaillard
2c3f2eb1da //new addons url in install process 2013-04-24 16:39:04 +02:00
Damien Metzger
23dacfd754 // Change link to the documentation in the installer 2013-04-23 14:57:24 +02:00
vAugagneur
2cde30c118 //new addons url in install process 2013-04-19 11:44:29 +02:00
gRoussac
1bfe494e05 [-] Installer : do not select activity if not defined 2013-04-15 13:42:57 +02:00
vAugagneur
49b49ee469 //small fix 2013-04-05 17:14:38 +02:00
Rémi Gaillard
0ba95d6989 // small changes on php cli installer 2013-04-02 17:28:45 +02:00
Damien Metzger
a00646183e // Small fix installer 2013-03-21 16:56:03 +01:00
Damien Metzger
39e036197d // Fixed activity 2013-03-21 14:03:01 +01:00
Damien Metzger
33a5c28b3b // Fixed 2 bugs in the installer 2013-03-01 18:27:50 +01:00
Damien Metzger
6191b928e6 // Installer improvements 2013-02-27 14:53:51 +01:00
Damien Metzger
52435c2fad // Installer can be translated at /install-dev/dev/translate.php 2013-02-27 14:53:51 +01:00
Damien Metzger
834d741efd // Fixed link 2013-02-25 09:23:39 +01:00
Damien Metzger
aa4f94e189 // Missing files for new installer 2013-02-21 11:24:37 +01:00
Damien Metzger
f4bf4c47a9 [*] Installer : installer improvements - Step 1 2013-02-21 11:05:47 +01:00
Rémi Gaillard
8f5f202d60 // small fix 2013-02-13 11:32:02 +01:00
Rémi Gaillard
f013fdbc2d // Disallow click to install steps during process 2013-02-07 16:40:19 +01:00
Damien Metzger
46cd704209 // Fixed label in install 2013-02-01 18:47:25 +01:00
Damien Metzger
bbe9909772 // Changed number of languages 2013-02-01 17:48:24 +01:00
Damien Metzger
1c8120a852 // Installer / small fix 2013-02-01 17:47:52 +01:00
Damien Metzger
1b815134a1 // A few changes in the installation wizard 2013-02-01 17:47:51 +01:00
Damien Metzger
7b6b9ceaf6 [*] Installer : Automatically drop the system compatibility check when everything's alright
// Fixed 'next' button when the page is refreshed
2013-02-01 17:47:51 +01:00
vAugagneur
69ec687d63 [-] INSTALLER : fixed bug #PSCFV-5702 - error javascript when password have a simple quote 2013-01-28 15:06:38 +01:00