dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,926 Commits 9 Branches 19 Tags
e448ac8de5d59fdb697dfe071fdf4eabb53b6aaa
Commit Graph
20926 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory Roussac 47b7e6aab5 Merge pull request #392 from ldecoker/patch-4 
[-] [BO] : The div for colorAttributeProperties is not closed
 2013-08-02 09:15:51 -07:00
gRoussac 33116dfa47 [-] FO : Fix bug #PSCFV-9856 could not add Uncombinable cart rules and Minimum amount check badly calculated 2013-08-02 18:00:10 +02:00
Sarah Lorenzini 94a43f2991 // update advanced parameters and administration tabs 2013-08-02 17:44:26 +02:00
Vincent Augagneur be93a00277 //new place for validate and add new range && global range validation part 1 on carrier wizard 2013-08-02 17:29:15 +02:00
Sarah Lorenzini 60f567d2ff // update modules tab 2013-08-02 15:20:12 +02:00
Sarah Lorenzini 142006e69a // update advanced parameters 2013-08-02 15:10:58 +02:00
Vincent Augagneur f55a8c2dd5 //remove debug 2013-08-02 11:38:38 +02:00
Vincent Augagneur 02fdc5fe24 //fixed float validation on carrier wizard 2013-08-02 11:25:08 +02:00
Vincent Augagneur f2146ac2ae //fixed somes bug on carriers wizard 2013-08-02 10:54:07 +02:00
Vincent Augagneur 46d0663b2f //remove debug 2013-08-02 10:29:30 +02:00
Vincent Augagneur 9e720da3d6 //carrier wizard free shipping fix & added currency sign on new range 2013-08-02 10:22:06 +02:00
Damien Metzger fc63b8ad7f // Improved configuration checklist 2013-08-02 09:11:55 +02:00
Kevin Granger 32b50b4dad // small fix on carriers wizard ( remove original css, and change js add/remove class .error to .errorStep) 2013-08-01 20:25:36 +02:00
Francois Gaillard 268b3c6bda // Variables name fixed 2013-08-01 19:14:04 +02:00
Francois Gaillard b51d4f4c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 19:11:27 +02:00
Francois Gaillard 28de7890d2 [*] MO : Templates overrides works with the new structure (/views/templates/admin|front|hook) 2013-08-01 19:10:25 +02:00
jeromenadaud d8f5caee7b [-] BO : FixBug #PSCFV-7824 No total tax not show in order email confirmation 2013-08-01 19:09:34 +02:00
Vincent Augagneur ac48c1b786 //remove inline css 2013-08-01 18:26:39 +02:00
jeromenadaud 3f2da1095f [-] BO: FixBug #PSCFV-10005 Filter on COUNT field 2013-08-01 18:06:14 +02:00
jeromenadaud b34acf74f2 [-] BO : FixBug Undefined variable title 2013-08-01 17:33:53 +02:00
Francois Gaillard 07ce127723 [-] Classes : Bug fix Validate.php - Error with $mail_name 2013-08-01 17:31:45 +02:00
Sarah Lorenzini e2abf3ecb7 // update preferences tab -> images controller 2013-08-01 17:26:53 +02:00
jeromenadaud 24bf5e5bdf [-] BO : FixBug Undefined variable currency 2013-08-01 17:26:07 +02:00
Francois Gaillard 7e7b5af26e // Profiler fixed 2013-08-01 17:21:38 +02:00
Vincent Augagneur 1447be6f3c //fixed bug when changing range type 2013-08-01 17:16:52 +02:00
Vincent Augagneur fa958c9a5e //carrier wizard currency sign bug 2013-08-01 17:13:08 +02:00
jeromenadaud 174dfa9a6b [+] BO : Filter button default css class style 2013-08-01 17:13:02 +02:00
jeromenadaud a29fa2dd09 [+] BO Better filters display 2013-08-01 16:59:08 +02:00
Sarah Lorenzini 047ab9d681 // update images controller 2013-08-01 16:45:46 +02:00
Sarah Lorenzini 50a54240b9 // update images controller 2013-08-01 16:43:58 +02:00
Sarah Lorenzini 680497f1e3 // update preferences tab 2013-08-01 16:40:48 +02:00
gRoussac 6a073143f2 [-] BO : Fix bug #PSCFV-9990 bad count on list header helper 2013-08-01 16:15:41 +02:00
gRoussac ccc2312053 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 16:12:19 +02:00
gRoussac 1028c8671c [-] CORE : Merge from PrestaEdit last pull request again 2013-08-01 16:12:05 +02:00
Vincent Augagneur adede4f7ea //small fix 2013-08-01 16:11:50 +02:00
Vincent Augagneur 9c86943e2a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 16:03:19 +02:00
Vincent Augagneur c0db0bfca9 //Added currency sign and weigh unit on carrier wizard 2013-08-01 16:03:14 +02:00
Damien Metzger b27d030fd2 // Added units to package dimensions 2013-08-01 15:52:07 +02:00
Vincent Augagneur 79a4a84163 //small fix on carrier wizard oups 2013-08-01 15:41:42 +02:00
Vincent Augagneur f5454748b2 //small fix on carrier wizard 2013-08-01 15:41:01 +02:00
Vincent Augagneur 9df90cc575 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 15:23:30 +02:00
Vincent Augagneur c9b1546a2e //disabled all fess when carrier is free 2013-08-01 15:23:26 +02:00
jeromenadaud 550aa01faf [-] BO : FixBug #PSCFV-9859 Carriers free shipping inline edit 2013-08-01 15:14:14 +02:00
jeromenadaud 48067e1a3d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 15:12:37 +02:00
gRoussac 7fb483eaa2 // harmonisation within Tools:: instead self:: 2013-08-01 15:07:38 +02:00
gRoussac c9bb88cac7 // harmonisation within Tools:: instead self:: 2013-08-01 14:52:29 +02:00
Gregory Roussac 99ebde1e8e Merge pull request #622 from PrestaEdit/patch-48 
[*] CORE : toCamelCase should use utf8 Tools functions
 2013-08-01 05:48:49 -07:00
PrestaEdit 37cd2a3ab3 [*] Class: Tools / toCamelCase 
Change the name of the var to a correct name.

Use the Tools method like strtolower, ucfirst and strtoupper.
 2013-08-01 14:42:51 +02:00
Kevin Granger 5defc39def [+] BO Images / Marketing / Spe. Prices Rules 2013-08-01 14:42:43 +02:00
gRoussac fd7facc9b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 14:28:41 +02:00