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

137 Commits

Author SHA1 Message Date
Damien Metzger
4c2190ddc5 [-] Core : integrated modified pull request 40abb0aa72 2013-11-29 17:18:18 +01:00
Damien Metzger
54786a6f75 // Install 2013-11-19 00:10:46 +01:00
Rémi Gaillard
c091729fd7 // missing directory 2013-10-31 17:03:41 +01:00
Kevin Granger
be2ea4ca77 // login 2013-10-15 20:04:19 +02:00
Kevin Granger
618d980dc7 [+] add css for graph and temp avatar 2013-08-29 15:48:14 +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
97062d60a2 // Add index.php 2013-08-08 16:14:45 +02:00
Vincent Augagneur
0e6f1598f7 [-] BO : fixed some bug on carrier wizard - added tabindex on input - new default carrier img 2013-07-29 18:36:50 +02:00
Vincent Augagneur
e1b408f1f3 //added missing carrier wizard step img 2013-07-29 11:36:44 +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
gRoussac
6f9e415ca7 // missing image 2013-07-12 12:03:32 +02:00
Kevin Granger
b0eaf8124c [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:19:50 +02:00
Rémi Gaillard
ceddfdd8e6 // add static page to replace white page for exceptions in FO 2013-04-23 11:54:11 +02:00
Rémi Gaillard
9282e310f4 // add static page to replace white page for exceptions in FO 2013-04-23 11:54:11 +02:00
gRoussac
70e61c2c47 [*] BO : Add default Unknown.jpg to genders 2013-03-07 19:26:52 +01:00
gRoussac
55208a938a [*] BO : Add default Unknown.jpg to genders 2013-03-07 19:26:52 +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
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
vAugagneur
90a2a52c4b // 2012-09-17 13:32:19 +00:00
vAugagneur
2ea4c5e73d // 2012-09-17 13:32:19 +00:00
bMancone
5c2792b8f3 [+] BO : Added Mobile tab image 2012-09-13 12:32:40 +00:00
bMancone
0a306e572e [+] BO : Added Mobile tab image 2012-09-13 12:32:40 +00:00
dMetzger
1925df40fa // Tpl cleaning 2012-08-20 08:27:12 +00:00
dMetzger
f90b9c140f // Tpl cleaning 2012-08-20 08:27:12 +00:00
dMetzger
8cb64b8da3 // Case change part 2 2012-08-20 07:39:36 +00:00
dMetzger
0affbb6ea8 // Case change part 2 2012-08-20 07:39:36 +00:00
dMetzger
ca03a9f2e3 // Case change part 1 2012-08-20 07:38:34 +00:00
dMetzger
84c48001c8 // Case change part 1 2012-08-20 07:38:34 +00:00
vAugagneur
e07170c363 //new cart icon in module list 2012-08-02 08:24:41 +00:00
vAugagneur
8504cf0d94 //new cart icon in module list 2012-08-02 08:24:41 +00:00
vAugagneur
0e7e99a8d2 // 2012-08-01 15:36:11 +00:00
vAugagneur
f96f5eaef6 // 2012-08-01 15:36:11 +00:00
rMalie
0b9c8e7f7d // Fix AdminPdf.gif 2012-06-07 16:04:57 +00:00
rMalie
2cb2ceb563 // Fix AdminPdf.gif 2012-06-07 16:04:57 +00:00
dMetzger
8e9fa163ca // Missing icon 2012-05-22 07:14:57 +00:00
dMetzger
4b98db4dcf // Missing icon 2012-05-22 07:14:57 +00:00
tDidierjean
1a3cf40003 // move icon 2012-05-21 19:18:36 +00:00
tDidierjean
c97dfae876 // move icon 2012-05-21 19:18:36 +00:00
tDidierjean
785a3780e3 // add missing icon 2012-05-21 19:11:59 +00:00
tDidierjean
462a8eb1f2 // add missing icon 2012-05-21 19:11:59 +00:00