 Kevin Granger
|
7a8cdf3913
|
// admin create order WIP
|
2013-10-23 18:54:44 +02:00 |
|
|
Rémi Gaillard
|
e1887425fa
|
[*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import
|
2013-10-23 18:22:53 +02:00 |
|
|
Vincent Augagneur
|
b38073ad72
|
//watermark now use bootstrap design
|
2013-10-23 18:01:23 +02:00 |
|
|
Sarah Lorenzini
|
7a23c169d6
|
// update css mail template
|
2013-10-23 17:58:28 +02:00 |
|
|
Sarah Lorenzini
|
45bd281504
|
// update mail templates
|
2013-10-23 17:53:54 +02:00 |
|
|
Gregory Roussac
|
c72c44f153
|
Merge pull request #877 from djfm/bootstrap
// English
|
2013-10-23 08:46:16 -07:00 |
|
|
djfm
|
52622e6be2
|
// English
|
2013-10-23 15:33:15 +00:00 |
|
|
Damien Metzger
|
758b5f7241
|
// Started to adapt the install to the new template
|
2013-10-23 17:29:59 +02:00 |
|
|
Damien Metzger
|
69d5cb4ccd
|
[+] FO : New Responsive, Bootstrap template
|
2013-10-23 16:56:02 +02:00 |
|
|
Jerome Nadaud
|
16dfea95e3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-23 16:49:05 +02:00 |
|
|
Jerome Nadaud
|
a27f8bc999
|
// Fix Stats datepicker
|
2013-10-23 16:48:55 +02:00 |
|
|
Damien Metzger
|
466699edcb
|
// Add units to goals configuration
|
2013-10-23 16:36:04 +02:00 |
|
|
Damien Metzger
|
9930c375c7
|
// Dashgoals :)
|
2013-10-23 15:37:43 +02:00 |
|
|
Jerome Nadaud
|
ff3455be78
|
// Products combinations form bootstraping
|
2013-10-23 15:03:28 +02:00 |
|
|
Jerome Nadaud
|
c30d103410
|
// Check if exist children opt. in employees
|
2013-10-23 14:49:22 +02:00 |
|
|
Jerome Nadaud
|
fee2da6980
|
// Add sublime project file to gitignore
|
2013-10-23 14:35:24 +02:00 |
|
|
Rémi Gaillard
|
be1299d8d7
|
// small fix
|
2013-10-23 14:19:19 +02:00 |
|
|
Jerome Nadaud
|
4e1b4cdf90
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-23 12:11:10 +02:00 |
|
|
Jerome Nadaud
|
0bf6410773
|
//Fix save and stay combinations problem
|
2013-10-23 12:10:36 +02:00 |
|
|
Rémi Gaillard
|
2279b959fe
|
// small changes on orders view
|
2013-10-23 12:10:02 +02:00 |
|
|
Rémi Gaillard
|
8662ef12b4
|
// small changes on orders view
|
2013-10-23 11:59:28 +02:00 |
|
|
Kevin Granger
|
5ee716ff9e
|
// fix admin edit countries
|
2013-10-23 11:18:31 +02:00 |
|
|
Jerome Nadaud
|
45ea4aefad
|
// Fix Combinations ajax problem
|
2013-10-23 10:50:18 +02:00 |
|
|
Sarah Lorenzini
|
9a7af80943
|
// update mail templates
|
2013-10-23 10:13:57 +02:00 |
|
|
Vincent Augagneur
|
c61cec9f2a
|
//display date on dashproducts && added param date_from & date_to on dashboard hooks
|
2013-10-23 09:59:16 +02:00 |
|
|
Vincent Augagneur
|
48a70cc8ac
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-23 09:57:47 +02:00 |
|
|
Vincent Augagneur
|
3ec3bf587e
|
//small fix on cache_id in classe Hook
|
2013-10-23 09:38:22 +02:00 |
|
|
Damien Metzger
|
9d3f3d1876
|
// Fixed warning in admin customer tpl
|
2013-10-23 09:32:48 +02:00 |
|
|
Damien Metzger
|
a2be0364da
|
// First draft goals
|
2013-10-22 19:59:18 +02:00 |
|
|
Jerome Nadaud
|
2c94e6c042
|
// Add level depth restriction on blockcategories
|
2013-10-22 19:13:10 +02:00 |
|
|
Jerome Nadaud
|
dfa59fa8f7
|
// Fix blockcategories
|
2013-10-22 19:04:11 +02:00 |
|
|
Vincent Augagneur
|
537bfb0520
|
//dash configuration cancel button added
|
2013-10-22 18:04:08 +02:00 |
|
|
Jerome Nadaud
|
766d0e01f4
|
// Adding reset button to form template
|
2013-10-22 18:00:39 +02:00 |
|
|
Jerome Nadaud
|
67fc91e2c9
|
// Categories thumbnails
|
2013-10-22 17:43:10 +02:00 |
|
|
Damien Metzger
|
3539a779f8
|
// Oops
|
2013-10-22 17:32:02 +02:00 |
|
|
Damien Metzger
|
4e8ba711d9
|
// Oops
|
2013-10-22 17:15:08 +02:00 |
|
|
Sarah Lorenzini
|
cc1dd2510a
|
// mail template src
|
2013-10-22 16:24:16 +02:00 |
|
|
Jerome Nadaud
|
c458e059d5
|
// Fix hook list problem on multishop
|
2013-10-22 16:18:50 +02:00 |
|
|
Sarah Lorenzini
|
32a85007df
|
// update mail templates
|
2013-10-22 15:45:33 +02:00 |
|
|
Damien Metzger
|
04f0545254
|
// forgot to rename a field
|
2013-10-22 15:37:33 +02:00 |
|
|
Damien Metzger
|
1323befe2f
|
// Add link to profitability conf
|
2013-10-22 15:36:46 +02:00 |
|
|
Damien Metzger
|
8ef9e71966
|
// Refine dashboard net profits
|
2013-10-22 15:16:22 +02:00 |
|
|
Vincent Augagneur
|
fea7cd5983
|
//helper list must be wrapped by a form even if it's a simple header
|
2013-10-22 14:48:44 +02:00 |
|
|
Damien Metzger
|
b4499937d8
|
// Comparison is optionnal
|
2013-10-22 14:15:10 +02:00 |
|
|
Damien Metzger
|
a4eeff4cd7
|
// Shortcuts for chart selection
|
2013-10-22 14:07:19 +02:00 |
|
|
Jerome Nadaud
|
a7c7bc68a3
|
// Fix products form content
|
2013-10-22 13:38:47 +02:00 |
|
|
Jerome Nadaud
|
c307eb7ece
|
// Date range picker fix
|
2013-10-22 12:29:17 +02:00 |
|
|
Jerome Nadaud
|
a8db1f3030
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-22 12:13:37 +02:00 |
|
|
Jerome Nadaud
|
b6d6336e26
|
// Add date subtitle
|
2013-10-22 12:12:41 +02:00 |
|
|
Damien Metzger
|
857c66454b
|
// Typo
|
2013-10-22 11:47:47 +02:00 |
|