Vincent Augagneur
adede4f7ea
//small fix
2013-08-01 16:11:50 +02:00
Vincent Augagneur
c0db0bfca9
//Added currency sign and weigh unit on carrier wizard
2013-08-01 16:03:14 +02:00
Kevin Granger
5defc39def
[+] BO Images / Marketing / Spe. Prices Rules
2013-08-01 14:42:43 +02:00
Vincent Augagneur
dfb1924884
//carrier wizard fix when edit a carrier
2013-08-01 11:47:39 +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
jeromenadaud
50bdfb9a1a
[-] BO FixBug Action button in list content
2013-07-31 18:44:20 +02:00
jeromenadaud
017e5ccbc8
[+] BO Pagination, filter and display
2013-07-31 18:37:01 +02:00
Sarah Lorenzini
ca253bcda2
// update preferences tab
2013-07-31 17:43:48 +02:00
Vincent Augagneur
e1fa26d002
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-31 17:33:19 +02:00
Vincent Augagneur
32f23a79a4
//carrier wizard added validation fields
2013-07-31 17:33:09 +02:00
Vincent Augagneur
60ecfaafd2
//fixed bug on carrier wizard tabindex
2013-07-31 17:16:52 +02:00
gRoussac
5e0b5db23b
[*] BO : refact for modules exeptions regarding https://github.com/PrestaShop/PrestaShop/pull/614
2013-07-31 15:16:42 +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
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
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
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
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
6600112ab1
[-] BO : Fix onchange event on Adminmodules list execption
2013-07-30 20:28:06 +02:00
gRoussac
edb8cce49f
//norms
2013-07-30 19:57:23 +02:00
gRoussac
d6856a5c62
//norms
2013-07-30 19:18:29 +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
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
Kevin Granger
062a4250cc
//fixed unclosed div
2013-07-30 15:26:00 +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
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
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
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
Gregory Roussac
53c195e9d9
Merge pull request #610 from indesign47/patch-8
...
[*] BO : shipping enlarge listbox carriers
2013-07-29 09:38:59 -07: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
indesign47
b8dc750547
[*] BO : shipping enlarge listbox carriers
...
enlarge listbox carriers to see all the name of the carrier
2013-07-29 18:25:05 +02:00
indesign47
d76059ff23
[*] BO : skip the first line by default
...
All sample csv file use a first line of information
2013-07-29 17:19:46 +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