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

158 Commits

Author SHA1 Message Date
Damien Metzger
ab71b813be [-] BO : fixed top right link with the "open in a new tab" button 2013-12-04 17:00:59 +01:00
Kevin Granger
3f2ce54efd // gamification + multishop wip 2013-12-03 15:21:13 +01:00
PhpMadman
0a5216e35b show all messages link linked to tab 2013-11-26 15:56:21 +01:00
Damien Metzger
c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00
Kevin Granger
a0f73d20e5 // backward compatibility remix WIP 2013-11-13 20:11:22 +01:00
Rémi Gaillard
2d609ec93c // merge fixes 2013-11-07 17:43:26 +01:00
Rémi Gaillard
e3cfacb90e // link to employee default tab and not index 2013-11-07 17:00:55 +01:00
Damien Metzger
ac1f142f23 // Moved default_language 2013-11-04 17:08:17 +01:00
Kevin Granger
f3fa65f9be // removed admin-ie.css 2013-11-04 16:58:27 +01:00
Kevin Granger
d0c6d86eb9 // fixs for merge 2013-11-04 15:56:24 +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
Kevin Granger
84be298dc5 // some W3C fixs 2013-11-01 17:25:18 +01:00
Kevin Granger
64598535bd // Avatar + Vertical Nav WIP 2013-10-31 19:13:34 +01:00
Rémi Gaillard
8aa369531e // employee avatar 2013-10-30 18:02:10 +01:00
Kevin Granger
5fa36abcaf // fixs UI 2013-10-29 17:32:57 +01:00
Rémi Gaillard
1454a0d26a // search type in BO 2013-10-28 15:32:26 +01:00
Damien Metzger
e8d5dc8a62 [*] BO : search results improvements (no unaccessible tabs, better display, better information) 2013-10-25 15:19:03 +02:00
Damien Metzger
8748b0d240 // Small improvements 2013-10-24 19:12:50 +02:00
Kevin Granger
7a8cdf3913 // admin create order WIP 2013-10-23 18:54:44 +02:00
Kevin Granger
eb82297f45 // small fixs 2013-10-22 10:04:45 +02:00
Kevin Granger
2e13013657 // search field WIP 2013-10-21 18:03:00 +02:00
gRoussac
16ffbd8ee5 // norms 2013-10-21 16:46:22 +02:00
gRoussac
61884ec223 // norms 2013-10-21 16:31:56 +02:00
Kevin Granger
0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +02:00
Damien Metzger
28118cf33a // Code cleaning (backoffice javascript) 2013-10-11 10:47:48 +02:00
Jerome Nadaud
067c78f868 // Fix notifications 2013-10-10 11:02:33 +02:00
Jerome Nadaud
cade037e4f // Use display modal class for lite displaying 2013-10-09 19:28:37 +02:00
Damien Metzger
b7e13e2e7f // Code cleaning 2013-10-08 11:55:10 +02:00
Damien Metzger
84a251a575 [*] BO : you can noww override header and footer for each controller 2013-10-02 17:04:18 +02:00
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Damien Metzger
80376e9034 // Fixed meta title 2013-09-30 11:27:01 +02:00
Damien Metzger
7019af3a11 // Bound the menu to the employee option 2013-09-30 11:20:49 +02:00
Jerome Nadaud
320e1512df // Multistore checkbox design 2013-09-23 18:03:32 +02:00
Jerome Nadaud
f51ffe4c55 // Start design of multistore toolbar 2013-09-20 15:30:59 +02:00
Kevin Granger
7f6255156e // BO orders 2013-09-16 15:20:30 +02:00
Kevin Granger
a1b0710f85 // fix menu + sass refacto 2013-09-12 12:26:08 +02:00
Kevin Granger
99263a1492 // switch menu top // side 2013-09-11 16:56:10 +02:00
Kevin Granger
f29b1b3a31 // perts fix + menu top WIP 2013-09-10 20:23:06 +02:00
Damien Metzger
1d8da79507 [-] BO : fixed notifications when there is too much data 2013-09-10 09:17:54 +02:00
Kevin Granger
b2fd886722 // add new tpl for navigation top/side 2013-09-05 19:07:57 +02:00
Kevin Granger
b4ecaf3ddb // Carrier Wizard with bootstrap WIP 2013-09-04 15:38:45 +02:00
Kevin Granger
5f5997b567 // fix quick access -> target _blank for frontend 2013-09-03 15:19:34 +02:00
Kevin Granger
2990497a26 // header notifications 2013-09-03 12:25:48 +02:00
Kevin Granger
357c949faf // opti css menu 2013-08-29 18:54:36 +02:00
Jerome Nadaud
2426eac605 [+] BO : Add first action on menu icon list 2013-08-27 14:18:45 +02:00
Kevin Granger
f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Kevin Granger
93e03a3c3b // update bower with latest bootstrap 3.0.0 + fix layout 2013-08-21 17:17:24 +02:00
Kevin Granger
44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Kevin Granger
d3717f0950 // fix some test with colors & fix for login screen 2013-08-09 18:57:22 +02:00
Kevin Granger
bca29980d5 //fix layout and contrasted colors 2013-08-09 15:08:14 +02:00