dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Augagneur 53ec2aab7e //remove unused configuration 2013-07-10 17:33:02 +02:00
Vincent Augagneur cab425e819 //remove useless css 2013-07-02 08:41:51 +02:00
Vincent Augagneur 0ff23eee9f //miss to delete some files 2013-07-02 08:02:05 +02:00
Vincent Augagneur 0c2aa996a2 //oups 😋 2013-07-01 16:48:25 +02:00
Vincent Augagneur 24db6b13c5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-01 16:40:39 +02:00
Vincent Augagneur a519f4a7cb //small fix 2013-07-01 16:40:08 +02:00
Vincent Augagneur 1657db9743 [-] MO : fixed bug #PSCFV-5724 - 1.5.2.0 cms block error when adding more than one column to the categories block in the footer 2013-07-01 11:02:32 +02:00
Vincent Augagneur 38c4ea2775 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-01 10:11:31 +02:00
Vincent Augagneur d6dcf7058f [-] BO : fixed bug #PSCFV-9622 2013-07-01 10:11:13 +02:00
Vincent Augagneur 97370946d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-28 11:06:13 +02:00
Vincent Augagneur dfc7456980 //replace some escape:'html' by addslashes in .tpl with javascript 2013-06-28 11:06:08 +02:00
Vincent Augagneur 32d3dd3e0f [-] MO : fixed bug #PSCFV-8654 - 1.5.4.0 My Favorites doesn't add product 2013-06-28 10:13:09 +02:00
Vincent Augagneur 374de1b6c8 Merge pull request #515 from axometeam/patch-3 
[-] BO : remove robots.txt rules preventing Google shopping indexing
 2013-06-27 06:52:11 -07:00
Vincent Augagneur 1f5c1927c6 Merge pull request #521 from misthero/patch-1 
Update AdminCustomerThreadsController.php
 2013-06-27 06:01:40 -07:00
Vincent Augagneur 453bb826ef [-] BO : fixed bug #PSCFV-9586 - Unable to sort CMS page in back office 2013-06-27 10:19:22 +02:00
Vincent Augagneur 56e75d0e9a [-] CORE : fixed bug #PSCFV-8745 Contact form e-mail template with incomplete information 2013-06-26 18:01:26 +02:00
Vincent Augagneur 8c5c7e1bb4 [-] MO : fixed bug #PSCFV-9040 - Block CMS Multishop bug 2013-06-26 17:31:04 +02:00
Vincent Augagneur 3d2e46b14f [-] FO : fixed bug #PSCFV-9388 - newsletter is required error, showing two times 2013-06-26 11:46:02 +02:00
Vincent Augagneur c5e65e1360 [-] BO - fixed bug #PSCFV-9435 - AdminController - processUpdateOptions does not manage required field correctly in a non-mutltishop context 2013-06-26 11:38:08 +02:00
Vincent Augagneur 4627768092 [-] BO : fixed bug #PSCFV-7921 - Language selector (with flags) cant be translated 2013-06-25 15:51:24 +02:00
Vincent Augagneur 502472dfba [-] FO : fixed bug #PSCFV-7454 2013-06-25 15:47:46 +02:00
Vincent Augagneur cc4c8bfbe7 [-] CORE : fixed bug #PSCFV-9460 2013-06-25 15:25:08 +02:00
Vincent Augagneur b7c5201ad8 Merge pull request #512 from antoniofr/development 
[-] FO : #PSCFV-9532 remove hardcoded unidentified group number
 2013-06-25 06:06:05 -07:00
