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

58 Commits

Author SHA1 Message Date
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
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
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
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
dMetzger
bafe670624 // Added debug information to the installer #PSCFV-4195 2012-09-26 12:17:51 +00:00
dMetzger
33758c413e // Removed @ inhibiter in front of a function of the installer (I want to show the errors !!!) #PSCFV-3634 2012-08-16 12:12:30 +00:00
rMalie
c90e61ee34 // Fix default id lang in localization packs 2012-06-20 08:36:51 +00:00
vAugagneur
e113827a45 [-] BO : fixed bug #PSCFV-2756 - error in installation 1.5 RC Warning on copy() 2012-06-19 07:30:30 +00:00
rGaillard
79bfb639f0 // Fix simple_xml_warnings 2012-05-21 21:49:25 +00:00
vAugagneur
4e73269fcc [-] installer : fixed bug #PSCFV-2303 2012-05-14 08:46:47 +00:00
rMalie
eca25d9ef9 // Fix installer on module installation step 2012-05-09 16:02:29 +00:00
rMalie
b90814da24 // Fix FileLogger in installer 2012-05-09 15:38:36 +00:00
rMalie
d7337c4d4f // Multishop interface reworked 2012-05-09 15:05:39 +00:00
rGaillard
2841323568 [-] BO: Fix localization pack url 2012-04-27 12:48:18 +00:00
rMalie
c5c01fc939 // FileLogger is now called after configuration in installer in order to prevent permissions problems on log/ folder 2012-04-25 15:25:04 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
vSchoener
1a68629107 [-] INSTALLER : Active only the country selected by the merchant (#PI-69) 2012-04-05 14:37:21 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
rMalie
eb97902fdd [*] Classes : table prefix is no longer required in Db::getInstance()->delete() method 2012-02-16 14:54:52 +00:00