dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
PrestaShop/img
History
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
..
admin
// missing image
2013-07-12 12:03:32 +02:00
c
// Welcome 2013
2013-01-04 11:19:03 +01:00
cms
// Welcome 2013
2013-01-04 11:19:03 +01:00
co
// Welcome 2013
2013-01-04 11:19:03 +01:00
genders
[*] BO : Add default Unknown.jpg to genders
2013-03-07 19:26:52 +01:00
jquery-ui
// Welcome 2013
2013-01-04 11:19:03 +01:00
l
// Welcome 2013
2013-01-04 11:19:03 +01:00
m
// Welcome 2013
2013-01-04 11:19:03 +01:00
os
// Welcome 2013
2013-01-04 11:19:03 +01:00
p
// Welcome 2013
2013-01-04 11:19:03 +01:00
s
// Welcome 2013
2013-01-04 11:19:03 +01:00
scenes
// Welcome 2013
2013-01-04 11:19:03 +01:00
st
// Welcome 2013
2013-01-04 11:19:03 +01:00
su
// Welcome 2013
2013-01-04 11:19:03 +01:00
t
// Welcome 2013
2013-01-04 11:19:03 +01:00
404.gif
2011-07-06 10:54:11 +00:00
bg_500.png
// add static page to replace white page for exceptions in FO
2013-04-23 11:54:11 +02:00
bg_loader.png
// Some improvements on BackOffice orders
2011-11-02 19:19:03 +00:00
favicon.ico
2011-07-06 10:54:11 +00:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
loader.gif
2011-07-06 10:54:11 +00:00
loadingAnimation.gif
2011-07-06 10:54:11 +00:00
logo_stores.gif
2011-07-06 10:54:11 +00:00
logo.jpg
// add a new logo
2012-01-05 14:12:39 +00:00
macFFBgHack.png
2011-07-06 10:54:11 +00:00
questionmark.png
[-] BO : Now display a question mark when there is no module logo
2011-12-15 11:29:59 +00:00