Search bar on horizontal BO #1466

Closed
wants to merge 177 commits into
from

Projects

None yet
@CharlyAes32

The search bar don't appear on horizontal BO. When is vertical, search bar is here...

Grégoire Bél... and others added some commits Oct 2, 2013
Grégoire Bélorgey [*] BO : Allow complex GROUP BY in SQL Manager dbc5c43
@axometeam axometeam A new version of my precedent pull-request
when you have some tags with attributes ( like img, ... )
eff3f6f
@sebastienhouzet sebastienhouzet [-] MO : Fix add truncate tag 5abd93e
@Prestaworks Prestaworks Update GuestTrackingController.php
Fixed issue with retrocompatibility where the ->getFirst() caused a 505 error on the order_collection when a collection class was not loaded.
8053604
@gRoussac gRoussac [-] IN : bad reset on vars in migrate_orders d14fcf1
Damien Metzger Merge pull request #846 from sebastienhouzet/patch-2
[-] MO : Fix add truncate tag in pscleaner
a932ba5
Damien Metzger Merge pull request #835 from axometeam/patch-20
// Fixed potential issue with textarea
2eb6202
@ccauw ccauw [-] BO : Double separator in function createTemplate()
smarty->getTemplateDir() returns a result ending with a separator,
so no need to add DIRECTORY_SEPARATOR ?
04760c9
Jérôme Nadaud Update CONTRIBUTING.md 2129aeb
Jérôme Nadaud Merge pull request #1030 from ccauw/patch-13
[-] BO : Double separator in function createTemplate()
754ba06
@rGaillard rGaillard Merge pull request #863 from Prestaworks/patch-15
// Update GuestTrackingController.php
09b5d3a
@rGaillard rGaillard Merge pull request #780 from MyBB-Services/dev/gb/sqlmanagergroupby
[*] BO : Allow complex GROUP BY in SQL Manager
81f05b9
@djfm djfm // updated Italian VAT rate 6284c55
Jérôme Nadaud Merge pull request #1032 from djfm/development
// updated Italian VAT rate
fa05975
@gRoussac gRoussac [-] BO : Undefined on image upload, revert of 48b7a49 2a1c991
@prestamodule prestamodule - Fix multiple translations in a same process for different id_lang
If id_lang are mixed (1, 2, 3, 1, 4, 2...) the translations aren't correctly populated from the theme lang.php override if include_once is used.
include must be used in order to handle mixed id_lang in a same process.

Signed-off-by: hadjedjvincent <v.hadjedj@presta-module.com>
d064be1
@prestamodule prestamodule - Fix english translation for backoffice_order template
Signed-off-by: hadjedjvincent <v.hadjedj@presta-module.com>
2b37db6
@djfm djfm // updated Jersey VAT rate b951c28
@djfm djfm // updated Kenya VAT rate 55c329c
@djfm djfm // updated Liechtenstein VAT rate 023be78
@djfm djfm // updated Latvia VAT rate 4ab4e19
@vAugagneur vAugagneur [-] MO : fixed bug #PSCFV-9642 - Slider does not scroll when define l…
…anguage from right to left
5150a3f
@rGaillard rGaillard [-] Core: update cartrule feature active on cartrule updating 13061bd
@djfm djfm // updated Norway VAT rate 9d63514
@djfm djfm // added country name to Panama localization pack 0442da8
@djfm djfm // added country name to Peru localization pack 70144c7
@djfm djfm // added country name to Philippines localization pack 9737709
@djfm djfm // updated Poland VAT rate 964a0a4
@djfm djfm // corrected spelling of Saudi Arabia 6c271e0
@djfm djfm // updated Singapore localization pack 11f530b
@djfm djfm // updated Slovenia VAT rate 27397ab
@djfm djfm // added country name to Tunisia localization pack dbd5f9d
Jérôme Nadaud Merge pull request #1044 from prestamodule/development
Mail translation methods fix & template translation fix
ccc388f
@rGaillard rGaillard // small fix 0585b8d
Jérôme Nadaud Merge pull request #1047 from djfm/development
Localization Packs
58da52b
@rGaillard rGaillard // small fix 10fa987
@rGaillard rGaillard // demo mode d8a1dca
@axi

PHP Fatal error: Class '\xc2\xa0Tools' not found in ..../Prestashop1-5/controllers/admin/AdminEmployeesController.php on line 351
When I try to access Employe Menu. Seems like an hidden typo problem? Fresh clone from git.

must be because I switched every space before "Tools" hitting my spacebar and it works now

PrestaShop member

Thank you for your feedback!
That should be OK now.

ttps://github.com/PrestaShop/PrestaShop/commit/134914dc1aed9e0f62cd626797b412214a856429

@axi

