Sarah Lorenzini
|
9debffe910
|
// update shipping tab
|
2013-07-31 15:06:59 +02:00 |
|
Sarah Lorenzini
|
d744b9dbf2
|
// update localization and modules tabs
|
2013-07-31 14:47:21 +02:00 |
|
Vincent Augagneur
|
69944e1618
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-31 14:31:27 +02:00 |
|
Vincent Augagneur
|
175427cb2e
|
//fixed input text not disabled when change range behavior
|
2013-07-31 14:31:23 +02:00 |
|
Gregory Roussac
|
304e479ca5
|
Merge pull request #617 from axometeam/patch-16
[*] BO : Fix statistics redirection when change date
|
2013-07-31 05:17:13 -07:00 |
|
Axome
|
1187e7cb09
|
[*] BO : Fix statistics redirection when change date
When going into a special stats module (for exemple "statsproduct") if you change the date, Prestashop redirect to the "home" of statistics.
|
2013-07-31 14:15:33 +02:00 |
|
Gregory Roussac
|
b0ac617e9f
|
Merge pull request #615 from nilsga/development
[-] BO : Fixed fieldset issue when customer is a guest
|
2013-07-31 05:15:13 -07:00 |
|
Gregory Roussac
|
6f27508972
|
Merge pull request #616 from sebastienhouzet/development
[*] CORE : htaccess in override folder
|
2013-07-31 05:11:41 -07:00 |
|
Yoozio
|
fd339d96b2
|
[*] Security : deny access to this folder as already done for classes
|
2013-07-31 12:29:05 +02:00 |
|
Nils-Helge Garli Hegvik
|
b362c808dc
|
Fixed fieldset issue when customer is a guest
|
2013-07-31 12:25:35 +02:00 |
|
Vincent Augagneur
|
e3265dcb1b
|
//carrier wizard range validation 404 when change range type
|
2013-07-31 11:12:01 +02:00 |
|
Vincent Augagneur
|
be7e4b4128
|
//carrier wizard Shipping and handling are set to no by default
|
2013-07-31 11:00:31 +02:00 |
|
Vincent Augagneur
|
80c2e3ea60
|
//small fix on carrier wizard
|
2013-07-31 10:34:52 +02:00 |
|
jeromenadaud
|
d68363fdda
|
[-] FO : FixBug #PSCFV-9846 Bookmark title escape problem on special language
|
2013-07-31 10:24:14 +02:00 |
|
jeromenadaud
|
e1b7470845
|
[-] BO : FixBug Install currency on Localization Pack
|
2013-07-31 09:38:10 +02:00 |
|
jeromenadaud
|
0e3f2d6a82
|
[-] BO : FixBug Invalid offset when only one error in layout
|
2013-07-31 09:18:13 +02:00 |
|
gRoussac
|
f28a480bf9
|
// remove console.log
|
2013-07-30 20:36:38 +02:00 |
|
gRoussac
|
f606cb4efb
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-30 20:28:12 +02:00 |
|
gRoussac
|
6600112ab1
|
[-] BO : Fix onchange event on Adminmodules list execption
|
2013-07-30 20:28:06 +02:00 |
|
gRoussac
|
9ae8667783
|
[-] BO : Fix onchange event on adminmoudlue list execption
|
2013-07-30 20:26:45 +02:00 |
|
gRoussac
|
024800d4f9
|
// w3c multiple
|
2013-07-30 20:04:45 +02:00 |
|
gRoussac
|
edb8cce49f
|
//norms
|
2013-07-30 19:57:23 +02:00 |
|
gRoussac
|
5677826b2f
|
// wrong commit
|
2013-07-30 19:21:02 +02:00 |
|
gRoussac
|
0821194f94
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-30 19:19:32 +02:00 |
|
gRoussac
|
d6856a5c62
|
//norms
|
2013-07-30 19:18:29 +02:00 |
|
Damien Metzger
|
e0f1041070
|
// Performance improvements for the cart page
|
2013-07-30 19:16:05 +02:00 |
|
gRoussac
|
d68d844303
|
// norms
|
2013-07-30 19:02:05 +02:00 |
|
Gregory Roussac
|
800c63036e
|
Merge pull request #605 from Captain-FLAM/patch-10
[*] BO : Proposition : IMPROVEMENT Admin Modules Positions
|
2013-07-30 09:48:11 -07:00 |
|
Kevin Granger
|
a1cc4d14d0
|
[+] BO Customers > Customers / Customers > Groups
|
2013-07-30 18:47:13 +02:00 |
|
Captain-FLAM
|
be613fa008
|
fixup! [*] BO : Proposition : IMPROVEMENT Admin Modules Positions
|
2013-07-30 17:42:50 +01:00 |
|
jeromenadaud
|
24a70479d3
|
[-] BO : FixBug Module list template
|
2013-07-30 18:06:35 +02:00 |
|
Vincent Augagneur
|
d50b8c679f
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-07-30 18:02:46 +02:00 |
|
Vincent Augagneur
|
fcc1867a94
|
//merge
|
2013-07-30 18:02:30 +02:00 |
|
jeromenadaud
|
9bf6871e8d
|
[-] FO : FixBug #PSCFV-9766 All products in products list for email confirmation with multi-shipping
|
2013-07-30 17:50:36 +02:00 |
|
Vincent Augagneur
|
cf694be5a1
|
//fixs carrier wizard
|
2013-07-30 17:46:44 +02:00 |
|
Sarah Lorenzini
|
635076a7ad
|
// update localization tab
|
2013-07-30 17:45:50 +02:00 |
|
jeromenadaud
|
a93667a58b
|
[-] FO : FixBug Wrong offset in more than one shipping address
|
2013-07-30 17:03:15 +02:00 |
|
Kevin Granger
|
062a4250cc
|
//fixed unclosed div
|
2013-07-30 15:26:00 +02:00 |
|
jeromenadaud
|
6ddf2ee1ab
|
[-] BO : FixBug allow_url_fopen on BackOffice home page
|
2013-07-30 15:19:54 +02:00 |
|
Damien Metzger
|
d9ce51f38c
|
Merge pull request #613 from djfm/nl_installer
[*] LO : Added Dutch Installer
|
2013-07-30 06:14:40 -07:00 |
|
Damien Metzger
|
f59bd2f55f
|
Merge pull request #612 from djfm/development
// Reviewed CarrierWizard strings, and corrected a few glitches with smarty translation functions and quotes
|
2013-07-30 06:13:10 -07:00 |
|
djfm
|
28c0ef2b7d
|
// added a few translations to NL installer
|
2013-07-30 13:07:14 +00:00 |
|
Sarah Lorenzini
|
faafe4167a
|
// update localization tab
|
2013-07-30 14:56:39 +02:00 |
|
Sarah Lorenzini
|
816153687c
|
// update localization tab
|
2013-07-30 12:25:20 +02:00 |
|
djfm
|
cba79bdcd6
|
// corrected quote problems in the translation files
|
2013-07-30 09:47:02 +00:00 |
|
Vincent Augagneur
|
3d40814739
|
//added name in errors array in validateRules
|
2013-07-30 11:33:30 +02:00 |
|
djfm
|
9ba17d642a
|
// CarrierWizard: English Strings reviewed and corrected
|
2013-07-30 09:30:41 +00:00 |
|
Vincent Augagneur
|
5929727be1
|
Merge pull request #601 from PrestaEdit/carrier_wizard2
[-] Carrier Wizard: fix
|
2013-07-30 02:22:45 -07:00 |
|
Vincent Augagneur
|
3814a8c735
|
[-] BO : fixed bug #PSCFV-9809 - carrier wizard tab access fix
|
2013-07-30 10:40:13 +02:00 |
|
gRoussac
|
4185026880
|
[-] CORE : Fix warning #PSCFV-9678 when sending message to customer
|
2013-07-30 10:37:07 +02:00 |
|