dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,853 Commits 9 Branches 19 Tags
665c5d155d05b60c0d4f92fdc19c7552243e1150
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory Roussac 08cb7ee566 Merge pull request #1099 from djfm/blocktopmenu 
// fixed undefined variable in blocktopmenu
 2013-12-04 07:11:51 -08:00
gRoussac f6fed64472 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636 2013-12-04 12:14:51 +01:00
gRoussac e505588688 [-] IN : Merge of https://github.com/PrestaShop/PrestaShop/pull/1095 2013-12-04 11:47:14 +01:00
Gregory Roussac 9eea7203fe Merge pull request #1084 from PhpMadman/1.6-ShipMaxInput 
[*] BO : Fixes issue with not beeing able to edit weight beacuse string is longer then max length
 2013-12-03 11:43:32 -08:00
gRoussac 81481d6105 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/48 2013-12-03 19:24:31 +01:00
Gregory Roussac 22c09ac367 Merge pull request #1073 from studiokiwik/sk-ps15x-012 
[-] BO : Fix timeout handling on product images regeneration
 2013-12-03 05:51:27 -08:00
gRoussac aea8f0285e [-] FO : Fix bug #PSCFV-11190 double escaping on customization 2013-12-02 15:51:29 +01:00
gRoussac f39b621251 [-] BO : Fix bug #PSCFV-11162 AdminImport, Exception on ProductSupplier 2013-11-29 18:29:50 +01:00
gRoussac 3871ea32a4 // missing parenthesis 2013-11-29 17:48:52 +01:00
gRoussac 68ed6fac82 [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/582 2013-11-29 17:06:59 +01:00
Gregory Roussac 7fa882efca Merge pull request #1056 from Dh42/patch-18 
[*] MO : Blocktopmenu add titles to links
 2013-11-28 10:26:36 -08:00
gRoussac dbd1d17b93 // typo sorry 2013-11-28 18:39:52 +01:00
gRoussac c254fd6366 // added addons module 2013-11-28 18:33:18 +01:00
Gregory Roussac 0b653fd20a Merge pull request #1055 from Dh42/patch-17 
[-] FO : Prevents crawlers from creating carts
 2013-11-28 08:55:52 -08:00
Gregory Roussac f8fc02ac4b Merge pull request #1054 from Dh42/patch-16 
[-] FO : nofollow on TOS
 2013-11-28 08:54:22 -08:00
gRoussac d46feffcf1 [*] CORE : Throw Exception when no theme selected only in front office 2013-11-28 16:14:30 +01:00
gRoussac 336e784ca5 [*] CORE : Throw Exception when no theme selected 2013-11-28 15:32:19 +01:00
gRoussac cb9d00352f [-] BO : Adminimport reset selected csv if not exists 2013-11-28 14:19:23 +01:00
gRoussac 8e71c90b4a [*] BO : AdminImport, check choosen csv exists 2013-11-28 12:12:08 +01:00
gRoussac 88d46bd0b9 [*] BO : AdminImport, check choosen scv exists 2013-11-28 12:00:41 +01:00
gRoussac 8370c18fe8 [-] CORE : Remove notices on ob clean 2013-11-28 11:11:49 +01:00
gRoussac 82022c337a [-] FO : CCC do not withdraw \t+ and \s+ 2013-11-27 19:49:07 +01:00
gRoussac 65106c6a24 [*] MO : Merge of https://github.com/PrestaShop/PrestaShop/pull/721 2013-11-27 19:21:57 +01:00
gRoussac 5e718394e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 16:27:04 +01:00
gRoussac 068b7100c4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 again 2013-11-27 16:26:22 +01:00
gRoussac 2b210e0732 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 2013-11-27 16:20:20 +01:00
gRoussac dd99d13dc4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/766 2013-11-27 15:42:11 +01:00
gRoussac ef6dd3bfed [-] MO : display_column_left not assigned to smarty in modules initContent() + ssl on loyalty front controller 2013-11-27 12:32:01 +01:00
gRoussac 6959e71bec [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/729 2013-11-27 00:09:41 +01:00
gRoussac 10dac5a45b [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/816 2013-11-27 00:06:44 +01:00
gRoussac 5f5b9bd1de [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/718 2013-11-26 23:43:49 +01:00
gRoussac 5d511c1ac7 // remove notice in ModuleGraph.php 2013-11-26 23:39:28 +01:00
gRoussac ef466ac47c [+] CORE : Merg of https://github.com/PrestaShop/PrestaShop/pull/775 2013-11-26 23:33:24 +01:00
gRoussac 1855ffa584 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/813 2013-11-26 23:18:00 +01:00
gRoussac 8d15f5d3e6 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/814 2013-11-26 23:08:03 +01:00
gRoussac 5485433df6 [-] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/819 2013-11-26 22:57:57 +01:00
gRoussac 9ccd4504f4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/820 + https://github.com/PrestaShop/PrestaShop/commit/5e407db21e3e30a1a5fa94b9558314ffa21af407 2013-11-26 22:49:10 +01:00
gRoussac b8012952f7 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/852 2013-11-26 22:32:57 +01:00
gRoussac 4c92e8f4c5 [*] PDF : Merge of https://github.com/PrestaShop/PrestaShop/pull/873 2013-11-26 19:06:50 +01:00
gRoussac 13b5762367 [-] FO : trailing \t in minified html 2013-11-26 18:41:02 +01:00
gRoussac c5b6ec5c3c [+] FO : Missing old default templates 2013-11-26 18:09:05 +01:00
gRoussac 7f304fc768 [-] FO : Merge of https://github.com/ldecoker/PrestaShop/commit/d3bf4d233005511e08554a7c283e0b992815e01a 2013-11-26 16:26:35 +01:00
gRoussac 69c99f49c9 [-] BO : Merge of https://github.com/smilesrg/PrestaShop/commit/b7b79ff4614e5be7891f8702acdc46c8303a2fdd 2013-11-26 15:27:59 +01:00
Gregory Roussac 841f6ec65d Merge pull request #1011 from indesign47/patch-10 
[+] BO : AdminSearchConf add import alias
 2013-11-26 02:35:30 -08:00
Gregory Roussac 5153b49eae Merge pull request #1013 from indesign47/patch-12 
[-] FO : Contact-form add translation for fields
 2013-11-26 02:35:07 -08:00
Gregory Roussac 24dc07ef85 Merge pull request #1022 from indesign47/patch-18 
[-] BO : AdminImport add image manufacturers
 2013-11-26 02:34:31 -08:00
Gregory Roussac b6a41fca69 Merge pull request #1015 from indesign47/patch-14 
[-] BO : AdminImages manufacturers/suppliers/stores image
 2013-11-26 02:34:25 -08:00
gRoussac 6de541ea1d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-26 11:27:41 +01:00
gRoussac 53b91fc0b7 attribute_anchor_separator 2013-11-26 11:27:25 +01:00
gRoussac 8a7d39d800 [-] BO : Undefined on image upload, revert of https://github.com/PrestaShop/PrestaShop/commit/48b7a49b1aea34a2def355ffec1d4c08dfdbdfd6 2013-11-25 22:58:22 +01:00
gRoussac 695aaa73fb [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/696 2013-11-25 19:03:15 +01:00
gRoussac 9e7a275d8d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:39:59 +01:00
gRoussac a0373eed7a [-] MO : Dateofdelivery Fix bug #PNM-1773 when a product has an available date 2013-11-25 17:39:46 +01:00
gRoussac 620441997c [-] CORE : No Exception when CONTENT_LENGTH is no set 2013-11-25 16:05:07 +01:00
Gregory Roussac c613ca5a7d Merge pull request #1009 from indesign47/patch-6 
[+] BO : AdminProducts add import products
 2013-11-25 03:00:08 -08:00
gRoussac c5184a6e0f [-] BO : AdminImport new supplier csv 2013-11-25 11:55:14 +01:00
Gregory Roussac b0436adb46 Merge pull request #1023 from indesign47/patch-19 
[-] BO : AdminImport add image suppliers
 2013-11-25 02:45:01 -08:00
Gregory Roussac f588a2c0c3 Merge pull request #1024 from indesign47/patch-20 
[-] BO : AdminImport products add missing fields
 2013-11-25 01:54:34 -08:00
Gregory Roussac c6e1fbbae9 Merge pull request #1010 from indesign47/patch-8 
[+] BO : AdminAttributes add import combinations
 2013-11-25 01:41:12 -08:00
gRoussac dd79348748 [-] BO : getCartsRuleByCode should be retrocompatible 2013-11-22 11:40:47 +01:00
gRoussac f7d4dc979f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 11:33:00 +01:00
gRoussac ee98947e6b // manual merg of https://github.com/PrestaShop/PrestaShop/commit/0bc1d214324b01606cf08df6a38a51949fc253b7 and 2013-11-21 18:59:28 +01:00
gRoussac d6e52bdecb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-21 14:20:00 +01:00
gRoussac 3ab28374e6 [-] BO : Remove warning with open_basdir on module list 2013-11-21 14:17:55 +01:00
Gregory Roussac 6d0de6e29e Merge pull request #1003 from priyank/patch-1 
[-] FO : Homefeatured adding a position order by clause.
 2013-11-20 07:29:19 -08:00
gRoussac 914f613e7b [-] FO : Fix bug #PSCFV-11052 no carrier fess whne tax display to false 2013-11-20 15:32:33 +01:00
gRoussac 5ef392aaeb [-] FO : Fix #PSCFV-11069 remove unused file 2013-11-20 14:44:56 +01:00
gRoussac 6633efd27d [-] BO : Fix bug #PNM-1594, selected value error in helper list 2013-11-18 15:11:49 +01:00
gRoussac 8d627aa522 [-] MO : Referralprogram Prevent Exception when badly configured 2013-11-18 14:58:17 +01:00
gRoussac dbc08d779c // typo, sorry about this 2013-11-18 14:35:39 +01:00
gRoussac 22a9548f83 [-] FO : Fix bug #PSCFV-11043, bad cache id from module template 2013-11-18 14:32:34 +01:00
gRoussac 4771746959 [-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url 2013-11-18 12:26:08 +01:00
Gregory Roussac 017ef4860e Merge pull request #987 from davyrolink/fixed_toolbar_tpl 
[*] BO : multiple toolbars save button
 2013-11-18 00:54:48 -08:00
Gregory Roussac 21319ca32c Merge pull request #988 from dlage/fix_jquery_ui_autocomplete 
[-] Project : missing ui.menu in jquery_ui_dependencies.
 2013-11-17 14:44:47 -08:00
gRoussac cef406aef2 [*] FO : DNI can be not required 2013-11-17 23:35:56 +01:00
gRoussac 7e841c4448 [-] FO : Missing sup for DNI field 2013-11-17 22:36:51 +01:00
gRoussac 1cbc765a8f [-] IN : Bad flag in add_module_to_hook 2013-11-17 20:42:29 +01:00
gRoussac 7f02c8ca58 [-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality 2013-11-15 18:50:28 +01:00
gRoussac bfed3532bf [*] BO : AdminPerformances Hide warnings message when not necessary 2013-11-15 16:12:07 +01:00
gRoussac 2962141d51 [-] BO : Fix warning when no memcached servers 2013-11-15 15:39:00 +01:00
gRoussac 73bf2a7db1 [-] BO : Fix #PSCFV-11016 typo 2013-11-15 15:16:02 +01:00
gRoussac 9aa656c9d7 // typo 2013-11-15 15:10:12 +01:00
gRoussac 1140b5e8b5 [*] FO : Fix #PSCFV-8715 add product.attributes in carrier tpl 2013-11-15 15:06:30 +01:00
gRoussac 6a690b255b [-] BO : Model return html error messagae instead of json while image uploading 2013-11-15 12:20:10 +01:00
gRoussac 152960639f [-] BO : Product final price can not be hidden on loading tab, report of https://github.com/PrestaShop/PrestaShop/commit/6c6c3b240ee2249b7f99be1a112905cd0edbee46 2013-11-15 11:36:07 +01:00
Gregory Roussac 448a4c9994 Merge pull request #980 from djfm/development 
// no line breaks in $this->l()
 2013-11-15 02:23:39 -08:00
gRoussac 7526fe4766 // missing trailing semi-column 2013-11-15 11:16:48 +01:00
gRoussac 97be96ede8 [-] MO : Missinag closing href 2013-11-15 10:54:50 +01:00
gRoussac 0b47ef1b3b [-] BO : test on xml string follow up https://github.com/PrestaShop/PrestaShop/pull/690#issuecomment-28542506 2013-11-15 10:51:46 +01:00
gRoussac 47d58ff930 [*] FO : set at least a class to body 2013-11-14 19:03:12 +01:00
gRoussac d06bf10bbb [-] FO : Fix bug #PSCFV-10911, doubles in cart rules highlight 2013-11-14 16:35:11 +01:00
gRoussac d0d234f555 // typo, sorry about this 2013-11-14 15:58:42 +01:00
gRoussac 19d975a0b4 // typo 2013-11-14 14:48:14 +01:00
gRoussac 6393746f04 [-] BO : 406 when mod_security follow up https://github.com/PrestaShop/PrestaShop/commit/034e6a7e7f391e3a8861248db45a4a376b19633c 2013-11-14 11:43:05 +01:00
gRoussac db99f188a2 [-] BO : AdminImport, execption when creating groups 2013-11-13 18:23:41 +01:00
Gregory Roussac fe8e349931 Merge pull request #975 from ldecoker/patch-10 
[-] FO : _PS_THEME_MOBILE_OVERRIDE_DIR_ not defined
 2013-11-13 09:14:49 -08:00
gRoussac 947f9bb21c // small isset in productcomments 2013-11-13 16:39:33 +01:00
gRoussac 5a8c335d78 [-] FO : Bad value for back when controller name is sent 2013-11-13 12:30:39 +01:00
gRoussac 4479db88a0 [-) PDF : nowrap on several product prices 2013-11-13 11:52:10 +01:00
Gregory Roussac 66a9ee03fc Merge pull request #971 from studiokiwik/sk-ps15x-008 
[-] FO : fix contact-form id_order input when customer is not logged
 2013-11-13 01:42:00 -08:00