great, next time I try a pull request ;-)

Gamesh and others added some commits Dec 6, 2013
@Gamesh Gamesh filesize returns negavite int for realy large files
this will cast to unsigned int that will allow to display correct file size up about 4 gigabytes
02fd940
@gRoussac gRoussac Merge pull request #1108 from Gamesh/patch-1
[-] FO : filesize returns negavite int for realy large files
5b809ec
@vAugagneur vAugagneur //tab module list fix fd1050b
@dlage dlage [-] BO : fixed bug loading wrong root category in AdminCategoriesCont…
…roller

Fix wrong root category being loaded.
There's an issue if you activate multishop and create a new root category which loads the wrong category and causes, at least, 'Add new Category' and 'Export' in AdminCategories to redirect back to the category list (e.g. impossible to add/remove categories).
b4c4068
@gRoussac gRoussac Merge pull request #1121 from dlage/patch-1
[-] BO : fixed bug loading wrong root category in AdminCategoriesController
445b5e9
@gRoussac gRoussac [-] BO : Image upload, legend can be null 8d3c78f
@gRoussac gRoussac // report of e9c1785 343c8ea
@gRoussac gRoussac // report of 1.6 #1031 90a4e7d
Frédéric BENOIST [*] MO : blockreinsurance, Add image size (Fix PSCFV-5764) and Add CD…
…N to img link
fc0f698
Frédéric BENOIST [*] MO : homeslider, Added CDN to img link 7a27b9e
@gRoussac gRoussac Merge pull request #1142 from frederic-benoist/1.5
[*] MO : blockreinsurance and homeslider, Add CDN to img link
3102eb5
@gRoussac gRoussac // report of ef345c9 89ee520
@gRoussac gRoussac // report of 3067728 1e12ab8
@gRoussac gRoussac // report of 9c6d357 25e6921
@gRoussac gRoussac // report of 12487a9 b0d3179
@gRoussac gRoussac // report of aea8f02 82a4d9b
@gRoussac gRoussac // report of d46feff 6d8cd1c
@gRoussac gRoussac // report of 3975599 1d61fb1
@gRoussac gRoussac // report of 336e784 12815fe
@gRoussac gRoussac // report of 8370c18 633fb04
@gRoussac gRoussac // small opti 701133c
@gRoussac gRoussac // report of 82022c3 82fd4e6
@gRoussac gRoussac // report of dd79348 7ec67ad
@gRoussac gRoussac // report of 6204419 be4983d
@gRoussac gRoussac // norms d5a16b3
@gRoussac gRoussac // report of 81481d6 298a1a8
@gRoussac gRoussac // report of 68ed6fa 2a1a6ab
@gRoussac gRoussac // small css fix 2b267ad
@gRoussac gRoussac // report of PrestaShop/PrestaShop-modules@5449054 3822654
@gRoussac gRoussac // report of 3067728 c71c397
@gRoussac gRoussac // small fix 635a920
@gRoussac gRoussac // report of 9ecc7c6 50fa669
@gRoussac gRoussac // report of b145b07 f88a8d4
@gRoussac gRoussac // report of edb7266 0c652e6
@gRoussac gRoussac // report of 7062884 1a69fca
@gRoussac gRoussac // report of 27e8beb 00b01c5
@gRoussac gRoussac // report of d4b3918 70134bc
@gRoussac gRoussac // report of 746c74d ddc7b54
@gRoussac gRoussac // report of d716fda 0fd2e64
@gRoussac gRoussac // report of ab44f81 6fc0d2b
@gRoussac gRoussac [-] FO : Fix bug #PSCFV-11356 bad query on product sales 239f23c
@gRoussac gRoussac // small fix 9d9c1c9
@gRoussac gRoussac // revert aecf66b
@gRoussac gRoussac // report of f81faf6 09abbad
@gRoussac gRoussac [-] FO : Fix bug #PSCFV-11361, inner join on category_product 9a6c98d
@gRoussac gRoussac [-] FO : Fix bug #PSCFV-11267, bad cache on carrier choice in normal …
…checkout
665a8e6
@vAugagneur vAugagneur //tab modules button fix 4e01dba
@PiotrKaczor PiotrKaczor [-] MO : Blockcart, correct short product name with HTML entities cb32424
@gRoussac gRoussac Merge pull request #1179 from PiotrKaczor/patch-2
[-] MO : Blockcart, correct short product name with HTML entities
d2ed27f
@gRoussac gRoussac [-] MO : Could not have translations on install from addons 9adc995
@rGaillard rGaillard [-] WS: adding a new order history must call OrderHistory::addWs() f012fab
@rGaillard rGaillard Merge branch '1.5' of https://github.com/PrestaShop/PrestaShop into 1.5 fb80b74
@rGaillard rGaillard [-] BO: Clear CCC cache after media servers update ca44205
@gRoussac gRoussac // report of 2467af7 e276d5a
@rGaillard rGaillard // fix file_exists cache on PDF bulk generation 93c1d0f
@rGaillard rGaillard // small perf fix 79a3ca1
@gRoussac gRoussac [-] FO : Fix bug #PSCFV-11098 logo under media servers 0ac769d
@djfm djfm [*] LO: Updated French VAT rates for 2014 03ce910
Jérôme Nadaud Merge pull request #1193 from djfm/1.5
[*] LO: Updated French VAT rates for 2014
cc84520
@rGaillard rGaillard // merge f1637fe
@rGaillard rGaillard // oups 78ec9ff
@gRoussac gRoussac // follow up ca44205 8955ed3
@rGaillard rGaillard // 99967ae
@gRoussac gRoussac [-] FO : Fix bug #PSCFV-11098 MO images under media servers cb0b1e1
@gRoussac gRoussac // remove notices a0c60cb
@nsorosac nsorosac [~] MO : MailAlerts : alert deletion from account
When on "my account > my alerts", the "delete" link was not working because of the missing $id_shop parameter in MailalertsActionsModuleFrontController::processRemove()
1e441cb
Jérôme Nadaud Merge pull request #1197 from axome/mailalerts_myaccount_delete
[~] MO : MailAlerts : alert deletion from account
fdbe19c
@gRoussac gRoussac // report of 270ae49 daf6e92
@PiotrKaczor PiotrKaczor [-] BO : Remove percentage char from frendly url fa1fe48
@gRoussac gRoussac [-] BO : Error display on image legend length b44ed30
@gRoussac gRoussac Merge pull request #1201 from PiotrKaczor/patch-3
[-] BO : Remove percentage char from frendly url
9b707ec
@gRoussac gRoussac // report of #1145 a556820
@gRoussac gRoussac Merge branch '1.5' of https://github.com/PrestaShop/PrestaShop into 1.5 f1d9806
@gRoussac gRoussac // report of ZiZuu-store@ac4d472 ba7cba8
@gRoussac gRoussac [-] FO : Trim before truncate 1fd2df9
Jerome Nadaud // Add Root category to shop association on create a new shop ecf8cbc
Jerome Nadaud [-] CORE : Ensure correct parent category for home categories 9deebc9
@rGaillard rGaillard // small fix 0aa3ab7
@jnadaud jnadaud Merge branch '1.5' of https://github.com/PrestaShop/PrestaShop into 1.5 011195b
@jnadaud jnadaud [-] MO : blocklayered some fixes and improvements 086f597
@rGaillard rGaillard // small fixes dfb900e
Damien Metzger // Changelog 1.5.6.2 7aae809
@jnadaud jnadaud // Fix left column right column hook 35fbbc7
@jnadaud jnadaud // blocklayered - Fix unwanted products on non selected categories 31b5f66
@jnadaud jnadaud // Improve blocklayered performance 0284a98
@jnadaud jnadaud // Fix product quantity to zero when last product attribute have no q…
…uantity
2bc471b
@jnadaud jnadaud // Revert fix 638cfa0
@jnadaud jnadaud [-] BO : FixBug domain not added to regenerated htaccess 4d3786a
@rGaillard rGaillard // don't write cookie on 404 medias
Conflicts:
	controllers/front/PageNotFoundController.php
