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

37 Commits

Author SHA1 Message Date
Damien Metzger
5ef4b8eddc // Installer optimization 2013-11-18 12:12:14 +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
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
bfa2f33c65 [*] IN : the installer can now attempt to create the database for you 2013-07-03 11:04:34 +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
c6878bc06d // Installer improvements 2013-06-18 14:46:45 +02:00
Damien Metzger
534c10562f [*] Installer : added cookie mode instead of session for the installer 2013-06-13 15:28:16 +02: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
f013fdbc2d // Disallow click to install steps during process 2013-02-07 16:40:19 +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
Rémi Gaillard
3f4f5f5df0 [*] Installer: pre-compile the smarty templates to improve the loading time of first connection 2013-01-11 18:13:28 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Damien Metzger
f78abb14b9 // New user assistance in the installer 2012-12-12 20:34:13 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
rMalie
8c6a588aa9 // Fix double click on install button #PSCFV-2873 2012-06-19 14:45:05 +00:00
rMalie
4a2ad059da // Fix javascript in installer (jQuery update) #PSTEST-1224 2012-04-23 15:46:34 +00:00
fBrignoli
4d9d6b2303 [*] Project : Jquery 1.7.2 2012-04-20 15:45:43 +00:00
rMalie
bb1d60d202 // Fix install js 2012-02-28 13:35:50 +00:00
rMalie
8d6b475e71 // Hide password in last step of installer #PSTEST-892 2012-02-28 13:22:15 +00:00
rMalie
20df8e3f2d // Add nice list in installer 2012-02-15 13:06:03 +00:00
rMalie
26fb5d668d // Fix last smiley in installer + some translations 2012-02-13 16:45:43 +00:00
rMalie
7969d242e9 // Installer can work with 18MO (under 32MO sub ajax queries are triggered) 2012-02-09 15:37:48 +00:00
rMalie
666c7a8059 // Remove preactivation from installer 2012-02-07 14:00:40 +00:00
rMalie
85bee87920 // Fix bug when fixtures are disabled + move install type (fixtures or not) to configure step 2012-02-07 13:37:37 +00:00
rMalie
c04daeefc2 // Add a link to restart installer if an error occured + session protection on reinstallation 2012-02-03 10:43:55 +00:00
rMalie
3ed3fefd84 // Improve installation design (addons iframes + progress percent + remove back button) 2012-02-03 09:19:55 +00:00
rMalie
35d1c15564 // Add a lock on install process steps to be sure that a process can't be called if the first one isn't finished 2012-02-02 09:31:18 +00:00
jBreux
723083d94c // Fix scrolling 2012-01-26 18:00:03 +00:00
mMarinetti
c6376aa861 // install-new renamed to install-dev 2012-01-26 17:35:54 +00:00