 Jerome Nadaud
|
cdab5ed6c9
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
|
2013-10-18 18:47:42 +02:00 |
|
|
Jerome Nadaud
|
7e176b157b
|
// Fix save and preview button
|
2013-10-18 18:44:13 +02:00 |
|
|
Gregory Roussac
|
c36625a136
|
Merge pull request #851 from PrestanceDesign/patch-1
[*] BO : Adding a title tag to display the module name on hover like PS ...
|
2013-10-18 09:42:57 -07:00 |
|
|
Kevin Granger
|
04b4e548f3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-18 18:38:17 +02:00 |
|
|
Kevin Granger
|
5f52a9e171
|
// fix products
|
2013-10-18 18:38:02 +02:00 |
|
|
gRoussac
|
5daa79c1e1
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-10-18 18:36:51 +02:00 |
|
|
gRoussac
|
8ef1e043af
|
[*] BO : chmod 664 to config.xml file
|
2013-10-18 18:36:30 +02:00 |
|
|
Damien Metzger
|
d1a2c33322
|
Merge pull request #849 from djfm/bootstrap
// Translations fix
|
2013-10-18 09:35:20 -07:00 |
|
|
Jerome Nadaud
|
6c37efdb6a
|
// Categories image upload bootstraping
|
2013-10-18 18:33:32 +02:00 |
|
|
Jerome Nadaud
|
ff81667b5c
|
// Image thumnail fix
|
2013-10-18 18:28:57 +02:00 |
|
|
Jerome Nadaud
|
667353d43f
|
// Store contacts bootstraping
|
2013-10-18 18:24:21 +02:00 |
|
|
PrestanceDesign
|
6965bb29c1
|
[*] BO : Adding a title tag to display the module name on hover like PS 1.4
|
2013-10-18 18:20:15 +02:00 |
|
|
Jerome Nadaud
|
1c1fb5fb5c
|
// Update image fix
|
2013-10-18 17:59:45 +02:00 |
|
|
Jerome Nadaud
|
ed2546d07c
|
// Define language dir constant
|
2013-10-18 17:59:34 +02:00 |
|
|
Jerome Nadaud
|
1bee0087c0
|
// Update image fix
|
2013-10-18 17:50:36 +02:00 |
|
|
Fabio Chelly
|
72ccc90cc9
|
Merge remote-tracking branch 'origin/development' into development
|
2013-10-18 17:49:14 +02:00 |
|
|
Fabio Chelly
|
7133e74c17
|
[-] MO mailalerts: module mailalerts shows all messages regarding the order
PNM-1632 - MailAlert does not show Paypal error message if order has comments
|
2013-10-18 17:49:00 +02:00 |
|
|
Jerome Nadaud
|
964f546b0b
|
// Update image when updated
|
2013-10-18 17:41:36 +02:00 |
|
|
Jerome Nadaud
|
0599d4f056
|
// Fix Localization page header title
|
2013-10-18 17:41:10 +02:00 |
|
|
Jerome Nadaud
|
785fe814bc
|
// Define Order state dir constante
|
2013-10-18 17:40:49 +02:00 |
|
|
Jerome Nadaud
|
ac112c38df
|
// File imput improvement
|
2013-10-18 17:32:29 +02:00 |
|
|
Damien Metzger
|
9dfecbb1b8
|
// Fixed addons url
|
2013-10-18 17:05:04 +02:00 |
|
|
djfm
|
5a3d487e9f
|
// sprintf again
|
2013-10-18 14:31:48 +00:00 |
|
|
djfm
|
d097679ea0
|
// improvements to producttooltip texts
|
2013-10-18 14:16:17 +00:00 |
|
|
djfm
|
b5b18b9d2b
|
// use sprintf
|
2013-10-18 13:55:30 +00:00 |
|
|
Rémi Gaillard
|
23abf712ec
|
// missing files
|
2013-10-18 15:53:05 +02:00 |
|
|
Rémi Gaillard
|
d61d2b6627
|
// rm 1.4 controllers - RIP
|
2013-10-18 15:50:12 +02:00 |
|
|
gRoussac
|
2e2151a1bb
|
[-] CORE : error_get_last > PHP 5.1
|
2013-10-18 15:29:12 +02:00 |
|
|
djfm
|
06b80701c0
|
// labels
|
2013-10-18 13:04:49 +00:00 |
|
|
djfm
|
f31eb37f37
|
// improved translations in carriercompare
|
2013-10-18 12:53:16 +00:00 |
|
|
djfm
|
3e687cd533
|
// improved some messages
|
2013-10-18 12:17:23 +00:00 |
|
|
Rémi Gaillard
|
8a682081de
|
// typo
|
2013-10-18 12:17:51 +02:00 |
|
|
Damien Metzger
|
316f10a352
|
// Changed calibration of the dashboard chart
|
2013-10-18 12:15:37 +02:00 |
|
|
Damien Metzger
|
1cd9ceca35
|
// Compare data on the chart
|
2013-10-18 12:10:06 +02:00 |
|
|
Damien Metzger
|
d6235bdacc
|
// Cannot use analytics real time at this time since it is in private beta
|
2013-10-18 10:54:03 +02:00 |
|
|
Rémi Gaillard
|
6747d3bbac
|
[-] BO: Default country should be overriden in the context in multishop
|
2013-10-18 10:23:06 +02:00 |
|
|
djfm
|
901f5aeb08
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-18 08:20:32 +00:00 |
|
|
djfm
|
37656c2df9
|
// fixed improper English string for translation
|
2013-10-18 08:20:20 +00:00 |
|
|
Kevin Granger
|
e17c5f7c91
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 18:43:31 +02:00 |
|
|
Kevin Granger
|
9c07cb9302
|
// fix informations
|
2013-10-17 18:43:15 +02:00 |
|
|
Rémi Gaillard
|
b8273a13e6
|
//
|
2013-10-17 18:30:22 +02:00 |
|
|
Jerome Nadaud
|
fa22cff995
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 18:27:14 +02:00 |
|
|
Jerome Nadaud
|
088d23f8f9
|
// Add edit button to customer groups view list
|
2013-10-17 18:27:00 +02:00 |
|
|
Kevin Granger
|
d933466d04
|
// fixs add product informations
|
2013-10-17 18:11:47 +02:00 |
|
|
Kevin Granger
|
7189aa9de9
|
// fix yes/no, alert success, cache clear button
|
2013-10-17 17:33:55 +02:00 |
|
|
Damien Metzger
|
5a6fef2ee8
|
// Fixed typo
|
2013-10-17 17:13:30 +02:00 |
|
|
Jerome Nadaud
|
f77fa3d7c6
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 16:00:10 +02:00 |
|
|
Jerome Nadaud
|
08525e5af4
|
// Fix missing commits !!!!
|
2013-10-17 15:59:46 +02:00 |
|
|
Kevin Granger
|
c43a7093ac
|
// fix calendar
|
2013-10-17 15:57:23 +02:00 |
|
|
Jerome Nadaud
|
205e00d4a7
|
// small fix
|
2013-10-17 15:43:52 +02:00 |
|