 Jerome Nadaud
|
43c874e06e
|
// Fix line feed on address observation
|
2013-10-02 09:59:14 +02:00 |
|
|
Jerome Nadaud
|
ba2494fa8b
|
// Remove language select on textarea with 1 langue
|
2013-10-02 09:43:24 +02:00 |
|
|
Kevin Granger
|
65fc1fea63
|
// orders WIP
|
2013-10-01 18:50:41 +02:00 |
|
|
Jerome Nadaud
|
301de7a3a1
|
// Webservice and advanced stock list bootstraping
|
2013-10-01 18:29:35 +02:00 |
|
|
Jerome Nadaud
|
9c40dbb222
|
// Fix group view for bootstrap - removing limit restriction 'cause is now fixed
|
2013-10-01 17:00:56 +02:00 |
|
|
Jerome Nadaud
|
99a4ffe583
|
// Fix enable friendly url button generator on multishop
|
2013-10-01 16:44:03 +02:00 |
|
|
Jerome Nadaud
|
55a5c69d40
|
// Remove language select on only one language
|
2013-10-01 16:03:34 +02:00 |
|
|
Jerome Nadaud
|
bc8e972dfa
|
// Fix language id in features and quantities
|
2013-10-01 15:32:13 +02:00 |
|
|
Jerome Nadaud
|
f469b69113
|
// Fix fixed home category And Norm
|
2013-10-01 15:18:56 +02:00 |
|
|
Jerome Nadaud
|
759a3e191a
|
// Groups and language bootsrapify
|
2013-10-01 15:14:46 +02:00 |
|
|
Jerome Nadaud
|
14b584fc01
|
// Remove language select if exist only 1 language
|
2013-10-01 14:36:48 +02:00 |
|
|
Damien Metzger
|
a6d8ffa293
|
// More breadcrumbs improvements
|
2013-09-30 15:38:22 +02:00 |
|
|
Kevin Granger
|
0db013f1c8
|
// fix checkbox
|
2013-09-30 15:13:08 +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 |
|
|
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 |
|
 dlage
|
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 |
|