Damien Metzger
b27d030fd2
// Added units to package dimensions
2013-08-01 15:52:07 +02:00
jeromenadaud
550aa01faf
[-] BO : FixBug #PSCFV-9859 Carriers free shipping inline edit
2013-08-01 15:14:14 +02:00
Kevin Granger
5defc39def
[+] BO Images / Marketing / Spe. Prices Rules
2013-08-01 14:42:43 +02:00
jeromenadaud
409bc533cd
[-] BO : FixBug #PSCFV-9748 Missing confirmation and update button problem
2013-08-01 14:21:48 +02:00
Vincent Augagneur
0898a63060
//fixed bug when carrier is free
2013-08-01 14:12:32 +02:00
Vincent Augagneur
afd41af8c5
//carrier wizard fix logo duplication when edit carrier
2013-08-01 12:20:55 +02:00
Vincent Augagneur
5f9d83dd37
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-01 12:10:06 +02:00
Vincent Augagneur
59fca8eb85
//carrier wizard fix when range as no fees
2013-08-01 12:09:58 +02:00
gRoussac
3e75881bdc
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-01 11:48:50 +02:00
gRoussac
184a1c561c
[-] FO : Fix bug #PSCFV-9847 Cart Rule not updated when address is updated on Checkout Page
2013-08-01 11:44:00 +02:00
Vincent Augagneur
c432c44987
//carrier wizard fix
2013-08-01 11:42:58 +02:00
Damien Metzger
af9397a11b
[-] BO : fixed domain warning
2013-08-01 10:50:21 +02:00
Kevin Granger
e4878ba393
// I'm not sure as I've never had a look at how that works before ;)
2013-07-31 21:17:03 +02:00
Vincent Augagneur
d3b000e72f
//fixed bug on carrier wizard when is_free
2013-07-31 18:09:00 +02:00
Sarah Lorenzini
ca253bcda2
// update preferences tab
2013-07-31 17:43:48 +02:00
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
175427cb2e
//fixed input text not disabled when change range behavior
2013-07-31 14:31:23 +02:00
Vincent Augagneur
be7e4b4128
//carrier wizard Shipping and handling are set to no by default
2013-07-31 11:00:31 +02:00
gRoussac
024800d4f9
// w3c multiple
2013-07-30 20:04:45 +02:00
gRoussac
5677826b2f
// wrong commit
2013-07-30 19:21:02 +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
Vincent Augagneur
fcc1867a94
//merge
2013-07-30 18:02:30 +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
jeromenadaud
6ddf2ee1ab
[-] BO : FixBug allow_url_fopen on BackOffice home page
2013-07-30 15:19:54 +02: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
Sarah Lorenzini
816153687c
// update localization tab
2013-07-30 12:25:20 +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
Kevin Granger
8bafaceb40
[+] BO Customers > Addresses // Helper > Required Fields
2013-07-30 10:35:47 +02:00
Kevin Granger
b95478d529
[+] BO Customers Groups WIP
2013-07-29 20:39:52 +02:00
Kevin Granger
d95a519ace
[+] BO Customers WIP
2013-07-29 19:18:02 +02:00
gRoussac
918ceb3ed5
// norms
2013-07-29 19:15:47 +02:00
Gregory Roussac
a23a576d47
Merge pull request #611 from 202-ecommerce/fix_translation
...
[-] BO : Fix while of translation, to find in folder if translation exists
2013-07-29 10:07:50 -07:00
Guillaume DELOINCE
8ddd592da1
[-] BO : Fix while of translation, to find in folder if translation exists
2013-07-29 19:00:57 +02:00
Vincent Augagneur
0e6f1598f7
[-] BO : fixed some bug on carrier wizard - added tabindex on input - new default carrier img
2013-07-29 18:36:50 +02:00
Kevin Granger
613c9b66e5
// fix carriers
2013-07-29 16:51:03 +02:00
Kevin Granger
483dbd7b53
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
# By Sarah Lorenzini (1) and sLorenzini (1)
# Via Sarah Lorenzini
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop :
// update shipping tab
// update shipping tab
Conflicts:
admin-dev/themes/default/template/helpers/options/options.tpl
2013-07-29 16:21:31 +02:00
Kevin Granger
ae225dce4c
// WIP customer
2013-07-29 16:16:10 +02:00
sLorenzini
243834ee17
// update shipping tab
2013-07-29 14:14:00 +02:00
PrestaEdit
c1b0d32d32
[-] Carrier Wizard: fix
2013-07-29 13:57:31 +02:00
Captain-FLAM
0de4642d09
[*] BO : Proposition : IMPROVEMENT Admin Modules Positions
...
You can see in action over there :
http://www.youtube.com/watch?v=e7KXuCU3RIM
2013-07-29 12:35:02 +01:00
PrestaEdit
c089b1e69e
[-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference"
2013-07-27 15:23:48 +02:00
Rémi Gaillard
a786606c9a
// small fix on carrierwizard
2013-07-26 20:27:25 +02:00