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

283 Commits

Author SHA1 Message Date
Kevin Granger
3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Jerome Nadaud
5e2a3e3c13 [+] BO : Modal module list 2013-08-13 15:22:18 +02:00
Jerome Nadaud
1af9fdd1b2 [-] BO : Module list new action buttons 2013-08-13 12:28:07 +02:00
jeromenadaud
409bc533cd [-] BO : FixBug #PSCFV-9748 Missing confirmation and update button problem 2013-08-01 14:21:48 +02:00
gRoussac
5677826b2f // wrong commit 2013-07-30 19:21:02 +02:00
gRoussac
d68d844303 // norms 2013-07-30 19:02:05 +02:00
Kevin Granger
77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
Damien Metzger
994d43d3e4 // Oops 2013-07-12 09:40:14 +02:00
Damien Metzger
9af2d3946f // Fixed potential error when deleting a module 2013-07-11 18:46:06 +02:00
Kevin Granger
f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
sLorenzini
f847c821ed // update tab modules bootsrap 2013-07-10 18:19:03 +02:00
Damien Metzger
5f4b6a6534 // After a successful install of a single module that has a configuration method, to the configuration page 2013-06-18 09:12:41 +02:00
Rémi Gaillard
986d57148f //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
Rémi Gaillard
a7be6b14e8 //AdminModulesController::extractArchive() now return something 2013-04-18 14:58:43 +02:00
gRoussac
5989481859 [-] BO : Remove undefined name when module can not be installed 2013-04-15 16:21:03 +02:00
gRoussac
c83bc07f20 [-] BO : Remove undefined name when module can not be installed 2013-04-15 16:21:03 +02:00
Rémi Gaillard
7a89d0596f [-] BO: Don't delete the directory of modules before upgrade them 2013-04-15 11:17:17 +02:00
Rémi Gaillard
7fddcd3f38 [-] BO: Don't delete the directory of modules before upgrade them 2013-04-15 11:17:17 +02:00
Rémi Gaillard
02baab7393 [*] BO: List all modules with an upgrade available on AdminModules header 2013-03-27 18:58:21 +01:00
Rémi Gaillard
c2d8853f57 [*] BO: List all modules with an upgrade available on AdminModules header 2013-03-27 18:58:21 +01:00
vAugagneur
b70497189d [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
vAugagneur
b95b5861ef [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
vAugagneur
734c5a7c8f [-] BO : fixed bug #PSCFV-8285 - module tab listing permission 2013-03-18 14:54:04 +01:00
vAugagneur
7bcc1ff651 [-] BO : fixed bug #PSCFV-8285 - module tab listing permission 2013-03-18 14:54:04 +01:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Damien Metzger
bc30531063 // Small fix (module installation and pscleaner) 2013-03-11 12:31:42 +01:00
Damien Metzger
fdeba0497d // Small fix (module installation and pscleaner) 2013-03-11 12:31:42 +01:00
Damien Metzger
7ec0f0e391 // Fixed modules list icons retrieval 2013-03-08 11:53:25 +01:00
Damien Metzger
6d98b9a6ac // Fixed modules list icons retrieval 2013-03-08 11:53:25 +01:00
Rémi Gaillard
8a0474320f [-] Core: Fix #PSCFV-8012 attribute_url is sometimes null but also sometimes empty... 2013-02-27 16:16:02 +01:00
Rémi Gaillard
cdb9c0cb40 [-] Core: Fix #PSCFV-8012 attribute_url is sometimes null but also sometimes empty... 2013-02-27 16:16:02 +01:00
Damien Metzger
9ebe9e1894 // Changed modules list button (Sarah needed here!) 2013-02-25 12:16:58 +01:00
Damien Metzger
d4a6a56d1b // Changed modules list button (Sarah needed here!) 2013-02-25 12:16:58 +01:00
Rémi Gaillard
2671b43dbd // List only module categories which contains at least 1 module 2013-02-13 11:26:18 +01:00
Rémi Gaillard
45fddec936 // List only module categories which contains at least 1 module 2013-02-13 11:26:18 +01:00
Rémi Gaillard
90462ad746 [-] BO: Fix connection with Addons on AdminModules 2013-02-07 18:01:53 +01:00
Rémi Gaillard
623ba4e7c7 [-] BO: Fix connection with Addons on AdminModules 2013-02-07 18:01:53 +01:00
vAugagneur
4ef61eb8f8 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur
606b3eedd5 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
vAugagneur
0de5c242ca [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
vAugagneur
947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Damien Metzger
35c31ff108 // Added a configuration variable when logged on addons from the back end 2013-02-01 17:47:51 +01:00
Damien Metzger
3b2be13f2e // Added a configuration variable when logged on addons from the back end 2013-02-01 17:47:51 +01:00
vAugagneur
bc203bfc3a [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
vAugagneur
ab3226d9d2 [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
vAugagneur
4523f4c849 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
vAugagneur
517e90da43 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
Damien Metzger
e48c0cfc67 // Fixed typo 2013-01-15 13:54:06 +01:00
Damien Metzger
710feb595a // Fixed typo 2013-01-15 13:54:06 +01:00