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

71 Commits

Author SHA1 Message Date
Kevin Granger
447f1d4ba7 // quick fix customer view 2013-10-10 19:04:25 +02:00
Kevin Granger
f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +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
Kevin Granger
e4878ba393 // I'm not sure as I've never had a look at how that works before ;) 2013-07-31 21:17:03 +02:00
Kevin Granger
a1cc4d14d0 [+] BO Customers > Customers / Customers > Groups 2013-07-30 18:47:13 +02:00
Kevin Granger
062a4250cc //fixed unclosed div 2013-07-30 15:26:00 +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
Rémi Gaillard
d79365fe4d // small fix 2013-07-22 11:54:35 +02:00
Kevin Granger
40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02: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
Rémi Gaillard
0e38d44a21 // some changes on admin customer view 2013-02-22 14:16:49 +01:00
Rémi Gaillard
0a716e03c5 // some changes on admin customer view 2013-02-22 14:16:49 +01:00
Rémi Gaillard
702679a3a0 // fix 2 links in admincustomers view 2013-02-19 16:38:52 +01:00
Rémi Gaillard
3eeca3537a // fix 2 links in admincustomers view 2013-02-19 16:38:52 +01:00
Rémi Gaillard
9c31710092 [-] BO: Fix #PSCFV-6497 display of list when deleting customers 2013-02-05 11:27:17 +01:00
Rémi Gaillard
a28d23211a [-] BO: Fix #PSCFV-6497 display of list when deleting customers 2013-02-05 11:27:17 +01:00
Damien Metzger
4efaad145f [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
Damien Metzger
886f6d864b [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
sLorenzini
6ca6a83412 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
sLorenzini
c2a1e1f150 [-] FO: fixed Css issue in BO - #PSCFV-6408 2013-01-10 17:18:17 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre
04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // 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
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
9239de5dac [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre
f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
dMetzger
2a297990a0 // W3C 2012-08-20 08:48:53 +00:00
dMetzger
c4d3116607 // W3C 2012-08-20 08:48:53 +00:00
mDeflotte
52486d97a4 [-] BO : #PSCFV-3247 - Fix link to edit customer profile 2012-07-18 08:54:30 +00:00
mDeflotte
0abfceed58 [-] BO : #PSCFV-3247 - Fix link to edit customer profile 2012-07-18 08:54:30 +00:00
lLefevre
0b8dc08acf [-] BO : Fix W3C errors 2012-07-06 14:32:35 +00:00
lLefevre
f36f1c03d1 [-] BO : Fix W3C errors 2012-07-06 14:32:35 +00:00
rGaillard
54675df666 // ajax.php clean and bug fixes 2012-06-15 13:22:07 +00:00
rGaillard
4491986f65 // ajax.php clean and bug fixes 2012-06-15 13:22:07 +00:00
lLefevre
3ddf7259a2 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
lLefevre
9925bf30ad [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
dMetzger
42ad0bc490 [*] BO : Added a link to the customer group edition on the customer page 2012-05-03 09:45:19 +00:00