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

86 Commits

Author SHA1 Message Date
Jerome Nadaud
f2b5e6de51 // Themeconfigurator and homeslider 2013-11-18 20:49:52 +01:00
Jerome Nadaud
3dd7a17f6f // Some fixtures 2013-11-18 19:53:44 +01:00
Damien Metzger
a3e1fdb690 // Install 2013-11-18 19:22:10 +01:00
Damien Metzger
36baadad1a // Set to new fixtures 2013-11-18 18:51:11 +01:00
Damien Metzger
0aea146a4c // Code cleaning stats modules 2013-10-28 13:39:39 +01:00
Damien Metzger
9e0125d0b6 // theme installation 2013-10-23 19:09:14 +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
f9b115a2f8 // Date Range picker improvements 2013-10-17 11:39:02 +02:00
Jerome Nadaud
dfd00bb064 // Add stats date in install 2013-10-16 14:44:49 +02:00
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Francois Gaillard
77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
Rémi Gaillard
0662cd3b12 // don't need to clear smarty cache while installation 2013-10-03 16:29:31 +02:00
Jerome Nadaud
1b9472cc37 [-] BO : FixBug #PSCFV-10291 - Remove temporary image on install 2013-09-30 19:01:11 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Damien Metzger
fc42ce17b8 // Set default option for the menu in the installer 2013-09-20 14:08:26 +02:00
Damien Metzger
7eb3b22829 [-] Installer : added the missing default tab in the employee 2013-09-20 14:06:38 +02:00
Damien Metzger
eb6600e840 // Blockcustomerprivacy should not be installed by default 2013-09-20 10:26:58 +02:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Vincent Augagneur
252eb868d9 //dashtrends before dashproducts 2013-09-02 10:15:57 +02:00
Vincent Augagneur
d0f2a37fff //dashboard module view tpl init 2013-09-02 10:10:20 +02:00
Jerome Nadaud
1a1666c399 // Syntax error 2013-08-13 18:45:18 +02:00
gRoussac
5123d2505e [-] CORE : Do not delete index.php in smarty cache or /img/tmp/ 2013-08-13 16:29:40 +02:00
gRoussac
e8685b1430 [*] BO : Add clear smarty cache button 2013-08-13 15:11:00 +02:00
Damien Metzger
86fba93f63 [-] Installer : fixed clear smarty cache 2013-08-13 13:37:04 +02:00
Damien Metzger
4a6d1e8ff6 [-] Installer : changed syntax from $class:func to call_user_func because it seems to be more compliant with old PHP versions 2013-08-13 11:02:32 +02:00
Rémi Gaillard
faec5a9226 // small change on fixtures installation 2013-08-05 20:33:39 +02:00
Damien Metzger
f3b87f126a // Feeder not installed by default 2013-08-05 15:32:52 +02:00
Damien Metzger
c0c6c10bba [-] IN : fixed local install without connection #PSCFV-9286 #PSCFV-9709 2013-07-09 10:21:22 +02:00
Damien Metzger
5789e6eb51 [*] IN : only display the button to create the database if you can actually create the database 2013-07-03 11:28:55 +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
Rémi Gaillard
8c5143de9e [-] Installer: installer now work even if no settings.inc.php file is created with an installer session already here 2013-04-16 12:01:04 +02:00
Rémi Gaillard
23b70c4906 // small changes in installer 2013-04-15 14:33:20 +02:00
Rémi Gaillard
9680d4987b // don't return errors twice on module installation on installer 2013-03-29 17:05:13 +01:00
vAugagneur
7b93630595 //added new step in installer to install addons module 2013-03-29 11:27:27 +01:00
vAugagneur
016cdc1685 //fix install bug when no internet connection 2013-03-26 10:46:44 +01:00
djfm
a209789020 [-] Installer : do not fail on warning when addons modules list empty 2013-03-26 09:42:48 +01:00
Rémi Gaillard
b4a95a7f02 // Another fix for installation with safe_mode 2013-03-22 15:20:40 +01:00
Rémi Gaillard
cc6841aec1 // install languages on installer part 3 2013-03-21 18:57:59 +01:00
Rémi Gaillard
4c1ba5c62d // install languages on installer part 2 2013-03-21 18:32:27 +01:00
Rémi Gaillard
5f2a4f3dea [-] Installer: Install only the language choosen in the installer 2013-03-21 15:17:07 +01:00
Rémi Gaillard
09e5df3704 // switch to degraded mode with safe_mode only if errors on a first install 2013-03-21 11:17:24 +01:00
Rémi Gaillard
1f3f53607d // Fix installer when safe_mode is enabled 2013-03-21 10:56:26 +01:00
vAugagneur
04c3b54c38 // remove themeinstallator from install modules list, now install from addons 2013-03-20 11:25:45 +01:00
vAugagneur
b70497189d [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
vAugagneur
16badbd45d //removed moneybookers during install 2013-03-15 12:02:16 +01:00
Rémi Gaillard
9d9a715ff0 [-] Installer: Fix the installation when safe_mode is enabled 2013-02-26 20:10:43 +01:00
Damien Metzger
6a155d8762 [*] Installer : installer improvements - Step 1 2013-02-21 11:05:47 +01:00
Rémi Gaillard
5490f6063d [-] Installer: check create table privileges 2013-02-01 18:36:35 +01:00