Commit Graph

1983 Commits

Author SHA1 Message Date
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
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 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
Sarah Lorenzini b528b7b6fc // update shipping tab 2013-07-29 16:13:07 +02:00
Sarah Lorenzini 101d9283ae // update wizard 2013-07-29 15:12:50 +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
sLorenzini 2ac6ada03d // update order tab 2013-07-29 11:01:48 +02:00
Jérôme Nadaud 0ef7578f26 [-] BO : Order template misplaced empty form 2013-07-26 18:43:40 +02:00
Rémi Gaillard c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
sLorenzini c1e4b812f9 // update "create order" tab 2013-07-26 16:33:52 +02:00
Kevin Granger 1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
Jérôme Nadaud 3287ff5300 [+] BO : Product attachment "For" 2013-07-26 15:32:04 +02:00
Jérôme Nadaud 7db1fb89ec [+] BO : Products customization "For" 2013-07-26 15:09:14 +02:00
Jérôme Nadaud 5c52ba31e9 [+] BO : Products quantities "For" and small template fix 2013-07-26 15:03:29 +02:00
sLorenzini 3c035324f4 // update order tab 2013-07-26 12:15:23 +02:00
Kevin Granger 8b7c29dd18 [+] BO Scenes - Tags - Attachments 2013-07-26 11:12:50 +02:00
Kevin Granger 9e5bbac559 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : BugFix Cancel modification button error
  [+] BO : Product "For" and combination button
  // update order tab
  [+] BO : Product "For"
  [+] BO : Product "For" and new carriers select list

Conflicts:
	admin-dev/themes/default/css/admin-theme.css
2013-07-25 19:21:59 +02:00
Kevin Granger 9308c5c527 no message 2013-07-25 19:18:54 +02:00
Jérôme Nadaud 07000c1f66 [-] BO : BugFix Cancel modification button error 2013-07-25 18:15:41 +02:00
Jérôme Nadaud ce5355415b [+] BO : Product "For" and combination button 2013-07-25 17:53:09 +02:00
sLorenzini 832f5cf0dd // update order tab 2013-07-25 16:53:18 +02:00
Jérôme Nadaud 76c87044de [+] BO : Product "For" 2013-07-25 16:44:52 +02:00
Jérôme Nadaud cc1fddd52d [+] BO : Product "For" and new carriers select list 2013-07-25 16:24:43 +02:00
Kevin Granger 488cf0919a // BO attributes 2013-07-25 15:51:41 +02:00
Jérôme Nadaud f8ff755067 [+] BO : Product "For" 2013-07-25 14:50:10 +02:00
Jérôme Nadaud 3f83dd9222 [+] BO : Product "For" 2013-07-25 14:33:14 +02:00
Jérôme Nadaud d6b38635f9 [+] BO : Product "For" 2013-07-25 14:02:36 +02:00
Kevin Granger b5ae321ea5 // fix input + switch 2013-07-25 11:55:27 +02:00
sLorenzini 312ad4eb37 // update order tab 2013-07-25 09:41:31 +02:00
Kevin Granger edc2113330 // fix merge 2013-07-24 17:02:23 +02:00