Commit Graph

19089 Commits

Author SHA1 Message Date
Kevin Granger 8bafaceb40 [+] BO Customers > Addresses // Helper > Required Fields 2013-07-30 10:35:47 +02:00
gRoussac a36ac7784d // trailing space 2013-07-30 10:35:23 +02:00
Jérôme Nadaud 7d57255b70 [-] BO : FixBug #PSCFV-9959 file_get_contents error 2013-07-30 10:27:55 +02:00
Damien Metzger 192940946d // Fixed pscleaner method 2013-07-30 09:21:41 +02:00
Kevin Granger b95478d529 [+] BO Customers Groups WIP 2013-07-29 20:39:52 +02:00
Gregory Roussac b004151695 Merge pull request #599 from PrestaShop/master
[*] CORE : Update gitignore
2013-07-29 10:19:55 -07: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
Gregory Roussac 53c195e9d9 Merge pull request #610 from indesign47/patch-8
[*] BO : shipping enlarge listbox carriers
2013-07-29 09:38:59 -07:00
Jérôme Nadaud 39a6d0a42d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-29 18:37:18 +02:00
Vincent Augagneur db98509443 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-29 18:37:01 +02:00
Jérôme Nadaud 0ecc2fb0a0 [-] BO : FixBug #PSCFV-9965 currency not active by default in Localization pack 2013-07-29 18:36:55 +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
Gregory Roussac 5f791dc839 Merge pull request #541 from indesign47/patch-4
[-] MO : products comments impossible if quantity > 0
2013-07-29 09:36:32 -07: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
Jérôme Nadaud 72dc8b943f [-] FO : FixBug #PSCFV-9961 Remove wishlists icon 2013-07-29 17:58:31 +02:00
Jérôme Nadaud aa9a6e66b8 [-] FO : FixBug #PSCFV-9951 Syntax error - Thanks to Oleacorner-Olivier B 2013-07-29 17:44:14 +02:00
Gregory Roussac d356fe684a Merge pull request #608 from indesign47/patch-7
[*] BO : skip the first line by default
2013-07-29 08:23:32 -07: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
Gregory Roussac 44b9909d4f Merge pull request #607 from indesign47/patch-6
[-] BO : doesn't match available_fields of AdminImportController
2013-07-29 08:12:26 -07:00
indesign47 65287d71c3 [-] BO : doesn't match available_fields of AdminImportController
- Correct wrong position of available_fields
- Add some of available_fields
2013-07-29 17:10:57 +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
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
gRoussac ab0189a726 [-] CORE : Fix bug #PSCFV-9572 when seizing in 0 in forms input fields for objects 2013-07-29 14:39:35 +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
Damien Metzger ad9d3af3ad // Class index for Carrier Wizard 2013-07-29 11:54:08 +02:00
Gregory Roussac 155102da4b Merge pull request #603 from xBorderie/patch-1
// Removed "502" from the notice of license.
2013-07-29 02:49:48 -07:00
Xavier 4291b23e23 Update CartRule.php
Removed "502" from the notice of license.
2013-07-29 11:41:35 +02:00
Vincent Augagneur e1b408f1f3 //added missing carrier wizard step img 2013-07-29 11:36:44 +02:00
sLorenzini 2ac6ada03d // update order tab 2013-07-29 11:01:48 +02:00
Vincent Augagneur 210d24343c [-] BO : fixed input action when set fees for all zones in carrier wizard 2013-07-29 10:47:20 +02:00
gRoussac 1c37fdbc23 // foloww up https://github.com/PrestaShop/PrestaShop/commit/2e6e5a2604be05da859154f5369ec026ee55e44d 2013-07-29 10:24:36 +02:00
Vincent Augagneur 60d67a7798 Merge pull request #600 from PrestaEdit/carrier_wizard
[-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference"
2013-07-29 01:04:17 -07:00
Jérôme Nadaud 95ca638ec9 [-] BO : FixBug #PSCFV-9895 Mal function in products suppliers accordion 2013-07-29 09:33:50 +02:00
PrestaEdit c089b1e69e [-] Carrier Wizard: Remove fatal error "Call-time pass-by-reference" 2013-07-27 15:23:48 +02:00
PrestaEdit 85553525e9 Merge pull request #2 from PrestaShop/development
// Merge PrestaShop
2013-07-27 04:39:15 -07:00
Rémi Gaillard a786606c9a // small fix on carrierwizard 2013-07-26 20:27:25 +02:00
Rémi Gaillard 77f4eec64f // Fix group association on carrierwizard 2013-07-26 19:38:06 +02:00
Rémi Gaillard 159d0b3904 // improve exception 2013-07-26 19:15:37 +02:00
Jérôme Nadaud 06834e404d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-07-26 19:00:00 +02:00
Jérôme Nadaud 52ff61719b [+] BO : Remove invoices button toolbar 2013-07-26 18:59:39 +02:00
Kevin Granger 94de4d3d2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : Order template misplaced empty form
  [+] BO : Handler invoice date generation button
2013-07-26 18:55:18 +02:00
Kevin Granger 9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00