Merge remote tracking branch 'upstream/staging' #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix alignment of number of hits under Hits column
Correct PHP strict error in JMediawikiHttp
This PR fix the issue reported here by @aasimali : - http://issues.joomla.org/tracker/joomla-cms/5726 - #5726 When a module is trashed, in the actions dropdown menu, you have the icon "trash" (no effect) and it should be "publish". This PR replace the wrong "trash" icon by the "publish" icon by replacing published by state.
Conflicts: media/system/js/validate.js
#5732 Steps to reproduce the issue Use the funcion JHelperTags::searchTags() in component whithout param. Expected result Function to search tags Actual result Notice: Undefined index: published in C:\wamp\www\joomla\libraries\cms\helper\tags.php on line 888 System information (as much as possible) Joomla! 3.3.6 Stable [ Ember ] 01-October-2014 02:00 GMT Additional comments Fix: Change line 921: if (is_numeric($filters['published'])) to if ( isset($filters['published']) && is_numeric($filters['published']) )
Fix wrong 'trash' icon actions dropdown item
Lossless optimization of ALL Joomla PNG files. 301 files out of 541 were definately changed to a smaller version. 66,28 KB Saved.
…-modal Added the missing a close tag
See Extensions > Module Manager > Smart Search Module > [Advanced] settings Alternative Layout displays "default" instead of "Default" because language string was missing.
See: Extensions > Module Manager > Articles Related Items > Advanced There's a "Caching" option available but "Cache Time" field is missing. This PR adds a "Cache Time" field.
See: Extensions > Module Manager > Popular Tags > Advanced There's a "Caching" option available but "Cache Time" field is missing. This PR adds a "Cache Time" field.
See: Extensions > Module Manager > Similar Tags > Advanced There's a "Caching" option available but "Cache Time" field is missing. This PR adds a "Cache Time" field.
fix cancel action on the global configuration page. Thanks all!
Notice: Undefined index: published in C:\wamp\www\joomla\libraries\cms\helper\tags.php on line 888 Thanks all :-)
Update names of Article and Tag modules Thanks all :-)
textarea resize control and mass mail Thanks all :-)
Adding language string Alternative Layout dropdown Thanks all :-)
Smart Search Module Name Thanks all :-)
use https on docs.joomla.org Thanks all :-)
Use the new wrapper classes in the filesystem package
Fix form submit in IE
Convert users notes modal to Bootstrap modal
Sync changes to hathor override for the com_joomlaupdate default view
Templates sanity
Templates sanity for CSS/JS that is directly injected in documents head
Added missing increment operator `++`
Regression: hide menu in com_config breaks hathor!
Fix debug on modals
Removing one superfluous language string
fixed admin mobile menu toggle not working
Fix JForm 'safehtml' filter to use JFilters 'html' filter not 'string'
[imp] Articles Manager: adding class hasTooltip to title and author rows
Fix PHP errors in com_contact
Fix for: Banners matched only by tags results in SQL error
jainrimjhim20
pushed a commit
that referenced
this pull request
Feb 3, 2015
Merge remote tracking branch 'upstream/staging'
jainrimjhim20
pushed a commit
that referenced
this pull request
Feb 3, 2015
Fixed code style (spaces around the concatenating dots). Travis was not happy with my 1st PR joomla#5698
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.