From 08936ac44b45f735730e41f3e0b3260c1512a92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valent=C3=ADn?= Date: Thu, 14 Jun 2018 17:36:41 -0500 Subject: [PATCH] [4.0] Replace "label" classes with the new "badge" ones (#20328) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Prepare 3.8.4 Release Candidate * Reset for dev * Regression in the ISIS backed css PR for #19411 * Regression: Isis RTL forgotten in 19417 (#19423) * [com_content] - archived legacy SEF fix (#19397) * [com_content] - archived legacy sef fix * cs * Fix media manager 'up' button (#19443) * Regression at createUri from #19099 (#19415) * [installer] - sanitize extensions type as lower case (#18416) * Fix filter by multiple categories (#19450) * Fix filter by multiple categories * Remove debug code * 2nd Release Candidate for 3.8.4 * Do not add unnecessary parameters in the archive link (#19447) * Do not add unnecessary parameters in the archive link * Remove php notice * Unset parameter month=0 when year is not set * Prepare 3.8.4 release * Reset for development * Move from protocol relative links to https for google fonts imports (#19488) * move to protocol relative links to https * fix one broken font link * Revert "Regression at createUri from #19099 (#19415)" This reverts commit 128a4d467d3773463966c5634f3e4f5ba12bebe6. * Revert "Correctly redirect after logging into the multilingual joomla with association enabled (#19295)" This reverts commit 5994eb1f4f4f74566061c09f8b751274b9a0d189. * Revert "Fix parser error in plugin languagefilter on php5 (#19268)" This reverts commit 05fd1d9f12ea62960f1ea921663fa4877994e538. * Revert "Do not add default or active Itemid to every link without own menu item (#19099)" This reverts commit d0688686669d344d8d0a4c87d55611eff4b74d4d. * Update CMSApplication.php (#19514) * CodeMirror Updated to 5.34.0 (#19533) * Prepare 3.8.5 release candidate * Reset to dev * Revert "Do not add unnecessary parameters in the archive link (#19447)" This reverts commit 0155f35c9676a4905dbe82494fc3d1d16c183ee2. * Revert "[com_content] - archived legacy SEF fix (#19397)" This reverts commit 01a9147d2a6561e0389d16fcdc3e5dc31299bfc3. * Prepare 3.8.5 release * Reset for dev * Changed parameter to bool (#19573) * Removed orphan weblinks languages (#19495) * Changing loading order for between Redirect and Logout system plugins at (#19489) install time * mod_articles_news. Define $item_heading only if needed (#19439) * mod_articles_news. Define $item_heading only if needed * Update _item.php * Update _item.php * Fix count() in PHP 7.2 (#19396) * Fix count() * Simplify check * [CS] Code style Tabs must be used to indent lines; round 1 (#19350) * Tabs must be used to indent lines; round 1 Tabs must be used to indent lines; spaces are not allowed * Fix some indent issues not fixed by the auto fixer nothing is perfect, sometimes we need to make some minor adjustments. * fix line issue * Make suggested changes to reflect general code style * Add space after ; - correct indenting - remove extra ; - correct spaces *   was on it's own line * fix missing semicolon * align equals replace tab with spaces on line 25 * remove extra space * fix missing semicolons fix some spacing around operators * com_mailto remove unused params (#19290) I was checking to see why we had an untranslated string and as far as i can tell this entire params section is not used To test apply pr and make sure that the send to friend functionality works as before * [com_fields] Fields are not copied when batch duplicating an article (#16958) * [#16740] - [com_fields] Fields are not copied when batch duplicating an article * user deploy version over the wrong since tag ;) * [#16740] - [com_fields] Fields are not copied when batch duplicating an article * Handle modified date in Document objects consistently (#19592) * Delete existing user_keys, if password is changed (#17827) * Delete existing user_keys, if password is changed * corrected styling issues * deploy version - as I said, this is my first pr * pushing to patch-2 * newline after } * push to patch-2 * push to patch-2 * Update en-GB.com_users.ini * Update remember.php * Update remember.xml * configuration option in XML file radio button option to activate/deactivate the "reset RememberMe" functionality on password-change. * Update en-GB.plg_system_remember.ini * hm... * Update remember.php * Update remember.php * XML styles * commenting out the user message * Update remember.php * Update en-GB.plg_system_remember.ini * btn-group-yesno * Update remember.php * Update remember.php * reference to Alice Ruggles removed! * making it mandatory * Update remember.php * making it mandatory * making it mandatory * making it mandatory * as per the remarks of Quy changed * changed as per Quy's remarks * [CS] Code style Tabs must be used to indent lines; round 2 (#19351) * [CS] Code style Tabs must be used to indent lines; round 2 - Tabs must be used to indent lines; spaces are not allowed * fix some indenting not fixed by the auto fixer * Fix some more indenting and spacing * use and/or in template mixed HTML/PHP files For consistancy, Until a decision is made on joomla/coding-standards#191 use `and`/`or` in template mixed HTML/PHP files rather than our normal required `&&`/`||` requierment that we have for full PHP files * Use the && and || operators preferences to Use the && and || operators * Remove space indent exceptions (#19609) * remove space indent exceptions * tab indent not spaces * Tabs must be used to indent lines; spaces are not allowed * Tabs must be used to indent lines; spaces are not allowed try using the concatenation to fix space indent strangeness * Tabs must be used to indent lines; spaces are not allowed * [3.9] Tweak update percentage message to include %-sign (#19628) * Tweak update percentage message to include %-sign * Add minified version. * Typo Joomla is vegetarian (#19649) Quick fix to the spelling of meet * Plain English cont. (#19654) The accessibility standard Web Content Accessibility Guidelines (WCAG) 2.0 Section 3 states https://www.w3.org/TR/WCAG20/#understandable >### 3. Understandable > Information and the operation of user interface must be understandable. >#### Guideline 3.1 Readable > Make text content readable and understandable. > #### Success Criterion 3.1.5 Reading Level > When text requires reading ability more advanced than the lower secondary education level after removal of proper names and titles, supplemental content, or a version that does not require reading ability more advanced than the lower secondary education level, is available. To achieve this we should use "plain language" wherever possible 1. Word choice: use the simplest word that conveys your meaning. http://plainlanguagenetwork.org/plain-language/what-is-plain-language/ 2. Prefer the short word to the long. https://www.plainlanguage.gov/guidelines/words/ This PR continues the work and removes the superfluous text " to make it possible" * Plain English (#19629) * accordingly * advised => recommended * assist => help * attempt=>try * concerning => relevant * contains => has * containing -> with * contains=-> has * Currently -> (omit) * designated -> marked * initial -> first * initialise->start * in order to -> to * it is -> (omit) * optimal -> best * regarding->on * remain -> stay * terminated -> stopped * word order * Fix PHP Warning for Session on PHP 7.2 (#19199) * Fix PHP Warning for Session on PHP 7.2 * CS * Correctly call function with the parameter by reference (#19233) * Better code for set category view layout (#19238) * [Modern Routing] make a simpler loop in StandardRules::build (#19271) * Simpler loop in build method of StandardRules * Now use last_id only * Remove useless code * Remove support for new router configuration * Improve performance of the com_content category view for a huge number of articles (#19284) * Multilingual: Associated categories should display only when published (#19551) * Multilingual: Associated categories should display only when published * cs * cs * [CS] Array list style (#19610) * array list style * array list style * array list style * array list style * Prevent compounding inputmode attribute (#19632) * Fix user profile plugin (#19633) * Update pagebreak plugin description (#19653) Simple PR to update the very outdated text suggesting that the page break button is normally found under the article text area. * Chinese calendar js files don't load on Linux because they are not (#19662) lowercase. * Typo (#19675) Simple PR to fix a typo in a string * Implement Session GC Cli (#19548) * Implement Session GC Cli * CS add new line * Add deprecate log message for the pathway name attribute (#19700) * Add deprecate log message for the name attribute * Spelling * typo (#19691) * typo can be merged on review * more * Possible misprint (#19688) I think $ids array stores articles ids, because $articleModel->getItem()->id. Maybe copy-paste from line 159/line 206? Also, this possible misprint can be found in 4.0 branch. * Add the missing import in the application (#19709) * Add the missing import in the application * Use the local logger * fix 404 on github dokukmentation links (#19775) * Articles - Latest (#19664) The descriptions says "This module shows a list of the most recently published and current Articles." So if they are "current" then they cant also "may have expired" Simple PR to correct that on the front end For the admin version of the module the change is a little different as here the list will show all the articles irrespective of their current published state so the string change is different and is just a simplification and not a correction * reCAPTCHA V1 stops on March 31 (#19648) * reCAPTCHA V1 stops on March 31 Google have emailed directly anyone using v1 reCAPTCHA keys but users don't read their email. This PR adds a post-installation message IF they have the reCAPTCHA plugin enabled AND they are using v1 keys. This PR also updates the messages in the plugin informing them that V1 will not work after march 31 @mbabker already completely refactored the plugin for J4 to remove V1 etc this PR is ust for the messages * CS - new lines * use query to find the extension_id and not haardcoded * docblock * 3.8.6 * Update actions.php * System Information (#19764) * System Information We had the db version and the db collation but not the type This PR adds the database type eg postgresql, mysql etc * Update sysinfo.php * rename and move * rename * Overrides do not find 3rd party plugins languages when files are in the (#19740) plugin * Com_redirect: Differentiating utf8 old_url (#19734) * TinyMCE: uglify the inline XTD-btns script (#19731) * remove tabs and returns and spaces * more compression * Add some comments so others can follow the code * Doh, this code was for J4 * reninitialise the array 😡 * Update bootstrap-rtl.css (#19715) * Update bootstrap-rtl.css Duplicate entry .radio.btn-group > label:first-of-type * Update bootstrap-rtl.less Removed 2nd occurrence of .btn-group > .btn:first-child, .radio.btn-group > label:first-of-type * Hide global configuration and system information from non super users (#19697) * Hide global configuration and system information from non super users * Use identical operator * [a11y] Cache toolbar (#19686) We use the icon name to populate the ID. This toolbar has the same icon for both buttons so we have two buttons with the same id which is an accessibility failure This pr ensures every id attribute value is unique Because the icon has multiple names we can simply use one of the alternative names as a quick and dirty fix. There is no visual change * Wrong desc fixed. Changed title to document! (#19685) * Wrong desc fixed. Changed title to document! * Update Document.php * Move custom buttons to the other buttons in TinyMCE (#19656) * Proxy to a higher error handler if there is one available (#19645) * Correct output_buffering check in 3.8.x (#19611) * correct output_buffering check in 3.8.x * simplified the check @quy * this is why we can not have nice things.. fixing the check for output_buffering * Pass the configuration tmp_path to the archive package for extension installations (#19608) * pass the configuration tmp_path to the archive package for extension installations * add missing \ * Improve header handling in PageController cache (#19591) * Defining typeAlias (#19647) * Fix JRoute('&var=...') not adding current URL variables when current URL is the home page (#19582) * Fix loosing current URL vars when in home page * Update SiteRouter.php * Test units * Test units * [TemplateAdapter.php] Rewrote hardcoded SQL to query object (#17923) * rewrote hardcoded SQL to query object * correction in SQL for home field is declared as char/varchar * correction in SQL for home field is declared as char/varchar + ->q() * the requested change from @Quy * added microdata (#17689) * [Schema checker] (Database FIX) Add support for checking NULL and DEFAULT column attributes (#17351) * [Schema checker] (Database FIX) Add support for checking NULL and DEFAULT column attributes * CS * Update en-GB.com_installer.ini * english * The One Right Session Management Configuration For Joomla! 3 (#19687) * Session garbage collection plugin * Session metadata manager * Expand metadata manager to allow all apps, CLI for metadata cleaner * Move metadata cleanup to the plugin * Misc fixes from feedback * Language tweaks * Change to uint filter, if it'll get people to review and accept the damn PR... * Fix mssql installation (#19796) * Prepare 3.8.6 RC1 Release * Reset for dev * Update Greek Installation language files (#19806) * Another typo in Greek (#19816) * checksum extensions light (#17619) * [3.8] - checksum extensions porting checksum extensions from 4.0 * install checksum add install checksum * update checksum add update checksum * lang add lang string * doc block add missing parameter * tab tab * PHP cs * PHP CS * return integer return integer instead of mixed * switch switch inteder * switch switch integer * add CONST and remove sha1/md5 add CONST and remove sha1/md5 * hash algos hash algos * sha256,sh384,sha512 hash algos * alpha order alpha order * fix docbloc fix docbloc * Revert "checksum extensions light (#17619)" (#19873) This reverts commit 4d79fe20991c36baa80a56ea59edf7e8027a1654. * Update spanish installation language (#19878) * implement check provided by @ggppdk (#19791) * Fix undefined index: password_clear (#19892) * Prepare 3.8.6 release * Reset for development * Fix appveyor builds and bump driver dll version (#19805) * bump driver dll version and add php 7.2 * remove php 7.2 until drivers are available * Use powershell 'Invoke-WebRequest' Workaround When you use appveyor command-line utility to download, its user-agent is empty, Some sites do not allow empty user-agents to download. Use powershell 'Invoke-WebRequest' Workaround until appveyor fixes their command-line utility to have a user agent * Don't have a metadataManager class property to avoid circular dependency problem when instantiating multiple applications (#19912) * typo (#19910) typo * Clear button in article publish date (#17809) * For clear button issue * Update calendar.js * Update module.php * Remove commented line * [com_templates] Rewrote hardcoded SQL to query object (#17921) * rewrote hardcoded SQL to query object * correction in SQL for home field is declared as char/varchar * correction in SQL for home field is declared as char/varchar + ->q() * Break where clauses up * Fix Help URLs and update to Help38 (#19181) * Fix Help URLs * Update to Help38 * Fixed trig on change event (#19538) * [com_content] - fix link when layout and association (#19681) * Date format localise (#19690) * Add new date format LC6 * LC6 * commit 2 * [behavior.formvalidator] - pattern attribute behaviour fix (#19771) * [behavior.formvalidator] - pattern behaviour fix * minify * Fix a subform table layout to be more strict to rows container (#19774) * mod_breadcrumbs. remove JHtml::bootstrap.tooltip (#19787) * Debug plugin style (#19790) * Debug plugin style Wrong css on the buttons for Log Category Mode It should be green for the positive action (include) and red for the negative action (exclude) This simple PR ensures that is the case * oops * Front end menu items translated in error (#19802) * Front end menu items translated in error PR #13606 introduced translatable admin menu item creation but the code didnt check if the menu item was for the frontend or the admin before doing the translation ### Test Instructions 1. Install any additional language eg italian 2. Create a menu item called "Sun" 3. On the list of all the menu items you will see it is displayed as "Dom" - the italian translation 4. Enable language debug 5. On the list of all the menu items you will see all your menu item titles are surrounded by ?? - to indicate no translation found - except for "Dom" which has ** instead to show it has been translated 6. Apply this PR 7. Sun still says Sun 8. There are NO ?? or ** when in language debug mode 9. Bonus - check a custom admin menu item and you will see it can be translated * code style * cs * CodeMirror 5.35.0 (#19809) * Correcting finder feeds items date when language is not English (#19815) * Correcting finder feeds items date when language is not English * typo * [com_ajax] Change modules check (#19818) * Add com_ajax check in getModuleList query * Restore getModuleList query * Change module check inside com_ajax * Categories: Allow sorting by Associations (#19821) * Categories: Allow sorting by Associations * moving assoc sorting after access * Article and contact modal should not use addslashes (#19826) * Menu tems select field: no need to escape string value (#19828) * Allow limiting calendar field to current year (#19846) * Allow locking to min and / or max year to current year * Update calendar.php * Cleared non-set variable notices * Update JHtml::calendar to support relative years limits (#19847) * Simplify switch statement (#19849) * [CS] Code style Fix some inline doc blocks for IDE hinting - round 1 (#19862) * Fix Operator Spacing * Fix inline doc blocks for IDE hinting * Fix some docblocks and comments (#19863) * Custom admin menus: Translating menu items titles (#19900) * adapt default values (#19924) * Use getter method (#19925) * Custom Admin menu item edit: Display Title, Parent Item and Ordering translations (#19916) * Admin menu item edit: Display Title, Parent Item and Ordering translations * Modifs suggested by izharaazmi * cs * display translated title only when item exists * Correcting label alignment * Cosmetic changes * In theory, you may not always be working with the default database. So use the correct one. (#19474) * [plugin][content] - loadmodule by id (#19362) * [plugin][content] - loadmodule by id * [plugin][content] - loadmodule by id * getModuleById * getModuleById * id not found * id not found * simple syntax * js side * modal * minify js * regex only digits * remove title * use static load() * regex * cs * return * cs tabs removed * simplify code * clean code * no style * replace loadmodule with loadmoduleid * cs * replace loadmodule with loadmoduleid * replace * missed echo * moved back * Update loadmodule.php fixed cs * Revert "[plugin][content] - loadmodule by id (#19362)" (#19931) This reverts commit 4172f792979f85acb6aa29562ba8ece5297fe847. * Category Modal - add notes (#19131) * Category Modal - add notes If you add a note to a category then it is displayed in the category list but not displayed in the category modal (eg when you select a category for a blog menu item) This PR adds the note, alias, and full path (on hover) to the modal to make it consistent with the list view * space * Please consider a blank line preceding your comment (#19936) * Fix typo in editor field (#19938) * [CS] long form function return types; round 1 (#19934) * PHPCS2 - fixes * 2 spaces after * Expected 2 spaces after the longest param type * [libraries][legacy][request] - fix php 7.1 warning not numeric (#19710) * [libraries][legacy][request] - fix php 7.1 warning not numeric * dry * [com_fields] Normalise the request com_fields data (#19884) * Normalise the request com_fields data * CS * PHP 5.3 compat * Fields in com_fields array (#9) Fields should be set in com_fields array and not direcly in $data * Spelling * Also normalise request data on front-end user profile save (#10) * Also normalise request data on front-end user profile save * correct context and option * Handle 0 properly in empty check * Simplify * allowing value 0 to be saved (#11) when setting a value of 0 in a text field the function empty will return true > setting the value to null * correct needsUpdate when strlen (or count) = 1 which incorrectly equa… (#12) * correct needsUpdate when strlen (or count) = 1 which incorrectly equaled to 'true' * Update field.php * Update field.php * [event dispatcher] - use strict comparison (#19907) * [com_users] Fix display of custom field of value 0 (#19933) * [CS] long form function return types; round 2 (#19935) * PHPCS2 Auto Fixes - Expected "boolean" but found "bool" for function return type - Expected "integer" but found "int" for function return type * Manual correction of docBlock spacing * Manual correction of docBlock spacing * Manual correction of docBlock spacing * Manual correction of docBlock spacing * Add some Member var comments * Manual correction of docBlock spacing * Add some Member Var comments * return tag after access tag * 3 spaces after var tag before the type * add tag since 3.1 to Class Properties and align var tags * add tag since 3.1 and align var tag * adjust some tag alignments * Two spaces after type * integer not int * Redirects Plugin - Make Relative or Absolute. (#19942) * Redirects Plugin - Make Relative or Absolute. * Orderiing and capital I. * Update en-GB.plg_system_redirect.ini * Update en-GB.plg_system_redirect.ini updated as per @quys comment. * Update en-GB.plg_system_redirect.ini * Make calendar output usable in other css-frameworks (#19944) * Revert changes expect css * Make calendar output usable in other css-frameworks * A min-width makes look better * Fix for duplicate url check bug introduced by #19734 and support utf8… (#19950) * Fix for duplicate url check bug introduced by #19734 and support utf8 on old_urls. Couldn't find a solution to handle this within mysql. So a simple foreach handles it perfectly. * Update link.php * solved issue number #19930 (#19969) corrected typo to ensure proper checkbox functionality * Removed text-output and enabled a disabled tick box for consistency (#19974) * Change to allow str_pos to match when the exclude term is at the root… (#19979) * Change to allow str_pos to match when the exclude term is at the root of the path * updated redirect.php - clearly I was tired with the first pr. * Fix for #11070 (tag-category) - Improve also views newsfeed-category … (#16627) * Fix for #11070 (tag-category) - Improve also views newsfeed-category and category-list * Correctly modifying .LESS and regenerate .CSS (#16627) * Simple enhancement to allow the user to make all Post Install Messages read (#19958) * Simple enhancement to allow the user to make all Post Install Messages as read. * Update message.php * Update messages.php * Update messages.php * Added onDisplay function for handling the display of the button. * removed blank lines. * updated quotes around ints. As per @alikon comments * Added (int) just to be safe. * Update messages.php * Update messages.php * Update messages.php * [com_mailto] Add missing placeholder (#19999) * Make sure items is an array. (#20000) * Make sure items is an array. Resolved #19998 * Update default_items.php * Update tag.php * Update tag.php * Update tag.php * Update tag.php * [com_fields] Fix fields display HTML prepared 4 or 5 times per article, make it be prepared only twice (#17895) * Pass field displayType (aka event type) to getFields * Update getFields to respect the 'display' parameter of every field * Update onContentPrepare to respect 'display' parameter of every field * Prepare for manual display * Do not create $item->jcfields multiple times * Revert the code for manual display to always prepare the field value * Wrong function name * Fix docblock * Better comment for parameter of getFields method * fix media field in ISIS Template (#17205) * fix media field in ISIS Template * fix media field in ISIS Template * [3.x] New sessiongc plugin is not declared as core plugin for manifest cache refresh (#20038) * add sessiongc plugin to the core plugins * alphasorting thanks @brianteeman * [module] [articles category] filter by multiple tags (#19983) * [module] [articles category] filter by multiple tags * multiple tags * spelling * [com_finder] Remove unused params (#20009) * [com_finder] Unused params * Update en-GB.com_finder.ini * Update sample_learn.sql * Update sample_testing.sql * Update sample_learn.sql * Update sample_testing.sql * Update sample_learn.sql * Update sample_testing.sql * Update jos_menu.csv * Restore and deprecate strings * Two new fonts for CodeMirror: IBM Plex Mono, Nanum Gothic Coding (#20017) * CategoryEdit field published filter (#20018) * Smart Search: Highlighting terms also in fulltext when using readmore (#20019) * Smart Search: Highlighting terms also in fulltext when using readmore * parsing summary + body to get text only * Escape full query in NestedTable debug mode (#20024) * Changed viewname filter in RouteHelper (#20031) * Fix GMail plugin so it doesn't crash and burn on 4.0 upgrades (#20043) * Tweak build script for added flexibility (#19848) * Refresh Manifest Cache failed: Extension is not currently installed (#19560) * Refresh Manifest Cache failed: Extension is not currently installed PR for #17604 Change the message to include the name of the extension. I have no idea how to test this - sorry - only code review - unless someone knows how? * partial revert * revert comment * Remove rtrim() since it allows invalid emails (#20080) * Custom Fields toggle display on read only rights (#20068) * [com_fields] Normalise the request com_fields data (#19884) * Normalise the request com_fields data * CS * PHP 5.3 compat * Fields in com_fields array (#9) Fields should be set in com_fields array and not direcly in $data * Spelling * Also normalise request data on front-end user profile save (#10) * Also normalise request data on front-end user profile save * correct context and option * Handle 0 properly in empty check * Simplify * allowing value 0 to be saved (#11) when setting a value of 0 in a text field the function empty will return true > setting the value to null * correct needsUpdate when strlen (or count) = 1 which incorrectly equa… (#12) * correct needsUpdate when strlen (or count) = 1 which incorrectly equaled to 'true' * Update field.php * Update field.php * Custom fields view on form via toggle on read-only rights * fix back-end new article * first / seperate check on read-only access * refactor code so show_on parameter is part of helper function * implement inherit value in fields + language things * loadmodel only when needed * changed function comment * change values order so default value (inherit) is displayed first * Must use self:: for local static member reference * Fixed page with multiple codemirror editors fields with different syntax highlighting (#20063) * Fix for: Can't choose module using editor plugin if you search first (#20005) * fixit * cs * Update modal.php * Basic check to make sure the bulk import seperator is being used. (#19982) * Basic check to make sure the bulk import seperator is being used. Added Import State function as to how the urls should be imported, enabled or disabled. * force int. * Update config.xml * Update links.php * Update en-GB.com_redirect.ini * Update config.xml * Update links.php * Update en-GB.com_redirect.ini * Update config.xml As per standards i.e: https://github.com/joomla/joomla-cms/blob/staging/administrator/components/com_config/model/form/application.xml i.e. endtag inline with options and closing tag inline with opening tag. * Update links.php * Changed none selected to none, to be used when there are none availab… (#19977) * Changed none selected to none, to be used when there are none available to select and when none are selected. Set select to be readonly is they cannot select any options * Update plugins.php * Update plugins.php * Update en-GB.ini * Update en-GB.ini * Update plugins.php * Update plugins.php * Update plugins.php * Update plugins.php * Update plugins.php Space/tabbing for drone. * Update plugins.php * Corrected bug on empty subject of com_mailto (#19956) * Corrected bug on empty subject If the subject is empty, the posted value is an empty string (exists) so the default value is never added. * Updated code to include null value * text corrections (#20111) * Typo and copy paste error (#20123) Someone couldn't spell and then someone else must have copy pasted the error No idea how to test but this has been wrong since 3.5 * correct the use of the use command and move it below the defined command (#20130) * Prepare 3.8.7 RC * Reset for dev * Add a security policy (#20163) * Add a security policy Many projects now add a SECURITY.md document to their repository. Often this is related to using HackerOne but not always. This PR adds a policy to our github repo. It is based on the existing policy on the d.j.o web site The file doesn't need to be distributed so it has been added to the exclude list in the github repo. * tweek * copy paste * Update SECURITY.md * Update SECURITY.md * Prepare 3.8.7 release * Reset for dev * Introduce CODEOWNERS (#20137) * Tidy writeDynaList() (#12184) * Cleaned writeDynaList() in core.js * Removed explanation comments * removed all API changes * updated compressed core.js * [fix] publish/unpublish does not work with tables using null as default checked_out value (#20204) * Fix overwrite by .table-striped (#20180) Fix overwrite by administrator/templates/isis/css/template.css line 1787 table.table-striped tbody > tr:nth-child(odd) > td, table.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } * Fix overwrite by .table-striped (#20179) Fix overwrite by administrator/templates/isis/css/template.css line 1787 table.table-striped tbody > tr:nth-child(odd) > td, table.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } * Tooltips not loading com_users (#20177) The edit profile form is not loading the bootstrap tooltip code. So any tooltip (not popovers) are displayed as html as seen in the screenshot below when TFA is enabled. This was spotted by @o2tsen and @sandewt while testing #20051 but as it is a bug effecting more than that PR I have created a new PR. (a pr should only fix one problem) * [a11y] Headings consecutive order Debug Console (#20167) > Headings communicate the organization of the content on the page. Web browsers, plug-ins, and assistive technologies can use them to provide in-page navigation. > Skipping heading ranks can be confusing and should be avoided where possible: Make sure that a < h2> is not followed directly by an < h4>, for example. Source (https://www.w3.org/WAI/tutorials/page-structure/headings/) The headings were probably chosen for cosmetic reasons and not structural reasons which they should have been This PR changes the heading in the debug console from h1 to h2 There is a very small visual change as a result but imho the benefits outweigh the small cost * [a11y] Headings consecutive order (#20166) * [WIP] [a11y] Headings consecutive order > Headings communicate the organization of the content on the page. Web browsers, plug-ins, and assistive technologies can use them to provide in-page navigation. > Skipping heading ranks can be confusing and should be avoided where possible: Make sure that a

is not followed directly by an

, for example. Source (https://www.w3.org/WAI/tutorials/page-structure/headings/) This PR changes the heading in the plugin and modules from h3 to h2 and in the template styles to h4 ### todo joomla.edit.item_title layout uses h4 but before I change it I need to check everywhere that it is being used * layout * Fix typos in InstallerControllerUpdate (#20154) * Fix typos in InstallerControllerUpdate * Fix same error on other places. Thanks @Quy * Remove similar unnecessary code * Revert "Remove similar unnecessary code" This reverts commit 56410c0f59929d6a5afe220763fed6cfbcda6cdc. * One more * Revert "One more" This reverts commit aa1b101f26be135b7161b4d71aa466f7556e5cab. * [com_contact] Don't hide contact filter form (#20126) * Update default_items.php * Correct implode order. * Codestyle * More codestyle * Fix for JUserHelper::addUserToGroup() when user group title is a number. (#20091) * Update UserHelper.php * Update UserHelper.php * Fix count() in PHP 7.2 (#20044) * [com_content][Multilanguage] - remove duplicated queries (#19683) * [com_content][Multilanguage] - remove duplicated queries * cs * add $db->qn() * removed () * Make CodeMirror work in repeatable subforms (#12542) * One function to initialize any and all CodeMirror instances rather than individual functions to initialize one-by-one. Call on page load and also on subform-row-add * Minor js changes * Codemirror fullscreen modifier message (do we still need this?) * Call the popover init function when creating new subform rows. (#20222) * Call the popover init function when creating new subform rows. * Update teh popover test * [a11y] post-installation message in control panel (#20220) > Headings communicate the organization of the content on the page. Web browsers, plug-ins, and assistive technologies can use them to provide in-page navigation. > Skipping heading ranks can be confusing and should be avoided where possible: Make sure that a < h2> is not followed directly by an < h4>, for example. Source (https://www.w3.org/WAI/tutorials/page-structure/headings/) The heading was probably chosen for cosmetic reasons and not structural reasons which they should have been This PR changes the heading for the post-installtion message i the control panel from h4 to h3 There is a very small visual change as a result but imho the benefits outweigh the small cost * Solves issue #20195 (#20214) * [plugin][search][content] give priority on result when title is matched (#20197) * [plugin][search][content] give priority on result when title is matched * Missed comma * Add relevance weighting according to number of words * Relevance by number of words in title only, removed introtext relevance * Fix order string concatenation * You've Got Mail (#20162) * You've Got Mail Since 2003 the internet has changed. We no longer get a message to say that we have a message. Instead we just give you the message. You probably never use the messages component (especially for private message to a specific user) as they are the equivalent of https://www.youtube.com/watch?v=gFBLiHpkcOk The Joomla com_messages component is used in two instances 1. Notification of a new article 2. Sending a message to another user ### Current email for Notification of a new article Subject: A new private message has arrived from [sitename] Body: > Please log in to [link] to read your message. ### New email for Notification of a new article Subject: New message from [user] at [sitename] Body: > New Article A new Article has been submitted by 'user' entitled 'blog post'. > Please log in to [link] to read your message. ### Current email when sending a message to another user Subject: A new private message has arrived from [sitename] Body: > Please log in to [link] to read your message. ### New email when sending a message to another user Subject: New message from [user] at [sitename] Body: > [subject] [message] [login link] ## Backwards Compatibility No issues. The message contains the old login message PLUS the content of the message. So if you were using this message in a custom workflow there is no change required to that workflow * subj * cs * add new string and mark existing string for deprecation * Support Codemirror's included key mappings (#19833) * Support Codemirror's included key mappings * Use a list instead of radio buttons * Don't expose LDAP authentication usage. (#18531) * Don't expose LDAP authentication usage. * Use new language strings for LDAP authentication. * remove bind string * remove bind string * use connect string * alpha order * alpha order * Handle the case that JFolder::files returns 'false' (#11715) * Initialize tooltips when a new a row is added in a subform (#12996) * Initialize tooltips when a new a row is added in a subform * Fix a test since the init function has changed * Replace htaccess which was removed inexplicably * Missing space (#20260) * Tiny JLanguage::loadLanguage() code improvement (#20257) * [com_content] Remove redundant check (#20254) * Update articles.php (#20245) * [com_config] Capitalize label (#20299) * Implement Issue Templates as discussen in #20298 https://github.com/joomla/joomla-cms/issues/20298 * [fix] openbase_dir processing (#20280) * CodeMirror updated to version 5.37.0 (#20269) * Use title from menu item (#20267) * Change the defaults for new installs to disable com_mailto in articles (#20266) * change the defaults for new installs to disable com_mailto in articles * change more defaults to 0 thanks @quy * Don't enable sending the PW on new installs (#20247) * disable plaun pw sending per default on new installs * make sure we have to set a PW when we dont send the plain pw via mail * chagne the default in the xml to thanks @quy * update the sample data thanks @quy * make sure the mail to user does not include the PW too * Revert "make sure the mail to user does not include the PW too" This reverts commit 9095819a9d4e6f8828b0556e5d0284e754f3b9c6. * address comments by @bakual thanks * Optimization and fix of multilingual associations and add layouts to com_content links (#20229) * Revert #19681 * Revert #19683 * Remove addition query and check after #19314 * Add layout to com_content links * Add layout to com_content article associations * Add layout to category associations * add advanced where clause param * add advanced where clause for com_content article associations * drone code formatting fix * drone code formatting fix * drone code formatting fix * Line exceeds 150 characters * PHPCS rules * Remove parenthesis * Change queryKey * Fix typo * Improve description * Add checksum generation to the build script * Replace "label" classes with the new "badge" ones * Replace "label" classes with the new "badge" ones * Siwtch back comment about labels * Revert "Merge branch 'staging' into 4.0-dev" This reverts commit 831e986eb64ecc5e92315ef0790b4f37d1804904, reversing changes made to b8c7f7f54caafedd41a78045cb120851e161e5ff. * Replace label classes on js files * Replace missing label classes * Use the "danger" to replace "important" in badges * Use the "danger" to replace "important" in badges * Replace label classes on a language file --- .../components/com_banners/tmpl/clients/default.php | 2 +- .../tmpl/joomlaupdate/default_preupdatecheck.php | 4 ++-- .../components/com_menus/tmpl/items/default.php | 4 ++-- .../components/com_menus/tmpl/items/modal.php | 2 +- .../com_modules/tmpl/module/edit_assignment.php | 6 +++--- .../components/com_modules/tmpl/modules/modal.php | 2 +- .../components/com_templates/tmpl/styles/default.php | 4 ++-- .../language/en-GB/en-GB.com_joomlaupdate.ini | 6 +++--- .../com_contact/tmpl/category/default_items.php | 4 ++-- components/com_contact/tmpl/contact/default.php | 2 +- .../com_contact/tmpl/featured/default_items.php | 2 +- components/com_content/tmpl/article/default.php | 6 +++--- .../com_content/tmpl/category/default_articles.php | 8 ++++---- .../com_content/tmpl/featured/default_item.php | 6 +++--- .../com_newsfeeds/tmpl/category/default_items.php | 4 ++-- components/com_newsfeeds/tmpl/newsfeed/default.php | 2 +- layouts/joomla/content/tags.php | 2 +- media/com_joomlaupdate/js/default.js | 10 +++++----- media/com_joomlaupdate/js/default.min.js | 2 +- modules/mod_languages/tmpl/default.php | 2 +- plugins/editors/tinymce/form/setoptions.xml | 2 +- plugins/system/debug/debug.php | 12 ++++++------ 22 files changed, 47 insertions(+), 47 deletions(-) diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php index e865235293385..8977edf378378 100644 --- a/administrator/components/com_banners/tmpl/clients/default.php +++ b/administrator/components/com_banners/tmpl/clients/default.php @@ -130,7 +130,7 @@ count_published; ?> - + count_unpublished; ?> diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php index d9ccdc4cf6505..79f5333238a09 100644 --- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php +++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/default_preupdatecheck.php @@ -29,7 +29,7 @@ label; ?> - + state ? 'JYES' : 'JNO'); ?> notice) : ?> @@ -74,7 +74,7 @@ recommended ? 'JON' : 'JOFF'); ?> - + state ? 'JON' : 'JOFF'); ?> diff --git a/administrator/components/com_menus/tmpl/items/default.php b/administrator/components/com_menus/tmpl/items/default.php index aaab104f692e5..bdae956a6f511 100644 --- a/administrator/components/com_menus/tmpl/items/default.php +++ b/administrator/components/com_menus/tmpl/items/default.php @@ -222,7 +222,7 @@ language_image) : ?> language_image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?> - language_sef; ?> @@ -230,7 +230,7 @@ language_image) : ?> language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> - language_sef; ?> diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php index 12d65bfab494f..59eaed484131b 100644 --- a/administrator/components/com_menus/tmpl/items/modal.php +++ b/administrator/components/com_menus/tmpl/items/modal.php @@ -134,7 +134,7 @@ language_image) : ?> language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> - language_sef; ?> + language_sef; ?> diff --git a/administrator/components/com_modules/tmpl/module/edit_assignment.php b/administrator/components/com_modules/tmpl/module/edit_assignment.php index a96bef6096272..39f3077603eb4 100644 --- a/administrator/components/com_modules/tmpl/module/edit_assignment.php +++ b/administrator/components/com_modules/tmpl/module/edit_assignment.php @@ -89,14 +89,14 @@ language_image) : ?> language_image . '.gif', $link->language_title, array('title' => $link->language_title), true); ?> - language_title . '">' . $link->language_sef . ''; ?> + language_title . '">' . $link->language_sef . ''; ?> published == 0) : ?> - ' . JText::_('JUNPUBLISHED') . ''; ?> + ' . JText::_('JUNPUBLISHED') . ''; ?> - ' . JText::_('COM_MODULES_MENU_ITEM_' . strtoupper($link->type)) . ''; ?> + ' . JText::_('COM_MODULES_MENU_ITEM_' . strtoupper($link->type)) . ''; ?> diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php index e5af39e065387..540039470971c 100644 --- a/administrator/components/com_modules/tmpl/modules/modal.php +++ b/administrator/components/com_modules/tmpl/modules/modal.php @@ -91,7 +91,7 @@ position) : ?> escape($item->position); ?> - + diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php index 1a0c007105c83..94b238c591f34 100644 --- a/administrator/components/com_templates/tmpl/styles/default.php +++ b/administrator/components/com_templates/tmpl/styles/default.php @@ -98,14 +98,14 @@ image) : ?> image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_TEMPLATES_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?> - language_sef; ?> + language_sef; ?> image) : ?> image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> - language_sef; ?> + language_sef; ?> diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini index 241a9d595a530..6eec35bd743f2 100644 --- a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini +++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini @@ -29,9 +29,9 @@ COM_JOOMLAUPDATE_VIEW_COMPLETE_HEADING="Joomla Version Update Status" COM_JOOMLAUPDATE_VIEW_COMPLETE_MESSAGE="Your site has been updated. Your Joomla version is now %s." COM_JOOMLAUPDATE_VIEW_DEFAULT_ACTUAL="Actual" COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBILITY_CHECK="Joomla! %s Compatibility Check" -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="*Extensions marked with No or Missing Compatibility Tag might break your website. Please consult with the developer before upgrading." -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="*Extensions marked with Missing Compatibility Tag indicate the developer did not add a compatibility tag in the respective extension's XML." -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="*Extensions marked with Yes (X.X.X) might require an update." +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="*Extensions marked with No or Missing Compatibility Tag might break your website. Please consult with the developer before upgrading." +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="*Extensions marked with Missing Compatibility Tag indicate the developer did not add a compatibility tag in the respective extension's XML." +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="*Extensions marked with Yes (X.X.X) might require an update." COM_JOOMLAUPDATE_VIEW_DEFAULT_DIRECTIVE="Directive" COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS="Downloading update file. Please wait ..." COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_COMPATIBLE="Compatible" diff --git a/components/com_contact/tmpl/category/default_items.php b/components/com_contact/tmpl/category/default_items.php index 568c6bf9de827..65c2ff8e9ba81 100644 --- a/components/com_contact/tmpl/category/default_items.php +++ b/components/com_contact/tmpl/category/default_items.php @@ -25,7 +25,7 @@
params->get('filter_field')) : ?>
- +
@@ -67,7 +67,7 @@ name; ?> items[$i]->published == 0) : ?> - + event->afterDisplayTitle; ?> diff --git a/components/com_contact/tmpl/contact/default.php b/components/com_contact/tmpl/contact/default.php index 6ae7f0e2aef4e..3ae90932a2c26 100644 --- a/components/com_contact/tmpl/contact/default.php +++ b/components/com_contact/tmpl/contact/default.php @@ -26,7 +26,7 @@

