dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Augagneur a913a43b17 //mailalerts now use bootstrap design 2013-09-24 14:49:56 +02:00
Jerome Nadaud 00ddfeba05 // CMS select size in form 2013-09-24 13:09:22 +02:00
Jerome Nadaud c9eb5b5be6 // Products multistore design 2013-09-24 12:29:12 +02:00
Jerome Nadaud 6e2337df44 // Add id attribute to tree header button 2013-09-24 12:27:51 +02:00
Damien Metzger 8f08f67812 [+] BO : Added fees configuration for the dashboard 2013-09-24 12:22:40 +02:00
gRoussac 1d6593612f [-] FO : Fix #PSCFV-10480 again css fix 2013-09-24 12:21:10 +02:00
Gregory Roussac 4c399875d9 Merge pull request #737 from codeurWeb/patch-3 
[-] BO : fix postProcess override on AdminImportController
 2013-09-24 01:54:18 -07:00
Gregory Roussac 92b987c0f8 Merge pull request #736 from codeurWeb/patch-2 
[-] BO : fix ovverride of constructor when PS_ADVANCED_STOCK_MANAGEMENT is off
 2013-09-24 01:40:16 -07:00
Rémi Gaillard 41af17e06b [-] BO: Fix data validation when iframe is allowed on some entities like CMS 2013-09-24 10:28:04 +02:00
Julien 6acebca8fa [-] BO : fix postProcess override on AdminImportController 
When we override the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
Default case of switch is never used.
 2013-09-23 21:04:55 +02:00
Julien 6850db0612 [-] BO : fix contructor override on AdminImportController 
When we overload the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
 2013-09-23 20:23:45 +02:00
Jerome Nadaud 18a621e022 // Multistore invisible description in options 2013-09-23 19:02:22 +02:00
Gregory Roussac aefab21a62 Merge pull request #735 from djfm/release 
[*] LO : Use single quote as thousands separator for CHF currency
 2013-09-23 09:54:01 -07:00
djfm d9a24d61ac // change comment 2013-09-23 16:37:13 +00:00
djfm 6195d0c319 [*] LO : Use single quote as thousands separator for CHF currency 2013-09-23 16:32:40 +00:00
gRoussac b3a425c73a [-] MO : Blockcart, wrong tbody 2013-09-23 18:20:35 +02:00
Jerome Nadaud f04126c436 // Customers groups - Add special tree handle for categories tree 2013-09-23 18:16:47 +02:00
gRoussac ccb3179c1a [-] CORE : Partial fix for #PSCFV-10482 getCacheId is different in back office 2013-09-23 18:07:46 +02:00
Jerome Nadaud c78c8b04bd // Multistore checkbox js functions 2013-09-23 18:05:16 +02:00
Jerome Nadaud 69f97baa6a // Search conf list size 2013-09-23 18:04:48 +02:00
Jerome Nadaud 202c6fe463 // Carrier list size 2013-09-23 18:04:18 +02:00
Jerome Nadaud 320e1512df // Multistore checkbox design 2013-09-23 18:03:32 +02:00
Gregory Roussac b4547568a5 Merge pull request #734 from djfm/release 
// no quotes around 1 in js=1 please
 2013-09-23 08:38:57 -07:00
gRoussac d37f545058 [-] MO : Fix buig #PSCFV-10480 Blockcart too long cart_block_product_name 2013-09-23 17:26:36 +02:00
djfm 5c4de83e91 // no quotes around 1 in js=1 please 2013-09-23 15:20:26 +00:00
Damien Metzger 6796b64e18 Merge pull request #691 from djfm/development 
// fixed translation of modules descriptions containing quotes
 2013-09-23 07:51:57 -07:00
gRoussac 3b075e049b // bad commit 2013-09-23 16:33:44 +02:00
gRoussac 84dc75f57e [-] CORE : Fix bug #PSCFV-10471 Cart item count problem, unique_id grouping error for id_product and id_product_attribute 2013-09-23 16:32:38 +02:00
gRoussac 92382e347c [-] FO : Fix bug #PSCFV-10478 could not see auto added cart rule voucher on product page 2013-09-23 16:08:44 +02:00
Vincent Augagneur 0b35c5506c //crossselling module now use boostrap design 2013-09-23 15:22:42 +02:00
gRoussac dedc59f1db [-] IN : FIX #PSCFV-10246 errors in stricts sql-mode, thanks @enumag 2013-09-23 15:17:15 +02:00
Vincent Augagneur a2d770e04f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-23 15:10:49 +02:00
Vincent Augagneur 642ff59bef //cheque module now use boostrap design 2013-09-23 15:10:46 +02:00
Damien Metzger 590e738254 // Fixed typo 2013-09-23 14:40:25 +02:00
Vincent Augagneur e8420f24d1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-23 14:19:12 +02:00
Jerome Nadaud e128e17f4e // Geoloc bootstrap design 2013-09-23 14:04:15 +02:00
Jerome Nadaud 748d6271a9 // Stores controller bootstrap 2013-09-23 13:56:30 +02:00
Jerome Nadaud 234b6de1b0 // Stores controller bootstrap design 2013-09-23 13:31:45 +02:00
Jerome Nadaud 4bb0a5f794 // Preferences images bootstrap design 2013-09-23 11:43:31 +02:00
Rémi Gaillard c6222c51c8 // commit 6b47f5713e is missing 2013-09-23 11:36:15 +02:00
Fabio Chelly a1555c3fc8 Merge remote-tracking branch 'origin/development' into development 2013-09-23 11:24:26 +02:00
Fabio Chelly 31697fde3c [-] MO productcomments: confirmation message takes moderation mode into account 2013-09-23 11:24:14 +02:00
Jerome Nadaud 5206496f64 [-] BO : Fix Bug For new Fancy Box events 2013-09-23 11:22:51 +02:00
Jerome Nadaud cf82157d47 // oops 2013-09-23 10:48:56 +02:00
Jerome Nadaud 7dbb6088a4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-23 10:42:30 +02:00
Rémi Gaillard 50bbf1a547 // small fix 2013-09-23 10:46:41 +02:00
Jerome Nadaud 32a7a28567 [-] MO : FixBug #PNM-1683 - Treeview problem 2013-09-23 10:42:10 +02:00
Vincent Augagneur 12f67a825b //carriercompare now use bootstrap design 2013-09-23 10:24:26 +02:00
Rémi Gaillard a578cfb2e2 [-] FO: Fix #PSCFV-10461 2013-09-23 10:20:22 +02:00
Jerome Nadaud f4e0f63ef7 // Add lingerie to activities list 2013-09-23 10:14:23 +02:00