ec02851
@rGaillard rGaillard // fix group_reduction value on product.tpl 7dfe57c
@rGaillard rGaillard [-] Core: Fix Product::getPriceStatic() quantity discounts cache 9bcde45
@rGaillard rGaillard // small fix edba0a8
@gRoussac gRoussac [+] IN : Adding sql file fe2996a
@ThinkGraphical ThinkGraphical Fixed label indentation for "1 point ="
Added a 'div.margin-form' around the input-field and removed '.t' so both the label & input-field are now positioned correctly in the form.
608c675
@gRoussac gRoussac Merge pull request #1242 from ThinkGraphical/1.5
[-] MO : Loyalty Fixed label indentation for "1 point ="
a1874fa
@gRoussac gRoussac // move drop table to module cb86b9d
@gRoussac gRoussac [-] IN : Bad check on column in p15012_add_missing_columns.php aa6d8a4
@jnadaud jnadaud [-] BO : FixBug #PSCFV-8755 - Total shipping amount include in second…
… voucher
94a382f
@jnadaud jnadaud [-] BO : FixBug #PSCSX-385 Cart rule does get minimum amount with cor…
…rect curreny
8842d51
Damien Metzger [-] FO : fixed cart rules cache id #PSCFV-11123 #PSCFV-11175 07d5fb9
@tashkas

