dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,253 Commits 9 Branches 19 Tags
d2440df8ca6b00a68695a130c201e49a8d8a0e4d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 36e3956267 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-03 15:06:05 +02:00
gRoussac ae0299a6eb [-] FO :Fix bug #PSCFV-9650 could not see delete href in block cart 2013-07-03 15:04:11 +02:00
gRoussac 84c88dab65 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-02 14:55:28 +02:00
gRoussac 75942074d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-02 14:53:18 +02:00
gRoussac 9dfe65cb17 [-] BO : Fix bug #PSCFV-8666 COD module association no more deleted when restrition on other currency 2013-07-02 14:51:25 +02:00
gRoussac 312dabbc60 //parse error 2013-07-02 00:30:50 +02:00
gRoussac 6e3a2449e8 [-] INSTALLER : Fix SQL warnings when upgrading 2013-07-01 23:39:00 +02:00
gRoussac f17b865214 (-] INSTALLER Remove errors during upgrade 2013-07-01 19:23:42 +02:00
gRoussac 508cc0bd1a [-) CORE : Remove undefined constant in class declaration 2013-07-01 19:17:54 +02:00
gRoussac 41219ad258 [-] INSTALLLER : Remove seesion name based on base_uri 2013-07-01 19:01:49 +02:00
gRoussac 0e0d8c58d0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-01 15:42:10 +02:00
gRoussac 725c2221df [-] INSTALLER : fix bug when updating add_new_tab not defined 2013-07-01 15:41:15 +02:00
gRoussac f824b537cf [-] BO : Fix bug #PSCFV-8619 update order weight when modifying products 2013-07-01 11:32:09 +02:00
gRoussac c90e574cb8 // Remove additionnal files from gitignore 2013-07-01 11:28:00 +02:00
gRoussac 1eb992f542 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-30 19:46:31 +02:00
gRoussac 127b046c0e //remove warning 2013-06-30 19:46:04 +02:00
gRoussac 349a10e2a9 // fix warnings 2013-06-28 17:58:04 +02:00
gRoussac a7885fef1c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-27 10:57:25 +02:00
gRoussac 13b7bc959e [*] BO : Fix #PSCFV-8504 carrier on invoice and delivery slip 2013-06-27 10:56:50 +02:00
gRoussac 7f1b44f451 [-] INSTALLER : Remove warnings 2013-06-26 18:27:02 +02:00
gRoussac 2b94a338b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-26 18:12:09 +02:00
gRoussac 9e9a1761f5 [-] INTSALLER : Fix bug #PSCFV-8776 Mysql has gone away during upgrade 2013-06-26 18:08:05 +02:00
gRoussac 64f615a061 [-] BO : Fix warnings when product not available in Shop 2013-06-25 18:16:06 +02:00
gRoussac 699053da27 [-] FO : Fix bug #PSCFV-8412 no zipcode for countries when default country has no zip code in adress format 2013-06-25 16:17:58 +02:00
gRoussac 2b2d6762f2 [-] FO : Css fix on first address and avaibility 2013-06-25 14:47:27 +02:00
gRoussac 4dbaf98cc8 [-] FO : Fix one_phone_at_leastphone again when PS_REGISTRATION_PROCESS_TYPE = 1 && PS_ORDER_PROCESS_TYPE =0 2013-06-25 10:44:41 +02:00
gRoussac fd3ce0ba6c [-] CORE: Fix bug #PSCFV-9474 missing unity and unit_price_ratio in Cart::getProducts 2013-06-24 17:23:09 +02:00
gRoussac b421d469d2 [-] Fix bug #PSCFV-8109 country creation/activation regarding payment modules restrictions 2013-06-24 16:45:10 +02:00
gRoussac 383acfb8bf [*] PDF : Small column width fix 2013-06-24 16:12:28 +02:00
gRoussac 5dd707589a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-24 15:53:30 +02:00
gRoussac 4f1e246c71 // remove deprecated 2013-06-24 15:52:56 +02:00
gRoussac eec1d53324 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-24 14:50:28 +02:00
gRoussac 50c88dc4de [-] BO : Fix bug #PSCFV-7353 can not see the thumb for a scene 2013-06-24 14:50:10 +02:00
gRoussac 304225060a [-] BO : Fix bug #PSCFV-7353 can not see the thumb for a scenes 2013-06-24 14:47:59 +02:00
gRoussac 5562b5ac92 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-24 13:54:33 +02:00
gRoussac 21856959a2 [-] Fix bug #PSCFV-9414 bad check on states when PS_REGISTRATION_PROCESS_TYPE = 0 2013-06-24 13:54:02 +02:00
gRoussac 7448d17c68 [*] CORE: can not delete class_index.php 2013-06-23 19:53:28 +02:00
gRoussac 0974a9fde9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-21 10:40:17 +02:00
gRoussac 2e8c89e543 [-] FO : Fix #PSCFV-9414 submitGuestAccount is not submitAccount 2013-06-21 10:39:58 +02:00
gRoussac 21d04cb423 [-] BO : Fix bug #PSCFV-9264 bad cancel qty when refund / return 2013-06-20 18:21:55 +02:00
gRoussac 5563c53133 [-] BO : missing colspan after update product detail 2013-06-20 16:39:15 +02:00
gRoussac 67e7487e3b [*] BO : Reselect current step in AdminOrders 2013-06-20 12:09:19 +02:00
gRoussac 7244ec1389 [-] FO : Fix bug #PSCFV-9525 escape double quote in address formated fields 2013-06-20 10:44:24 +02:00
gRoussac 55414552d4 [-] FO : Fix #PSCFV-7388 again Instant checkout - State validation 2013-06-19 14:45:01 +02:00
gRoussac 4c4340c9d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-18 11:32:56 +02:00
gRoussac 6519d3682a [-] CORE : Report of https://github.com/PrestaShop/PrestaShop/pull/504 Thanks @aseques 2013-06-18 11:31:29 +02:00
gRoussac aea53e034a [*] BO : Enable current subtab active class 2013-06-17 18:27:07 +02:00
Gregory Roussac 3a5a9dea14 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-15 01:57:46 +02:00
Gregory Roussac ce9f262feb [-] BO : Upload image name with trailing slash in name 2013-06-15 01:55:02 +02:00
gRoussac 39320ad866 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 10:22:51 +02:00
gRoussac 9260a43d7d [-] INSTALLER : Shown index can return empty array 2013-06-14 10:20:48 +02:00
gRoussac beab13e966 // revert from Merge pull request #458 from runningz https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418 2013-06-06 11:24:21 +02:00
gRoussac e5e93a6100 [-] FO : Report of #PSCFI-7240 typos in cms.tpl 2013-06-06 10:39:03 +02:00
gRoussac 3b23558ebb [-] MO : Report of #PNM-1413 when alert already set on default combination 2013-06-06 10:25:41 +02:00
gRoussac 81e8d76d31 // revert 2013-06-06 10:15:40 +02:00
gRoussac 896658633e [*] MO : Followup https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418 2013-06-06 10:07:48 +02:00
gRoussac 22352d1443 [-] BO : Fix bug #PNM-788 Loyalty points in adminCustomers when only one order 2013-06-04 10:58:41 +02:00
gRoussac ff2c3725d3 [-] Bo : Fix #PSCFV-9306 report of #PSCFI-7115 Add a new specific price = faulty validation 2013-05-31 18:10:41 +02:00
gRoussac f84e8331de Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-31 17:39:55 +02:00
gRoussac 5a1440efe4 [-] Fix bug #PSCFI-5839 delete attached file from curstomer thread deletion 2013-05-31 17:39:34 +02:00
gRoussac 760a415e89 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-29 17:25:57 +02:00
gRoussac 72bf6dc56d // bad commit 2013-05-29 17:25:41 +02:00
Gregory Roussac cd17b78522 Merge pull request #458 from runningz/patch-1 
[-] MO : Remove link "Notify me when available" when in stock
 2013-05-29 02:16:50 -07:00
