dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,372 Commits 9 Branches 19 Tags
8d39f3250650ca08e189572c404da7c19267e81a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac d2ff50ddb7 [*] CORE : Fix bug #PSCFV-9811 doc on display404Error 2013-07-16 10:50:27 +02:00
gRoussac e48b2a411e [-] INSTALLER : Errors in upgrader 2013-07-15 22:01:41 +02:00
Gregory Roussac 272f2ec8f7 Merge pull request #573 from soware/patch-2 
[*] BO : Update AdminStockManagementController.php
 2013-07-15 09:49:17 -07:00
gRoussac 7a27b11309 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-15 17:31:17 +02:00
gRoussac f9c5bf0bf2 [-] Fix bug #PSCFV-9633 again could not see delete href in block cart 2013-07-15 17:29:08 +02:00
Gregory Roussac f6ef6f5d0e Merge pull request #572 from PrestaEdit/patch-47 
[-] Class : Media / Correct jquery_ui_dependencies fileName
 2013-07-15 07:41:07 -07:00
gRoussac 01bad90b29 // Welcome 2013 2013-07-15 16:36:54 +02:00
gRoussac ca4a73ddf4 // avoid copy paste mistake with trailing space 2013-07-15 15:34:34 +02:00
gRoussac 1a056d5e33 [-] BO : Fix bug #PSCFV-9310 bad type for input in helper thankx @Piotr Moćko 2013-07-15 14:47:38 +02:00
gRoussac f1dcf02caf //fix warnings #PSCFV-9786 2013-07-15 14:25:58 +02:00
gRoussac e30e15d76d [-] INSTALER: Fix bug #PSCFV-9762 marketing tab disapear after upgrade 2013-07-15 12:29:51 +02:00
gRoussac 6ea4a2c553 [-] FO : Fix bug #PSCFV-9662 udpate payments means after delete thanks @maofree 2013-07-15 10:08:16 +02:00
Gregory Roussac c89281166b Merge pull request #467 from PrestaEdit/patch-40 
[-] BO : Controller: AdminTranslationsController / Back translations
 2013-07-12 09:23:29 -07:00
Gregory Roussac 5083cd6b5e Merge pull request #466 from PrestaEdit/patch-39 
[*] BO: hook displayAdminForm / add param fieldset
 2013-07-12 08:56:42 -07:00
Gregory Roussac 5b6c6a3ce9 Merge pull request #561 from BigZ/patch-5 
[-] PDF : Get correct prefix for invoices
 2013-07-12 08:44:24 -07:00
Gregory Roussac 39a23e1494 Merge pull request #560 from BigZ/patch-4 
[-] PDF : Develivery slip should use prefix
 2013-07-12 08:42:16 -07:00
Gregory Roussac b25b88cf33 Merge pull request #559 from BigZ/patch-3 
[-] PDF : Invoice prefix wasn't used in filename
 2013-07-12 08:41:37 -07:00
Gregory Roussac 0453698f50 Merge pull request #557 from BigZ/patch-1 
[-] BO : Update documents listing to display proper prefix
 2013-07-12 08:37:21 -07:00
gRoussac 9c44faf295 [-] FO : Fix bug #PSCFV-9754 do not use back url on cart summary link in steps 2013-07-12 16:59:11 +02:00
Gregory Roussac 105b1422a3 Merge pull request #562 from axometeam/patch-14 
[*] BO : Do not increment stock if statut change fom Error to Canceled
 2013-07-12 07:22:50 -07:00
gRoussac 8588978e03 [*] FO : getCatImageLink doesn't work without type thanks @axometeam 2013-07-12 15:03:52 +02:00
gRoussac 24d124f190 [*] MODULE : Multi-shop compatibility in newsletter module tanks @axometeam 2013-07-12 14:17:49 +02:00
gRoussac b880bc3a18 [*] PDF : Free shipping in invoice PDF display X2 thanks @axometeam 2013-07-12 12:09:34 +02:00
gRoussac 6f9e415ca7 // missing image 2013-07-12 12:03:32 +02:00
Gregory Roussac c3b7e1dad9 Merge pull request #519 from axometeam/patch-5 
[*] BO : Correct Request Sql Manager validate options
 2013-07-12 02:08:45 -07:00