PHP Parse error: syntax error, unexpected end of file, expecting ')' in /var/www/prestashop/classes/CartRule.php on line 377

@tashkas

PHP Parse error: syntax error, unexpected ')' in /var/www/prestashop/classes/ProductSale.php on line 162

You may have the same problem as 8842d51#commitcomment-5111555

Please check if your ProductSale.php file is not corrupt.

Damien Metzger and others added some commits Jan 20, 2014
Damien Metzger // Changelog 1.5.6.2 (again) 3703f2b
@jnadaud jnadaud // Fix attribute anchor separator 247722b
@s-duval s-duval AdminLogin-fix potential difference generated pass
Fix potential difference between admin login and generated password if Tools::encrypt method was changed
35fac02
Jérôme Nadaud Merge pull request #1286 from s-duval/patch-3
AdminLogin-fix potential difference generated pass
dd5564e
@djfm djfm // welcome back, forward_msg.txt 26dd36e
@gRoussac gRoussac Merge pull request #1289 from djfm/master
// welcome back, forward_msg.txt
9871c7a
@cinscaen cinscaen [-] BO : Permit "product_rule_group.tpl" override
We need to use createTemplate() instead of getContext()->smarty->fetch(), like other call of tpl in this file, if we want override "product_rule_group.tpl".

Il est nécessaire d'utiliser la fonction createTemplate() au lieu de getContext()->smarty->fetch(), comme utilisé pour les autres appels dans ce fichier, si l'on veut surcharger le fichier "product_rule_group.tpl".
fbc45e5
@vAugagneur vAugagneur //small fix d4f9543
@gaillafr gaillafr // Release branch merged dab8f57
@gaillafr gaillafr // Release branch merged 180f9ae
Jonadabe [*] FO : Typo
// double strip tag
77d7ce0
@gRoussac gRoussac Merge pull request #1803 from Jonadabe/patch-1
[*] FO : Typo
a54b0c3
@gaillafr gaillafr // Release branch merged 5c78c77
@jnadaud jnadaud Merge branch 'release' 94d2075
@gaillafr gaillafr Merge branch 'release' 27a0752
@gRoussac gRoussac Merge pull request #2232 from axometeam/patch-42
[+] FO : Add css classes order-carrier.tpl to ease integration
db5fadf
@gRoussac gRoussac // revert 9c60a29
Jerome Nadaud // Adding hosted module addons request
Conflicts:
	classes/Tools.php
f145433
@julienbourdeau julienbourdeau [+] BO : Allow user to install theme from unzipped folder d2218fd
@julienbourdeau julienbourdeau // forgotten trailing slashes for recurseCopy() eee6e01
@julienbourdeau julienbourdeau // small fix - use different context parameter for theme list 7d31b6b
@tchauviere tchauviere // Changed http link into robots.txt that wasnt valid anymore, thanks @… 76795c5
@tchauviere tchauviere // Changed http link into robots.txt that wasnt valid anymore, thanks @… e5d5d7e
@tchauviere tchauviere [-] FO : Correct topmenu scrolling issue on touch devices #PNM-2943 3d0c59b
@rGaillard rGaillard [-] FO: https detection using HTTP_X_FORWARDED_PROTO (use by cloudflare) e3a34cf
@tchauviere tchauviere // Follow up 1a096eb 6299a39
@tchauviere tchauviere // Deprecated conf key removed 7088bc6
@rGaillard rGaillard Revert "// Changed http link into robots.txt that wasnt valid anymore…
…, thanks @Spiraly"

This reverts commit e5d5d7e.
daed1c4
@rGaillard rGaillard Revert "// Deprecated conf key removed"
This reverts commit 7088bc6.
712cbd2
@rGaillard rGaillard Revert "// Follow up 1a096eb"
This reverts commit 6299a39.
e5b339b
@rGaillard rGaillard Revert "[-] FO : Correct topmenu scrolling issue on touch devices #PN…
…M-2943"

This reverts commit 3d0c59b.
c8fdc97
@rGaillard rGaillard // followup 73d351f fa343e0
@julienbourdeau julienbourdeau // small fix 0fa9035
Jerome Nadaud [+] CORE : File size check option on Uploader class 6153b9a
@rGaillard rGaillard // cherry-pick 10e1a81 51b0942
Jérôme Nadaud // Small fix
Conflicts:
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminThemesController.php
ea8a5a9
Jerome Nadaud // Add final on some module class fonctions 56ee97d
Jerome Nadaud Merge branch '1.6.0.10' 2fdb0cb
@gRoussac gRoussac Merge pull request #1452 from cinscaen/patch-1
[-] BO : Permit "product_rule_group.tpl" override
e451712
@gRoussac gRoussac closed this Nov 21, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment