dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,910 Commits 9 Branches 19 Tags
7019af3a11fca9c117818dbfe2c4e4b8d663caaa
Commit Graph

3725 Commits

Author SHA1 Message Date
Damien Metzger
7019af3a11 // Bound the menu to the employee option 2013-09-30 11:20:49 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Jerome Nadaud
9e58e3edfd // Advanced stock bootstrap design 2013-09-27 12:24:44 +02:00
Jerome Nadaud
9ea723d07e // Slip and Statuses bootstrap design 2013-09-26 17:30:34 +02:00
Jerome Nadaud
a1c7dd3ee9 // Add row break to color element 2013-09-26 16:44:26 +02:00
Jerome Nadaud
fa2f10ffc6 // Add row break to color element 2013-09-26 16:43:57 +02:00
Jerome Nadaud
bc80846d7d // Requiered fields bootstrap design 2013-09-26 16:25:18 +02:00
Jerome Nadaud
a93ce00af8 // Groups view bootstrap design 2013-09-26 15:59:28 +02:00
Jerome Nadaud
2cc6fe821b // Bootstraping template form checkbox 2013-09-26 14:56:24 +02:00
Jerome Nadaud
2d65f5a8c0 // Cart rules bootstrap design 2013-09-26 14:55:28 +02:00
Jerome Nadaud
b9ccfe858b // Localization Bootstrap design 2013-09-26 11:36:28 +02:00
Jerome Nadaud
10e472e141 // List header template - Remove extra class attribute 2013-09-26 11:35:19 +02:00
Jerome Nadaud
4c5a6d1efb // Payment bootstrap design 2013-09-26 10:09:50 +02:00
Jerome Nadaud
d6a59a1dbd // Maintenance bootstrap design 2013-09-26 09:37:38 +02:00
Damien Metzger
1b010da64f // Fixed typo and configuration parse error 2013-09-25 20:21:41 +02:00
Damien Metzger
cc75b4b912 // Temp fix for labels in the BO listings, before my eyes hurt 2013-09-25 19:59:00 +02:00
Damien Metzger
01e5cec634 [*] BO : improved performances (cache systems) and countries tabs 2013-09-25 19:41:46 +02:00
Jerome Nadaud
8cc892ecce // Trad 2013-09-25 17:47:10 +02:00
Jerome Nadaud
bf86da782a // Add confirmation for memcached server delete 2013-09-25 17:44:57 +02:00
Jerome Nadaud
b2b8a2eb19 // Fix list search form submit 2013-09-25 16:04:09 +02:00
Jerome Nadaud
875120f145 // Advanced parameters bootstrap design 2013-09-25 15:22:38 +02:00
Jerome Nadaud
ffb7113153 // Posibility to add a specifici icon to options list 2013-09-25 15:16:00 +02:00
Jerome Nadaud
e81c9490b0 // Advanced parameters bootstrap design 2013-09-25 15:15:28 +02:00
Jerome Nadaud
ae760115be // Fix warning 2013-09-25 11:43:14 +02:00
Jerome Nadaud
2a8d251cd6 // Webservice controller bootstrap design 2013-09-25 11:29:11 +02:00
Jerome Nadaud
72f540ad3a // Add textbutton input type to form template 2013-09-25 11:28:41 +02:00
Dinis Lage
81ca3ac1f9 BO: Modules - show update button even if module is not installed but don't 
warn for modules with updates available but not installed.
 2013-09-24 17:42:43 +01:00
Jerome Nadaud
72a7ac2d03 // Special external link in warehouse view 2013-09-24 17:19:01 +02:00
Jerome Nadaud
0247550a0a // Fix accordion for bootsrap and better bulk action for warehouse 2013-09-24 17:18:37 +02:00
Jerome Nadaud
a175e603ef // Wharehouse view bootstrap fix 2013-09-24 16:20:05 +02:00
Jerome Nadaud
479662aa10 // Fix missing table id for shop asso in helper 2013-09-24 16:19:38 +02:00
Jerome Nadaud
003ba20238 // Products multistore bootstrap fix 2013-09-24 16:19:00 +02:00
gRoussac
3d477c62eb // remove notice 2013-09-24 16:03:39 +02:00
Jerome Nadaud
00ddfeba05 // CMS select size in form 2013-09-24 13:09:22 +02:00
Jerome Nadaud
c9eb5b5be6 // Products multistore design 2013-09-24 12:29:12 +02:00
Jerome Nadaud
6e2337df44 // Add id attribute to tree header button 2013-09-24 12:27:51 +02:00
Jerome Nadaud
18a621e022 // Multistore invisible description in options 2013-09-23 19:02:22 +02:00
Jerome Nadaud
f04126c436 // Customers groups - Add special tree handle for categories tree 2013-09-23 18:16:47 +02:00
Jerome Nadaud
320e1512df // Multistore checkbox design 2013-09-23 18:03:32 +02:00
Damien Metzger
6796b64e18 Merge pull request #691 from djfm/development 
// fixed translation of modules descriptions containing quotes
 2013-09-23 07:51:57 -07:00
Jerome Nadaud
e128e17f4e // Geoloc bootstrap design 2013-09-23 14:04:15 +02:00
Jerome Nadaud
748d6271a9 // Stores controller bootstrap 2013-09-23 13:56:30 +02:00
Jerome Nadaud
234b6de1b0 // Stores controller bootstrap design 2013-09-23 13:31:45 +02:00
Jerome Nadaud
4bb0a5f794 // Preferences images bootstrap design 2013-09-23 11:43:31 +02:00
Jerome Nadaud
5206496f64 [-] BO : Fix Bug For new Fancy Box events 2013-09-23 11:22:51 +02:00
Vincent Augagneur
c1a9aa5936 //helper form input type file now can display thumb 2013-09-23 09:45:20 +02:00
Jerome Nadaud
67f05340c0 // Remove list header button link title and remove shop column center 2013-09-23 09:18:44 +02:00
Kevin Granger
c93eb9f40a // orders WIP 2013-09-20 19:11:08 +02:00
Jerome Nadaud
0e87409bd6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-20 18:31:47 +02:00
Jerome Nadaud
8e1cb5cc34 // Kpi update for customers orders 2013-09-20 18:31:35 +02:00