Gregory Roussac 44debd682f Merge pull request #517 from axometeam/patch-4 
[*] BO : AdminControllers Keep "active" filter on pagination
 2013-07-12 02:07:51 -07:00
Gregory Roussac 8fcca7999d Merge pull request #502 from axometeam/patch-2 
[-] BO : Prevent false error for product duplication
 2013-07-12 01:29:39 -07:00
gRoussac 5d8d7c0383 [-] MO : Followup : don't send emails for empty carts thanks @axometeam 2013-07-11 18:57:37 +02:00
gRoussac a5ee2c2f4f [-] Classes : fixed cachefs and memcache classes #PSCFV-5225 thanks @prestalab 2013-07-11 18:27:54 +02:00
Gregory Roussac 293d1afbc7 Merge pull request #484 from axome/module_followup_guests 
[-] MO : Followup : Don't send followup vouchers to guest accounts
 2013-07-11 09:13:39 -07:00
Gregory Roussac 27a72f9b2c Merge pull request #482 from axome/module_followup_cron 
[-] MO : Followup : Don't execute crontasks if the module is disabled
 2013-07-11 09:08:51 -07:00
gRoussac 105ae7e59f [*] FO : Retrieve invoice address in OPC + guest checkout, thanks @Piotr Moćko 2013-07-10 18:16:09 +02:00
gRoussac 9f2dad0c6c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-10 17:44:48 +02:00
gRoussac 8b16bd44aa [*] FO : Fix bug #PSCFV-9440 add another address in guest checkout in OPC 2013-07-10 17:43:36 +02:00
gRoussac e8b8fa0527 [-] CORE: No category in url preview on BO product page 2013-07-09 18:06:02 +02:00
gRoussac 5e0893979b [-] FO : Fix bug #PSCFV-9021 : bad category id for breadcrumb on product when url rewrite is on 2013-07-09 16:06:21 +02:00
gRoussac 4f5661572e [-] PDF : Fix columns error 2013-07-09 11:58:56 +02:00
Gregory Roussac 1a6518689c Merge pull request #415 from ccauw/patch-11 
[-] BO : Fix bug #PSCFV-8987 in BO translations when Windows OS
 2013-07-08 01:34:48 -07:00
gRoussac 19c9ae0a5c [-] FO : Fix bug #PSCFV-9653 could not return a custom product 2013-07-05 18:15:27 +02:00
gRoussac cf849077ed // small css fix on history 2013-07-05 17:43:10 +02:00
gRoussac 9f0867b700 [-] FO : could not see old_price_display when specific price on one combination 2013-07-05 14:42:39 +02:00
gRoussac 91cd196cf6 // remove console.log sorry bad commit 2013-07-05 12:29:29 +02:00
gRoussac 128ceffcc0 [-] FO : Bad specific price for a combination // sorry 2013-07-05 12:28:10 +02:00
gRoussac 268f1fd030 [-] FO : Bad specific price for a combination 2013-07-05 12:11:02 +02:00
gRoussac 8a7edf3668 [-] FO : Fix bug #PSCFV-9355 dleete button missing for custo in blockcart 2013-07-04 17:42:35 +02:00
gRoussac 58091a3b0e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-04 17:25:41 +02:00
gRoussac df7b5c9861 [-] FO : Fix bug #PSCFV-9669, update total price on order-payment 2013-07-04 17:25:00 +02:00
gRoussac c335115f68 // remove console.log 2013-07-04 16:48:56 +02:00
gRoussac c360e841b3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-04 16:48:14 +02:00
gRoussac 0bddd17889 // remove console.log 2013-07-04 16:43:17 +02:00
gRoussac fd14268da3 // remove .gitattributes 2013-07-04 15:23:39 +02:00
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