gRoussac cbaae172cd [-] BO : Report of #PSCFI-6790 REQUEST_URI badly recorded 2013-05-28 10:29:51 +02:00
gRoussac ea5405a917 [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ec8deb289185daa03cd11d239797bbe5bdbaecd0 2013-05-27 19:06:59 +02:00
gRoussac 9845966a88 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-27 19:02:40 +02:00
gRoussac a04e6b1a67 [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 18:13:13 +02:00
gRoussac 4eabc11573 [-] PDF : Fix dejavusans font for en lang 2013-05-27 18:13:13 +02:00
gRoussac 94f7b2fa3c // norms 2013-05-27 18:13:13 +02:00
gRoussac f591249248 // report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ee604d6b13115d11b17f8806aef0543500bc6e51 2013-05-27 18:13:13 +02:00
gRoussac f8359173be [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/a6e8a2eda7fe3bab5245df9b98df7b2f6f7d541f 2013-05-27 18:13:13 +02:00
gRoussac 5743696596 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country 2013-05-27 18:13:12 +02:00
gRoussac f0dbe3b86c [-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link 2013-05-27 11:23:33 +02:00
gRoussac ccf2baec3a [-] PDF : Fix dejavusans font for en lang 2013-05-27 10:52:57 +02:00
gRoussac d040e5e1ae // norms 2013-05-27 10:35:19 +02:00
gRoussac a412cbb62e // report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ee604d6b13115d11b17f8806aef0543500bc6e51 2013-05-27 10:21:23 +02:00
gRoussac 5c6db0510f [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/a6e8a2eda7fe3bab5245df9b98df7b2f6f7d541f 2013-05-27 10:12:41 +02:00
gRoussac b05ffb6a89 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 17:22:20 +02:00
gRoussac 95e46afc99 [-] FO : Fix bug #PSCFV-9171, can not order with a unactivated country 2013-05-24 17:21:56 +02:00
gRoussac a28a8598ba Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 16:14:37 +02:00
gRoussac b6937b243c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 16:14:37 +02:00
gRoussac 4b64afd4ee [-] BO : Fix bug #PSCFI-6755 "+" in email 2013-05-23 16:14:31 +02:00
gRoussac 9e2c5bfcb9 [-] BO : Fix bug #PSCFI-6755 "+" in email 2013-05-23 16:14:31 +02:00
gRoussac 2b5d600452 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 14:49:20 +02:00
gRoussac b2bb233dc9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-23 14:49:20 +02:00
gRoussac 66fbbf4825 [-] INSTALLER : Prevent crash when populating data, MACOSX OS creates hidden files 2013-05-23 14:49:07 +02:00
gRoussac dd2d7491b4 [-] INSTALLER : Prevent crash when populating data, MACOSX OS creates hidden files 2013-05-23 14:49:07 +02:00
gRoussac f0abc2298c [-] INSTALLER : Fix bug #PSCFV-8813 1.4.7.0.sql not uptodate 2013-05-22 12:29:20 +02:00
gRoussac 2590465a7c [-] INSTALLER : Fix bug #PSCFV-8813 1.4.7.0.sql not uptodate 2013-05-22 12:29:20 +02:00
gRoussac d1904e7c56 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-22 12:16:54 +02:00
gRoussac 7f65d01692 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-22 12:16:54 +02:00
gRoussac 7713e86efc [-] INSTALLER : Fix bug #PSCFV-8813 missing file PHP:setAllGroupsOnHomeCategory(); 2013-05-22 12:16:27 +02:00
gRoussac 62cbee150b [-] INSTALLER : Fix bug #PSCFV-8813 missing file PHP:setAllGroupsOnHomeCategory(); 2013-05-22 12:16:27 +02:00
gRoussac 9196ec042e // 1.4.9.1 does not exists 2013-05-22 09:41:00 +02:00
gRoussac 41184dac33 // 1.4.9.1 does not exists 2013-05-22 09:41:00 +02:00
gRoussac 3879897f38 // reduondant call to p1540_add_missing_columns 2013-05-21 17:36:25 +02:00
gRoussac 949333c1c4 // reduondant call to p1540_add_missing_columns 2013-05-21 17:36:25 +02:00
gRoussac a4c150d2fb [-] INSTALLER : Create reinsurance_lang when updating from below 1.5.0.13 2013-05-21 17:20:13 +02:00
gRoussac 65123157fc [-] INSTALLER : Create reinsurance_lang when updating from below 1.5.0.13 2013-05-21 17:20:13 +02:00
gRoussac d6c1a2f038 [-] INSTALLER : SQL error during upgrade from 1.5.0.13 2013-05-21 17:05:12 +02:00