dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,625 Commits 9 Branches 19 Tags
0d6bc850deba4fa96754a0e68d5d30cbc4e33352
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
gRoussac c69688cc11 [-] BO : Fix bug #PSCFV-10990 bad version comparison for ps_versions_compliancy 2013-11-13 10:14:21 +01:00
gRoussac 6ddf220aee [-] Fo : Call Gmaps on https if required 2013-11-12 21:16:09 +01:00
gRoussac 9328a3c473 // forgot to commit https://github.com/PrestaShop/PrestaShop/commit/036e2362c97ca00e9066076af1c45fc8f9946d56 2013-11-12 19:17:54 +01:00
gRoussac c8dfe1c174 [-] FO : Wordwrap on prices in history 2013-11-12 19:17:12 +01:00
Gregory Roussac 6d7e2055ce Merge pull request #968 from ccauw/patch-12 
[*] BO : add class on TD in standard List
 2013-11-12 09:38:03 -08:00
gRoussac 4d327a537f [*] FO : addTextFieldToProduct without Line feed, follow up https://github.com/PrestaShop/PrestaShop/pull/962#issuecomment-28294571 2013-11-12 18:28:42 +01:00
gRoussac 5e4382eb08 [-] BO : Fix bug #PSCFV-10982 reduction group truncated 2013-11-12 17:55:07 +01:00
gRoussac 036e2362c9 [+] CORE : Fixed cache_id 2013-11-12 17:09:38 +01:00
gRoussac f0f3679cbd [*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956 2013-11-12 15:56:04 +01:00
gRoussac 40abef8aac Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-12 12:32:37 +01:00
gRoussac f0f630fb50 [-] FO : #PSCFV-10978 firstname displayed instead of lastname in invoice address 2013-11-12 12:32:21 +01:00
gRoussac 3f42a381a4 [*] FO : Redirect to address.tpl when !Address::isCountryActiveById 2013-11-12 12:12:19 +01:00
Gregory Roussac 0e1898be09 Merge pull request #963 from djfm/sprintf 
// do not use sprintf in installer when it is useless
 2013-11-12 01:45:39 -08:00
gRoussac c1969028f2 [-] FO : Customized meesage with carriage return follow up #962 2013-11-12 10:41:19 +01:00
Gregory Roussac cd83ec93c7 Merge pull request #961 from joseantgv/patch-4 
[-] MO : Whishlist, innerhtml in html jquery
 2013-11-12 00:42:04 -08:00
gRoussac e2d8a33a81 [*] FO : Cache on getDiscountsCustomer, follow up https://github.com/PrestaShop/PrestaShop/pull/960 2013-11-11 14:02:11 +01:00
gRoussac a7869a1f06 [*] CORE : Remove duplicate SQL queries 2013-11-11 13:41:23 +01:00
gRoussac de404706d9 [*] CORE : Profiling hide non doubles 2013-11-11 02:09:50 +01:00
gRoussac 3f9338e13d [*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop 2013-11-11 01:59:10 +01:00
gRoussac 38da826671 [-] FO : getTaxCalculator bad cache key again // sorry about that 2013-11-11 01:37:20 +01:00
gRoussac fee461fdf1 [*] FO : Set cache for StockAvailable::getQuantityAvailableByProduct 2013-11-11 01:00:55 +01:00
gRoussac 8dd951c2df [*] MO : Remove calls to isRegisteredInHook in crossselling and productscategory 2013-11-11 00:36:17 +01:00
gRoussac 7e93b2cffd [-] FO : getTaxCalculator bad cache key 2013-11-11 00:13:35 +01:00
gRoussac 19da345531 [-] BO : Could not check all modules after ajax call 2013-11-10 21:51:14 +01:00
gRoussac 7eb70486e0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-08 15:54:28 +01:00
gRoussac ebc3dfee62 [-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index 2013-11-08 15:54:13 +01:00
Gregory Roussac ee487fde59 Merge pull request #953 from Shagshag/patch-4 
[*] BO: kb was not translatable
 2013-11-08 06:37:26 -08:00
gRoussac 530b6dc501 // Productscomments remove warnings 2013-11-08 15:00:56 +01:00
gRoussac 5364be686e // More simple names for csv import files 2013-11-08 14:59:43 +01:00
gRoussac 472dc8c27d [-] MO : Blocklayered follow up https://github.com/PrestaShop/PrestaShop/commit/a6e67b078e067445eef358e907649e843a1dc26a#commitcomment-4538556 2013-11-07 17:59:04 +01:00
Gregory Roussac fbd28f3e49 Merge pull request #942 from Jacky75/20131107_payment_and_groups 
[-] FO : in multistore payment module restrictions by customer group was...
 2013-11-07 06:39:57 -08:00
gRoussac 7cc351e83d [-] BO : Fix bug #PSCFV-10932, ranges input disabled on load 2013-11-07 15:11:30 +01:00
gRoussac 91cde1ab3a [-] BO : getCMSPages to associated shop in cmscontroller 2013-11-07 12:09:58 +01:00
gRoussac e6f9f806bf [-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440 2013-11-07 12:03:35 +01:00
gRoussac fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
gRoussac 514c087962 [*] BO : New import csv files 2013-11-06 18:38:32 +01:00
gRoussac 00887942d3 // preg_last_error not available on every stacks 2013-11-06 18:32:39 +01:00
gRoussac afe6c9bc6f // missing dir sep on is_dir (open_basedir) 2013-11-06 18:23:01 +01:00
gRoussac fc6041fa33 [-] IN : bad path in create multistore 2013-11-06 18:06:19 +01:00
gRoussac 76b03856e2 // missing trailing dir sep 2013-11-06 17:33:18 +01:00
gRoussac 1fb8ef823d [-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl 2013-11-06 11:50:52 +01:00
gRoussac 581645ce6d [-) BO : Action is mandatory for a cart rule 2013-11-05 11:26:10 +01:00
gRoussac 87be153e42 [-] MO : Blockcategories last_visited_category must not be cached 2013-11-05 11:16:52 +01:00
Gregory Roussac f85c6b59c8 Merge pull request #921 from Jacky75/20131105-layered-feature-sorted 
[*] MO : Blocklayered filter feature blocks sorted
 2013-11-05 01:50:48 -08:00
gRoussac 26a43260c5 [-] CORE : invalid method name in displayAjax method of Controller action 2013-11-05 10:18:53 +01:00
Gregory Roussac c69429c126 Merge pull request #922 from Jacky75/20131105-layered-categories-shop 
[-] MO : Missing context shop for categories
 2013-11-05 01:10:39 -08:00
gRoussac 0e54bf0f76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 18:27:39 +01:00
gRoussac be13f82b30 [*] FO: Follow up https://github.com/PrestaShop/PrestaShop/commit/e86c56172dad2892d5c7e7dbb0908b0f4ffbaae0 2013-11-04 18:20:01 +01:00
gRoussac c44b1d617c [-] BO : Could not change image position 2013-11-04 16:59:03 +01:00
gRoussac c452444620 [-] IN : Could not install when session_start() does not fail on ajax requests 2013-11-04 15:47:29 +01:00
gRoussac 3f817e8729 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 14:31:29 +01:00