item->published == 0) : ?> - + contact->name; ?>

diff --git a/components/com_contact/tmpl/featured/default_items.php b/components/com_contact/tmpl/featured/default_items.php index 118cdade2ebe7..2366fab897ea3 100644 --- a/components/com_contact/tmpl/featured/default_items.php +++ b/components/com_contact/tmpl/featured/default_items.php @@ -109,7 +109,7 @@ items[$i]->published == 0) : ?> - +

  - sef; ?> + sef; ?>  sef); ?>  state == 0) : ?> - + publish_up) > strtotime(JFactory::getDate())) : ?> - + publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != JFactory::getDbo()->getNullDate()) : ?> - + diff --git a/components/com_content/tmpl/featured/default_item.php b/components/com_content/tmpl/featured/default_item.php index 0b02ca0189ad5..60e68b11621b8 100644 --- a/components/com_content/tmpl/featured/default_item.php +++ b/components/com_content/tmpl/featured/default_item.php @@ -42,13 +42,13 @@ item->state == 0) : ?> - + item->publish_up) > strtotime(JFactory::getDate())) : ?> - + item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != JFactory::getDbo()->getNullDate()) : ?> - + get('show_print_icon') || $params->get('show_email_icon')) : ?> diff --git a/components/com_newsfeeds/tmpl/category/default_items.php b/components/com_newsfeeds/tmpl/category/default_items.php index f58fef7835d6c..4c39a39d3604b 100644 --- a/components/com_newsfeeds/tmpl/category/default_items.php +++ b/components/com_newsfeeds/tmpl/category/default_items.php @@ -23,7 +23,7 @@ params->get('filter_field') !== 'hide' && $this->params->get('filter_field') == '1') : ?>
items[$i]->published == 0) : ?> - + diff --git a/components/com_newsfeeds/tmpl/newsfeed/default.php b/components/com_newsfeeds/tmpl/newsfeed/default.php index f6f77ddb6c7bf..c0dcc077b636f 100644 --- a/components/com_newsfeeds/tmpl/newsfeed/default.php +++ b/components/com_newsfeeds/tmpl/newsfeed/default.php @@ -40,7 +40,7 @@

item->published == 0) : ?> - + item->name); ?> diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php index 3864b8280e719..5679a954c6c43 100644 --- a/layouts/joomla/content/tags.php +++ b/layouts/joomla/content/tags.php @@ -23,7 +23,7 @@ $tag) : ?> access, $authorised)) : ?> params); ?> - get('tag_link_class', 'label label-info'); ?> + get('tag_link_class', 'badge badge-info'); ?>
  • escape($tag->title); ?> diff --git a/media/com_joomlaupdate/js/default.js b/media/com_joomlaupdate/js/default.js index 42afecb19a846..a2c77c8c18243 100644 --- a/media/com_joomlaupdate/js/default.js +++ b/media/com_joomlaupdate/js/default.js @@ -152,24 +152,24 @@ Joomla = window.Joomla || {}; case PreUpdateChecker.STATE.COMPATIBLE: if (extensionData.compatibleVersion == extensionData.currentVersion) { // The compatible version matches the current version -> diplay success label. - html = '' + Joomla.JText._('JYES') + ''; + html = '' + Joomla.JText._('JYES') + ''; } else { // The compatible version does not match the current version => display warning label. - html = '' + Joomla.JText._('JYES') + html = '' + Joomla.JText._('JYES') + ' (' + extensionData.compatibleVersion + ')'; } break; case PreUpdateChecker.STATE.INCOMPATIBLE: // No compatible version found -> display error label - html = '' + Joomla.JText._('JNO') + ''; + html = '' + Joomla.JText._('JNO') + ''; break; case PreUpdateChecker.STATE.MISSING_COMPATIBILITY_TAG: // Could not check compatibility state -> display warning - html = '' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING') + ''; + html = '' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING') + ''; break; default: // An error occured -> show unknown error note - html = '' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN') + ''; + html = '' + Joomla.JText._('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN') + ''; } // Insert the generated html extensionData.$element.html(html); diff --git a/media/com_joomlaupdate/js/default.min.js b/media/com_joomlaupdate/js/default.min.js index 3dd50b1fbce0c..399f6341b87de 100644 --- a/media/com_joomlaupdate/js/default.min.js +++ b/media/com_joomlaupdate/js/default.min.js @@ -1 +1 @@ -Joomla=window.Joomla||{},function(){"use strict";Joomla.extractionMethodHandler=function(e,t){var n="direct"===e.value?"none":"table-row";document.getElementById(t+"_hostname").style.display=n,document.getElementById(t+"_port").style.display=n,document.getElementById(t+"_username").style.display=n,document.getElementById(t+"_password").style.display=n,document.getElementById(t+"_directory").style.display=n},Joomla.submitbuttonUpload=function(){var e=document.getElementById("uploadForm");""==e.install_package.value?alert(Joomla.JText._("COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE"),!0):e.submit()},document.addEventListener("DOMContentLoaded",function(){var e=document.getElementById("extraction_method"),t=document.getElementById("upload_method"),n=document.getElementById("uploadButton"),o=document.getElementById("downloadMessage");e&&e.addEventListener("change",function(t){Joomla.extractionMethodHandler(e,"row_ftp")}),t&&t.addEventListener("change",function(e){Joomla.extractionMethodHandler(t,"upload_ftp")}),n&&n.addEventListener("click",function(e){o&&(o.style.display="block")})})}(),function(e,t,n){var o={config:{serverUrl:"index.php?option=com_joomlaupdate&task=update.fetchextensioncompatibility",selector:".extension-check"},STATE:{INCOMPATIBLE:0,COMPATIBLE:1,MISSING_COMPATIBILITY_TAG:2,SERVER_ERROR:3},run:function(){o.joomlaTargetVersion=t.getElementById("joomlaupdate-wrapper").getAttribute("data-joomla-target-version"),e(o.config.selector).each(function(){o.checkCompatibility(e(this),o.setResultView)})},checkCompatibility:function(t,n){var a={$element:t,state:o.STATE.SERVER_ERROR,compatibleVersion:0};e.getJSON(o.config.serverUrl,{"joomla-target-version":o.joomlaTargetVersion,"extension-id":t.data("extensionId")}).done(function(e){a.state=e.data.state,a.compatibleVersion=e.data.compatibleVersion,a.currentVersion=t.data("extensionCurrentVersion")}).always(function(e){n(a)})},setResultView:function(e){var t="";switch(e.state){case o.STATE.COMPATIBLE:t=e.compatibleVersion==e.currentVersion?''+Joomla.JText._("JYES")+"":''+Joomla.JText._("JYES")+" ("+e.compatibleVersion+")";break;case o.STATE.INCOMPATIBLE:t=''+Joomla.JText._("JNO")+"";break;case o.STATE.MISSING_COMPATIBILITY_TAG:t=''+Joomla.JText._("COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING")+"";break;default:t=''+Joomla.JText._("COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN")+""}e.$element.html(t)}};e(o.run)}(jQuery,document,window); \ No newline at end of file +Joomla=window.Joomla||{},function(){"use strict";Joomla.extractionMethodHandler=function(e,t){var n="direct"===e.value?"none":"table-row";document.getElementById(t+"_hostname").style.display=n,document.getElementById(t+"_port").style.display=n,document.getElementById(t+"_username").style.display=n,document.getElementById(t+"_password").style.display=n,document.getElementById(t+"_directory").style.display=n},Joomla.submitbuttonUpload=function(){var e=document.getElementById("uploadForm");""==e.install_package.value?alert(Joomla.JText._("COM_INSTALLER_MSG_INSTALL_PLEASE_SELECT_A_PACKAGE"),!0):e.submit()},document.addEventListener("DOMContentLoaded",function(){var e=document.getElementById("extraction_method"),t=document.getElementById("upload_method"),n=document.getElementById("uploadButton"),o=document.getElementById("downloadMessage");e&&e.addEventListener("change",function(t){Joomla.extractionMethodHandler(e,"row_ftp")}),t&&t.addEventListener("change",function(e){Joomla.extractionMethodHandler(t,"upload_ftp")}),n&&n.addEventListener("click",function(e){o&&(o.style.display="block")})})}(),function(e,t,n){var o={config:{serverUrl:"index.php?option=com_joomlaupdate&task=update.fetchextensioncompatibility",selector:".extension-check"},STATE:{INCOMPATIBLE:0,COMPATIBLE:1,MISSING_COMPATIBILITY_TAG:2,SERVER_ERROR:3},run:function(){o.joomlaTargetVersion=t.getElementById("joomlaupdate-wrapper").getAttribute("data-joomla-target-version"),e(o.config.selector).each(function(){o.checkCompatibility(e(this),o.setResultView)})},checkCompatibility:function(t,n){var a={$element:t,state:o.STATE.SERVER_ERROR,compatibleVersion:0};e.getJSON(o.config.serverUrl,{"joomla-target-version":o.joomlaTargetVersion,"extension-id":t.data("extensionId")}).done(function(e){a.state=e.data.state,a.compatibleVersion=e.data.compatibleVersion,a.currentVersion=t.data("extensionCurrentVersion")}).always(function(e){n(a)})},setResultView:function(e){var t="";switch(e.state){case o.STATE.COMPATIBLE:t=e.compatibleVersion==e.currentVersion?''+Joomla.JText._("JYES")+"":''+Joomla.JText._("JYES")+" ("+e.compatibleVersion+")";break;case o.STATE.INCOMPATIBLE:t=''+Joomla.JText._("JNO")+"";break;case o.STATE.MISSING_COMPATIBILITY_TAG:t=''+Joomla.JText._("COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_VERSION_MISSING")+"";break;default:t=''+Joomla.JText._("COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSION_WARNING_UNKNOWN")+""}e.$element.html(t)}};e(o.run)}(jQuery,document,window); \ No newline at end of file diff --git a/modules/mod_languages/tmpl/default.php b/modules/mod_languages/tmpl/default.php index 911baa50fb74b..5b4fbb038ea4e 100644 --- a/modules/mod_languages/tmpl/default.php +++ b/modules/mod_languages/tmpl/default.php @@ -72,7 +72,7 @@ image) : ?> image . '.gif', $language->title_native, array('title' => $language->title_native), true); ?> - sef); ?> + sef); ?> get('full_name', 1) ? $language->title_native : strtoupper($language->sef); ?> diff --git a/plugins/editors/tinymce/form/setoptions.xml b/plugins/editors/tinymce/form/setoptions.xml index be914d6ad0fdb..f0203b92a58da 100644 --- a/plugins/editors/tinymce/form/setoptions.xml +++ b/plugins/editors/tinymce/form/setoptions.xml @@ -6,7 +6,7 @@ label="PLG_TINY_FIELD_SETACCESS_LABEL" multiple="true" class="access-select" - labelclass="label label-success" + labelclass="badge badge-success" /> ($totalTime * 0.25)) { - $labelClass = 'badge-important'; + $labelClass = 'badge-danger'; } elseif ($totalQueryTime < ($totalTime * 0.15)) { @@ -1734,14 +1734,14 @@ public function logger(LogEntry $entry) protected function displayLogs() { $priorities = array( - Log::EMERGENCY => 'EMERGENCY', - Log::ALERT => 'ALERT', - Log::CRITICAL => 'CRITICAL', - Log::ERROR => 'ERROR', + Log::EMERGENCY => 'EMERGENCY', + Log::ALERT => 'ALERT', + Log::CRITICAL => 'CRITICAL', + Log::ERROR => 'ERROR', Log::WARNING => 'WARNING', Log::NOTICE => 'NOTICE', Log::INFO => 'INFO', - Log::DEBUG => 'DEBUG', + Log::DEBUG => 'DEBUG', ); $out = '';