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

74 Commits

Author SHA1 Message Date
Jerome Nadaud
62b4a3cd5e [+] BO : Page header toolbar 2013-08-27 18:42:24 +02:00
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
787bf75304 [-] BO : FixBug missing rows and cols attributes for textareas 2013-08-20 09:52:50 +02:00
Jerome Nadaud
95f775daa1 [+] BO : Catalog Bulk actions 2013-08-07 10:52:23 +02:00
jeromenadaud
114eb3b78b [-] BO : FixBug Manufacturer multilist pagination, filter, order problems and manufacturer address filter exception 2013-08-05 16:32:39 +02:00
Damien Metzger
e80364984a // Fixed manufacturers addresses export 2013-07-26 10:36:41 +02:00
Kevin Granger
72b046d5f0 [+] BO Manufacturers 2013-07-26 10:21:23 +02:00
Kevin Granger
9308c5c527 no message 2013-07-25 19:18:54 +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
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
Jérôme Nadaud
421c199e1f [-] BO : FixBug #PSCFV-8229 Default country value set to manufacturer country 
Default country value set to manufacturer country
Click on manufacturer address line now redirect to manufacturer address
edition
 2013-07-17 15:13:34 +02:00
Rémi Gaillard
ec3095ac32 [-] BO: Fix manufacturer addresses duplication #PSCFV-9601 2013-06-28 10:18:49 +02:00
Damien Metzger
5493010e67 [-] BO : postcode required in manufacturer address 2013-06-14 10:25:37 +02:00
vAugagneur
3d6d97af5f [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard
e3e38b19e1 [*] BO: you can now export listing of some tabs in CSV 2013-02-13 16:15:37 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
ae7569bde3 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
b2d0101bf3 [-] BO : fixed bug #PSCFV-5155 2012-10-30 15:10:17 +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
rGaillard
d9b2fabd5b // Fix #PSCFV-4452 2012-09-27 14:30:35 +00:00
vAugagneur
65f811916a [-] BO : fixed bug #PSCFV-3437 2012-08-03 08:30:04 +00:00
lLefevre
12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
vAugagneur
85a3e89dd8 //remove unused variable 2012-06-05 09:24:15 +00:00
lLefevre
daa263cd1f [-] BO : fix #PSCFV-2544 : delete selected manufacturers 2012-05-24 15:25:05 +00:00
fBrignoli
ea5858f755 [-] BO : Bug fixed #PSCFV-2474 - Missing shop association when creating a manufacturer with a logo 2012-05-21 13:23:49 +00:00
vAugagneur
d1e19ad464 [-] BO : fixed bug #PSCFV-2304 2012-05-14 12:56:33 +00:00
rMalie
e580832934 // Use protected instead of private for classes we can override #PSCFV-1976 2012-04-26 08:55:55 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
tDidierjean
ba2abcd990 // Rename fieldsDisplay to fields_list part2 (timeout) 2012-03-29 16:29:31 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
tDidierjean
e462d968f0 // rename $toolbar_fix to $toolbar_scroll part2 2012-02-28 17:39:40 +00:00
bMancone
362258ede6 // Fixed revision 13573 2012-02-28 13:13:47 +00:00
rMalie
7655ee2a3e // Improve shop associations in BO 2012-02-24 09:11:18 +00:00
rMalie
8ed9b6ae0c // Fix shop context call 2012-02-24 08:51:52 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mDeflotte
47aed25464 // Removing attribute 'preselect_country' and use 'default_value' instead 2012-02-22 14:27:32 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
tDidierjean
2a1a47b5f6 // replace all uses of "combinaison" by "combination" 2012-02-17 15:03:56 +00:00
aFolletete
bdcc800cd4 [-] BO : the default country of shop is correctly selected by default in forms with country field #PSTEST-493 2012-02-16 15:55:11 +00:00
mDeflotte
a52f8c38ee [-] BO : #PSTEST-769 - The default country must be pre-selected on address list 2012-02-16 14:13:04 +00:00
tDidierjean
5946c9fe93 // Finish removing the "id_theme in ImageType" code 2012-02-13 15:35:05 +00:00
rGaillard
b1ddbcbba1 [-] BO: Fix some listing filters bug 2012-02-09 16:56:17 +00:00
tDidierjean
e73990a61c // Rename template/helper to template/helpers 2012-02-06 16:35:49 +00:00
tDidierjean
fccb65f6d3 // Replace public by protected in override methods 2012-02-06 13:41:51 +00:00
mDeflotte
30f56ec3f4 // BO : Fix bug with bad order by 2012-02-03 14:25:23 +00:00
mDeflotte
19e5212932 // Normalization 2012-01-27 13:53:42 +00:00