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

206 Commits

Author SHA1 Message Date
Jerome Nadaud
18a2e026ef // Adding more buttons to module configuration 2013-11-14 15:49:17 +01:00
Jerome Nadaud
bdc996d13b // Wrong col size 2013-11-08 17:58:09 +01:00
Jerome Nadaud
9065a73998 // Remove flags 2013-11-08 17:21:36 +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
Rémi Gaillard
ecf45d0475 // small fix 2013-10-30 18:28:55 +01:00
Kevin Granger
aee725839e // fixs btn-group 2013-10-29 18:10:07 +01:00
Jerome Nadaud
6f57093f50 [-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security 2013-10-24 18:36:36 +02:00
gRoussac
7c7fe5dc0b // small change 2013-10-21 12:39:48 +02:00
gRoussac
15cd0b9fbc [-] BO : Report of fd86a29c5c 2013-10-21 12:21:49 +02:00
Jerome Nadaud
9c4b975cfc //Module uploader bootstraping 2013-10-21 11:31:50 +02:00
Vincent Augagneur
fd86a29c5c //small fix 2013-10-21 09:50:20 +02:00
PrestanceDesign
6965bb29c1 [*] BO : Adding a title tag to display the module name on hover like PS 1.4 2013-10-18 18:20:15 +02:00
Vincent Augagneur
d1ee6e6357 //small fix 2013-10-17 11:27:30 +02:00
Vincent Augagneur
2f34af4646 //remove debug 2013-10-17 09:26:47 +02:00
Vincent Augagneur
c684fa13cb //module anchor now use instant search to filter module list 2013-10-16 16:09:44 +02:00
Rémi Gaillard
2e65214c39 // manually merge of modules search 2013-10-16 11:36:40 +02:00
Rémi Gaillard
1b8526cd05 // fix ajax on module list 2013-10-15 18:35:04 +02:00
Kevin Granger
0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +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
Damien Metzger
28118cf33a // Code cleaning (backoffice javascript) 2013-10-11 10:47:48 +02:00
Damien Metzger
fb9204ebd6 // Fixed module page 2013-10-10 09:14:58 +02:00
Fabio Chelly
246340b78c [*] BO Module search: Enter key is now disabled in quick search field (field is correctly aligned) 2013-10-09 18:33:41 +02:00
Fabio Chelly
75ffa8c4f8 [*] BO Module search: Enter key is now disabled in quick search field 2013-10-09 18:30:09 +02:00
Damien Metzger
d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +02:00
Francois Gaillard
68cba08303 [-] BO : Bug fix - Modules confirmation messages 2013-10-07 12:18:44 +02:00
Jerome Nadaud
6fc12968b8 // Fix missing module configuration bar #PSCSX-3 2013-10-07 12:03:37 +02:00
Jerome Nadaud
97824b2335 // License 2013-10-07 12:02:51 +02:00
Fabio Chelly
2515d81bdd [*] BO Module search: Quick search can now search modules by name and not only display name 2013-10-07 11:34:16 +02:00
Jerome Nadaud
a1f5455d07 // Fix Mark as favorite not updated 2013-10-07 11:03:03 +02:00
Fabio Chelly
139a74e4cd [*] BO Module search: the PHP search has been replace by a quick search in JS to display results instantly 2013-10-04 18:15:12 +02:00
Dinis Lage
81ca3ac1f9 BO: Modules - show update button even if module is not installed but don't 
warn for modules with updates available but not installed.
 2013-09-24 17:42:43 +01:00
Kevin Granger
5c04e5564c // tags + fixed-width 2013-09-17 11:59:57 +02:00
Kevin Granger
7f6255156e // BO orders 2013-09-16 15:20:30 +02:00
Kevin Granger
161c612c02 // fix modules list 2013-09-04 18:56:00 +02:00
Kevin Granger
d4023ce0a3 // config Compass + Bower Update 2013-08-30 15:18:20 +02:00
Kevin Granger
40e2b5b8d9 // fix BO modules list -> fav view 2013-08-29 17:23:26 +02:00
Damien Metzger
36815be192 // Fixed warning 2013-08-29 16:33:06 +02:00
Jerome Nadaud
4a7e68ae05 // Modules list fix 2013-08-28 10:18:43 +02:00
Kevin Granger
4c92db8912 // Modules position 2013-08-27 19:08:53 +02:00
Kevin Granger
9129ee79dc // Modules position WIP 2013-08-27 18:54:57 +02:00
Jerome Nadaud
946840ae45 // Small id fix 2013-08-26 18:39:38 +02:00
Kevin Granger
a972de046e // fix Modules page 2013-08-26 12:26:41 +02:00
Kevin Granger
f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Kevin Granger
44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud
5e2a3e3c13 [+] BO : Modal module list 2013-08-13 15:22:18 +02:00
Jerome Nadaud
e33cd2d13b [+] BO : Add active class to list view button 2013-08-13 13:55:41 +02:00
Jerome Nadaud
1af9fdd1b2 [-] BO : Module list new action buttons 2013-08-13 12:28:07 +02:00
Kevin Granger
6ae222e720 // some sass/compass magic for color schemes… and few new bugs to fix with layout 2013-08-08 16:59:39 +02:00
Kevin Granger
ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
Kevin Granger
58cba9f894 // [+] Module - Login Addons 2013-08-06 10:19:43 +02:00