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

4313 Commits

Author SHA1 Message Date
Damien Metzger
ac1f142f23 // Moved default_language 2013-11-04 17:08:17 +01:00
Damien Metzger
e8c0195ee9 // small fix merge 2013-11-04 17:04:09 +01:00
gRoussac
c44b1d617c [-] BO : Could not change image position 2013-11-04 16:59:03 +01:00
Kevin Granger
f3fa65f9be // removed admin-ie.css 2013-11-04 16:58:27 +01:00
Kevin Granger
68cda947ed // removed login.css 2013-11-04 16:53:43 +01:00
Kevin Granger
48025838df // fixs referrers 2013-11-04 16:08:38 +01:00
Kevin Granger
d0c6d86eb9 // fixs for merge 2013-11-04 15:56:24 +01:00
Damien Metzger
f7d346ba99 // Added more results link at the end of the BO search 2013-11-04 15:03:48 +01:00
Damien Metzger
27273334e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:47:16 +01:00
Damien Metzger
e7e4376307 // Changed "gender image" to social title in the customer (BO) 2013-11-04 14:45: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
Damien Metzger
d93ea846a9 // Code cleaning and small fixes 2013-11-04 14:29:31 +01:00
Damien Metzger
178cd7362d // admin search code cleaning 2013-11-04 13:57:27 +01:00
Damien Metzger
0451ca5c73 // Added Addons search 2013-11-04 12:24:55 +01:00
Rémi Gaillard
c4d18e5e9f avatar on customer threads 2013-11-02 16:01:06 +01:00
Kevin Granger
84be298dc5 // some W3C fixs 2013-11-01 17:25:18 +01:00
Kevin Granger
1bcb8d5c82 // sass-bootstrap 3.0.1 update 2013-11-01 16:44:55 +01:00
Kevin Granger
9c499dc8a4 // Placeholder instead of label for list filter date 2013-11-01 16:28:21 +01:00
Kevin Granger
bf781ed267 // horizontal nav 2013-11-01 15:50:33 +01:00
Kevin Granger
87eb9bba26 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-31 19:13:53 +01:00
Kevin Granger
64598535bd // Avatar + Vertical Nav WIP 2013-10-31 19:13:34 +01:00
Rémi Gaillard
74e92e364c // php warning 2013-10-31 18:26:09 +01:00
Kevin Granger
ba28c5f527 // UI fixs 2013-10-31 15:49:57 +01:00
Kevin Granger
534421fb6b // UI fixs 2013-10-31 12:20:29 +01:00
Kevin Granger
4334364b36 // cart rules > conditions > product rules 2013-10-31 11:34:47 +01:00
Rémi Gaillard
d17515a728 // don't format currency on input 2013-10-31 10:22:38 +01:00
Kevin Granger
09dcff959e // cart rules > conditions > product rules WIP 2013-10-30 19:25:58 +01:00
gRoussac
8547f663d1 [-] BO : AdminImport withdraw separator changed in js 2013-10-30 18:46:02 +01:00
Rémi Gaillard
ecf45d0475 // small fix 2013-10-30 18:28:55 +01:00
Jerome Nadaud
9f2424db41 // Fix Module exception in transplant 2013-10-30 18:11:33 +01:00
Rémi Gaillard
8aa369531e // employee avatar 2013-10-30 18:02:10 +01:00
Madef
78af47e2d3 [-] BO : tagify call twice if field is not translatable 2013-10-29 23:18:34 +01:00
Kevin Granger
df80e6ec8b // btn-group-action adjustments 2013-10-29 18:55:33 +01:00
Kevin Granger
0b564c0107 // oups 2013-10-29 18:15:17 +01:00
Kevin Granger
aee725839e // fixs btn-group 2013-10-29 18:10:07 +01:00
Rémi Gaillard
6d5ca9969e // js error 2013-10-29 17:56:29 +01:00
Kevin Granger
5fa36abcaf // fixs UI 2013-10-29 17:32:57 +01:00
gRoussac
75cde08776 // update conf message in AdminImport 2013-10-29 16:16:55 +01:00
Jerome Nadaud
b605f33359 [-] BO : FixBug #PSCFV-10866 - Tagify system not working 2013-10-29 12:07:30 +01:00
Jerome Nadaud
580e201c48 [-] BO : FixBug #PSCFV-9319 - display only valid order id 2013-10-29 11:38:48 +01:00
Damien Metzger
dabb23ac8d // Added KPIs to the category page and fixed dashboard data 2013-10-29 11:03:09 +01:00
Rémi Gaillard
07222be5dd // demo mode on ajaxfilemanager 2013-10-29 10:53:00 +01:00
Kevin Granger
b3d7b8754b // fixs date range picker Wip 2013-10-29 10:40:33 +01:00
Rémi Gaillard
2b67d7072c // type of logger field 2013-10-29 10:18:29 +01:00
gRoussac
0aca1d4a67 [*] BO : AdminProducts find smallest images 2013-10-29 08:47:41 +01:00
Jerome Nadaud
dd10301413 // Fix tagify key events 2013-10-28 17:46:00 +01:00
Jerome Nadaud
a466c6f5f7 // Add tagify system to product information 2013-10-28 16:32:17 +01:00
Kevin Granger
3798adff2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-28 16:19:02 +01:00
Kevin Granger
d523d739e7 // dashboard date range picker wip 2013-10-28 16:18:43 +01:00
Rémi Gaillard
1454a0d26a // search type in BO 2013-10-28 15:32:26 +01:00