Vincent Augagneur c8a67fbc40 [+] CORE : new jquery UI version (1.10.3) 2013-06-25 11:16:04 +02:00
Vincent Augagneur fe4b5eff1a [-] BO : fixed bug #PSCFV-7634 - Add non-existent new product to order using autocomplete gives javascript error (data.products is not defined) 2013-06-25 10:37:17 +02:00
Vincent Augagneur faa975750d [-] MO : fixed bug #PSCFV-8910 - Productcomments module allows post only one comment per product 2013-06-25 10:26:13 +02:00
Vincent Augagneur 41cc67961d [-] CORE : fixed #PSCFV-7451 - error in classes Carrier 2013-06-24 14:40:10 +02:00
Vincent Augagneur 6955594290 [-] FO : fixed bug #PSCFV-9007 - Best sales query has ambigious column when sorted on date_add 2013-06-24 11:43:20 +02:00
Vincent Augagneur 8702e26c41 // added missing img in installer 2013-06-24 11:04:31 +02:00
Vincent Augagneur 148cb6c123 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 15:01:27 +02:00
Vincent Augagneur 6778b17b23 [-] BO - fixed bug #PSCFV-9347 - Saving the E-Mail preferences loses the smtp server password 2013-06-14 15:01:22 +02:00
Vincent Augagneur 2ae0e4f844 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-14 11:17:18 +02:00
Vincent Augagneur ff63e0a28c [-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel 2013-06-14 11:17:07 +02:00
Vincent Augagneur 4a1de9bf31 Merge pull request #495 from SebSept/development 
[-] BO : fix require path to config.inc.php
 2013-06-13 09:07:26 -07:00
Vincent Augagneur 518998ded2 //added bootstrap in BO 2013-06-13 16:35:14 +02:00
Vincent Augagneur 433e9338d9 //fix notice 2013-06-10 12:16:23 +02:00
Vincent Augagneur 5ec9aa56ac //small fix 2013-06-10 12:15:11 +02:00
Vincent Augagneur 12872fea65 [-] BO - fixed bug #PSCFV-9071 - PS_SHOP_DOMAIN and PS_SHOP_DOMAIN_SSL have not updated after updated Shop domain and SSL domain from Preferences > SEO & URLs 2013-06-10 10:47:57 +02:00
Vincent Augagneur a73326bfb2 [-] FO - fixed bug #PSCFV-9075 2013-06-10 10:22:44 +02:00
Vincent Augagneur 0334f593da [-] FO : fixed bug #PSCFV-9092 - conflict on the company field during account creation 2013-06-10 10:10:56 +02:00
Vincent Augagneur 3d614ca8ea [-] CORE : fixed bug #PSCFV-9121 - virtual product does not have link after upgrade - part 2 2013-06-07 16:41:33 +02:00
Vincent Augagneur 35d9d9d979 [-] CORE : fixed bug #PSCFV-9121 - virtual product does not have link after upgrade 2013-06-07 16:40:37 +02:00
Vincent Augagneur 23afba3c59 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-04 16:14:45 +02:00
Vincent Augagneur 5ec36dac88 [-] MO - fixed bug #PSCFV-9111 - Mailalert emails do not follow the new {color} 2013-06-04 16:14:34 +02:00
Vincent Augagneur 682d10143e [-] BO fixed bug #PSCFV-9130 - Ordering Categories by Name does not work correctly 2013-06-04 14:50:20 +02:00
Vincent Augagneur 67ae393b79 Merge pull request #436 from prestarocket/development 
[-] FO : first_item class don t exist if shopping cart have only one ite...
 2013-06-03 02:53:37 -07:00
Vincent Augagneur 53426b6430 Merge pull request #465 from PhpMadman/patch-4 
[-] FO : In stock is now removed when Stock managment is disabled
 2013-06-03 02:04:10 -07:00
Vincent Augagneur e0c4e4c0f4 Merge pull request #470 from emily-d/patch-2 
[ - ] TR :  wrong translation, Ireland is the english name, it should be...
 2013-06-03 01:33:28 -07:00
Vincent Augagneur 5812b5be71 Merge pull request #450 from djfm/development 
// small changes in russian installer translation
 2013-05-30 02:17:45 -07:00
Vincent Augagneur edf02fe90b Merge pull request #454 from MyBB-Services/dev/gb/ajaxcartjs 
[*] MO : blockcart - simpler selectors
 2013-05-30 02:15:07 -07:00
Vincent Augagneur 32863ed476 Merge pull request #461 from cinscaen/development 
[-] MO: Fix "sendtoafriend" and "blocknewsletter" module
 2013-05-30 00:57:56 -07:00
Vincent Augagneur 980b45f372 //small addons module install fix 2013-05-29 17:46:27 +02:00
Vincent Augagneur 288e88b183 Merge pull request #393 from PrestaEdit/patch-33 
[-] MO: feeder / RSS Valid
 2013-05-23 06:25:19 -07:00
Vincent Augagneur 9baeada7a3 Merge pull request #393 from PrestaEdit/patch-33 
[-] MO: feeder / RSS Valid
 2013-05-23 06:25:19 -07:00
Vincent Augagneur 56831b9f33 Merge pull request #422 from e-gaulue/AuthController_patch 
[*] FO : AuthController can now have its own template
 2013-05-23 05:45:05 -07:00
Vincent Augagneur 444f59c9aa Merge pull request #422 from e-gaulue/AuthController_patch 
[*] FO : AuthController can now have its own template
 2013-05-23 05:45:05 -07:00
Vincent Augagneur a5f8263c9d Merge pull request #424 from AntonLejon/patch-3 
[*] MO: blockcart animation optimization
 2013-05-23 05:33:36 -07:00
Vincent Augagneur c9c458a64c Merge pull request #424 from AntonLejon/patch-3 
[*] MO: blockcart animation optimization
 2013-05-23 05:33:36 -07:00
Vincent Augagneur bbb24c3d1b Merge pull request #428 from AntonLejon/patch-1 
[-] MO: blockcart ajax cart product insert missing html class
 2013-05-23 05:27:30 -07:00
Vincent Augagneur 3c73ec5deb Merge pull request #428 from AntonLejon/patch-1 
[-] MO: blockcart ajax cart product insert missing html class
 2013-05-23 05:27:30 -07:00
Vincent Augagneur dd363be433 Merge pull request #444 from PrestaEdit/patch-38 
[*] Class: Module / Use method instead of SQL query
 2013-05-23 05:21:11 -07:00
Vincent Augagneur f234d847fb Merge pull request #444 from PrestaEdit/patch-38 
[*] Class: Module / Use method instead of SQL query
 2013-05-23 05:21:11 -07:00
Vincent Augagneur 70b061343b Merge pull request #225 from emily-d/development 
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
 2013-05-21 02:27:30 -07:00
Vincent Augagneur 6d6b2ef7d3 Merge pull request #225 from emily-d/development 
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
 2013-05-21 02:27:30 -07:00
Vincent Augagneur 69c045d8fd Merge pull request #429 from PrestaEdit/patch-34 
[-] BO: Ajax Confirmation / padding-left
 2013-05-21 01:25:54 -07:00
Vincent Augagneur 5c9abe1194 Merge pull request #429 from PrestaEdit/patch-34 
[-] BO: Ajax Confirmation / padding-left
 2013-05-21 01:25:54 -07:00
Vincent Augagneur d106d3a136 Merge pull request #438 from PrestaEdit/patch-36 
[-] Class: Tools / link_rewrite(displayParameterAsDeprecated)
 2013-05-20 06:23:20 -07:00
Vincent Augagneur e157a8f0d4 Merge pull request #438 from PrestaEdit/patch-36 
[-] Class: Tools / link_rewrite(displayParameterAsDeprecated)
 2013-05-20 06:23:20 -07:00
Vincent Augagneur 3368ff1d69 Merge pull request #437 from PrestaEdit/patch-35 
[-] Class: Tools / displayDate (displayParameterAsDeprecated)
 2013-05-20 06:22:59 -07:00
Vincent Augagneur 3bd489df15 Merge pull request #437 from PrestaEdit/patch-35 
[-] Class: Tools / displayDate (displayParameterAsDeprecated)
 2013-05-20 06:22:59 -07:00
Vincent Augagneur 7da7fd94fd Merge pull request #439 from Prestaworks/patch-11 
Update _shipping.tpl
 2013-05-20 02:34:46 -07:00
Vincent Augagneur bf2cb18c1f Merge pull request #439 from Prestaworks/patch-11 
Update _shipping.tpl
 2013-05-20 02:34:46 -07:00
Vincent Augagneur 3a9f82a7f0 Merge pull request #440 from MrManchot/patch-8 
Add Wysiwyg in Category Controller
 2013-05-20 02:28:57 -07:00
Vincent Augagneur 8e64dd9141 Merge pull request #440 from MrManchot/patch-8 
Add Wysiwyg in Category Controller
 2013-05-20 02:28:57 -07:00
Vincent Augagneur 12c43acd5b Merge pull request #443 from PrestaEdit/patch-37 
[-] Translations: .. instead of .
 2013-05-20 02:25:55 -07:00
Vincent Augagneur 025550b4ce Merge pull request #443 from PrestaEdit/patch-37 
[-] Translations: .. instead of .
 2013-05-20 02:25:55 -07:00
vAugagneur 77b8e106f7 [-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog 2013-05-02 11:41:49 +02:00
vAugagneur 0ba4d91c43 [-] MO : fixed hug #PSCFV-8994 - clear cache when truncate catalog 2013-05-02 11:41:49 +02:00
vAugagneur 716b79b8c6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-29 16:21:51 +02:00
vAugagneur 7b1c50b97f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-29 16:21:51 +02:00
vAugagneur acccaf5fbc Merged Pull Request #242 - thanks @andskiba 2013-04-29 16:21:33 +02:00
vAugagneur f58c8e7a93 Merged Pull Request #242 - thanks @andskiba 2013-04-29 16:21:33 +02:00
Vincent Augagneur d0f6f2b6c7 Merge pull request #389 from ccauw/patch-5 
[*] BO : Add block "override_form_extra"
 2013-04-29 03:11:40 -07:00
Vincent Augagneur e036d47d13 Merge pull request #389 from ccauw/patch-5 
[*] BO : Add block "override_form_extra"
 2013-04-29 03:11:40 -07:00
Vincent Augagneur 795d7aa952 Merge pull request #259 from ldecoker/patch-3 
[*] [MO] blocksupplier - missing uninstall method
 2013-04-29 01:38:17 -07:00
Vincent Augagneur 626009d157 Merge pull request #259 from ldecoker/patch-3 
[*] [MO] blocksupplier - missing uninstall method
 2013-04-29 01:38:17 -07:00
Vincent Augagneur ad3ba5342d Merge pull request #291 from minicstudio/development 
[*] MO : blocksearch - override buttons for ajax cart
 2013-04-29 01:35:38 -07:00
Vincent Augagneur bb59365004 Merge pull request #291 from minicstudio/development 
[*] MO : blocksearch - override buttons for ajax cart
 2013-04-29 01:35:38 -07:00
Vincent Augagneur ad17dbc700 Merge pull request #310 from Patanock/patch-5 
[*] BO: Customer and carrier need to be send to the hook
 2013-04-29 01:31:16 -07:00
Vincent Augagneur 218a76c443 Merge pull request #310 from Patanock/patch-5 
[*] BO: Customer and carrier need to be send to the hook
 2013-04-29 01:31:16 -07:00
Vincent Augagneur 83bc226508 Merge pull request #411 from MyBB-Services/dev/gb/mailcolor 
[*] Mails : delete a hard-coded pink background
 2013-04-29 01:28:19 -07:00
Vincent Augagneur e4323f18f4 Merge pull request #411 from MyBB-Services/dev/gb/mailcolor 
[*] Mails : delete a hard-coded pink background
 2013-04-29 01:28:19 -07:00
Vincent Augagneur 5438a131b4 Merge pull request #330 from DrySs/patch-5 
[-] FO: CMS link to conditions should not be in SSL
 2013-04-29 01:22:21 -07:00
Vincent Augagneur fe05e1cc39 Merge pull request #330 from DrySs/patch-5 
[-] FO: CMS link to conditions should not be in SSL
 2013-04-29 01:22:21 -07:00
vAugagneur 0c71bda9e6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-26 12:19:25 +02:00
vAugagneur 0f08250e92 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-26 12:19:25 +02:00
vAugagneur 231614290a [-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values 2013-04-26 12:19:20 +02:00
vAugagneur 21aa134774 [-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values 2013-04-26 12:19:20 +02:00
vAugagneur fc14c79521 [-] MO : fixed bug #PSCFV-7703 - Images for bank wire, cheque and cash payment missing on Order Summary 2013-04-26 10:30:17 +02:00
vAugagneur 9983b1723f [-] MO : fixed bug #PSCFV-7703 - Images for bank wire, cheque and cash payment missing on Order Summary 2013-04-26 10:30:17 +02:00