fix conflicts 2) #__extensions#6
Closed
alikon wants to merge 45 commits intozero-24:stagingfrom
alikon:patch-63
Closed
fix conflicts 2) #__extensions#6alikon wants to merge 45 commits intozero-24:stagingfrom alikon:patch-63
alikon wants to merge 45 commits intozero-24:stagingfrom
alikon:patch-63
Conversation
I propose changing the gear icon to a user icon. While I know the user icon is also used in the subsequent drop down, that gear never made sense to me as this is a user menu. There's nothing in that menu that's NOT user related (unless you argue that a log out option isn't user related). In many other systems, that sort of menu is denoted by a user or head icon. This would just bring a bit more clarity to that menu. To test the change, log into the admin and see if the cog icon is now a user icon.
* Commit to resolve issue joomla#9776. * Solved problem of need a new strings on language...
Update cog icon to user icon in administrator template index.php
joomla#10249) * Adding field menuitem to login menu item * cs * Special case to display the correct redirect field. * Modifying a language string * Adding one more conditional to make sure we deal with a core Login Menu item in case some 3rd party component uses similar field names
* Groups users lost when profile user is saved Steps to reproduce the issue 1) An user connects in the front end 2) He edits his profile 3) He saves it 4) When the profile form is reloaded, look the user object with the function of JFactory getUser (JFactory::getUser()) 5) You can see that the groups property is null In fact, the function getUser loads the user object from the session previously saved with the property groups set to null (function save JUser around the line 819). Suggested solution To prevent the lost of groups property, I suggere to save the property before save aned restore it after * whitespaces I removed the whitespaces * Improvement with getGroupsByUser Finally I prefere this solution, it is cleaner. I saw than the structure of $user->groups is not the same after the call of getGroupsByUser but I think it should not be a problem
Fixed layout long titles + text in beez3 template
* remove useless text * Update en-GB.com_cpanel.ini
fixes layout long titles + text in protostar
com_search - Fix long titles + text in search results
… options (joomla#3072) * set/get script options * render script options * rename to JoptionsStorage * use Joomla.optionsStorage * use JSON_PRETtY_PRINT when debug enabled * fix typo _scripts_options => _script_options * fix typo * fix another typo * Make it better * c.s. * c.s.
Implement error handling in JMail
…oomla#6902) * [related joomla#6080] Fix startOffset issue when useCookie is true * [cs] Improved condition by optimizing code - set useCookie as default
* Fix undefined index issue with HTTP_HOST * Revert back superglobal variable change * Fix undefined index issue with HTTP_HOST * Simple CS fix for joomla#7757
fix conflicts 2) #__extensions
Author
|
mistake sorry |
zero-24
pushed a commit
that referenced
this pull request
Jun 11, 2017
- declared some properties - merged unset() calls
zero-24
added a commit
that referenced
this pull request
Aug 27, 2018
…or the joomla core Fixes #6 (#12) * inital port to the joomla core * add com_mailto as supported form (requires joomla#20265) * install & update SQL & mark as core extension * bump version to trigger drone * new line & drone * implement consentbox text based on the work by @brianteeman thanks! * thanks drone * new line * doc block * rename plugin to ConfirmConsent * fix inine comments * typo thanks @sandewt * implement LanguageAssociations thanks @infograf768 * fix check * move the update sql's to its own files to avoid merge conflicts * fix postgresql file * thanks @infograf768 * fix problems fund by @infograf768 * extend description * implement modal support thanks @infograf768 * new text thanks @brianteeman * drone * add missing period * thanks @brianteeman * thanks @Sandra97 * remove Scalar types * fix association * fix comments thanks @sandewt * class var type * fix language string and us another namesprace * the 2nd field is package_id * the 2nd field is package_id * the 2nd field is package_id * add com_privacy.request
zero-24
pushed a commit
that referenced
this pull request
Sep 16, 2018
* Load correct core files of override files (#2) Start implements loadcorefile() in administrator/components/com_templates/Model/TemplateModel.php * CS (#3) Coding Standards * codingstandards * codingstandards (#4) * Test (#6) Phase 2 (2 part) Mechanism to find correct core file and implementation. * Remove Notice: Only available for html-folder * Remove Warning if core file not found (#11) Thanks. So one part of the issue joomla-projects/gsoc18_override_management#12 is done. * Implement the diff view in template manager Implement the diff view in template manager * coding standard (#17) * fix diff (#18) Fix bug in path in case of administrator template override. Fix bug in path in case of administrator template override. * Notification after update and TEST (#16) Find changed files of overridden files and show message. * coding standard (#21) * correction * correction (#26) * Correcthtmlpath (#27) * correction * change oldhtml to newhtml * List of updated override files. (#30) * addcss (#34) * Final Product (#39) Core and Diff view Updated override history list. Quick icon notification plugin. Override control plugin. * save 3 lines :) * New feature show status. (#47) show status in com_template view templates * link * corrected namespace * Button to Switch (#35) * wip add Switcher * wip style switcher * wip style switch make inline and change on off text * wip start with js * wip js * wip delete buttons and make js more robust * wip save to storage * wip delete old code * wip * wip lint * wip css * set default value for switcher * wip make switcher blue * wip * wip * build * correct names * create new functions * fist test code * use onchange * undo installer.min.js * add forgotten new line at the end of css file * correct align * correct compare.es6 - only deleted the toggle part * correct compare.js - only deleted the toggle part * wip * reduce timeout * wrap in funcitons * wip * add use strict to both js-files(compare and toggle) * add the timeout value of 500 again, because 200 are not enought in my case * use css class 'active' for toggle views * add strict * time out for editor * wip * improvments use newActive and switch * correction * width of switcher-spans * correct align * do not use global * wip * removed timeouts * JTEXT to TEXT * forgotton last line * deleted duplicated comments * css fix align * use unnamed functions in es6 * Sql files for fix database (#50) * sql files for database fix * delete space * Suggestion for displaying Dates in view updates files (joomla#52) Correct Dates and do not use date of file any more * Store Date as UTC and show it in server time zone (joomla#57) * modified and created date are created and stored in UTC * convert dates for displaying in model * spar a loop * normalize timezone in view * use language constants for dateformat * JToolbarHelper to ToolbarHelper * CS * namespace * plural * name * clean * text * fx * sin * files * s * Suggestion for language strings (joomla#60) * language strings * correct typo * delete media folder plg_quickicon * add folder plg_quickicon to build/media_src * delete files in media folder * Move media folder - System (joomla#66) * multi * cs * delete files in media folder for joomla toolbar (joomla#67) * Fix button switchers style. (joomla#70) * button * CS * changed uitab.addTab for updated files * Bring back core.js changes. (joomla#69) * core.js * const * fix * form * core * hound * CS * scopr * grid * alpha * cs * lang * only override file * lang * override lang installer * Cs * sub * Update list of core extensions (joomla#71) * Language changes (joomla#76) * update * Update en-GB.com_templates.ini * override JLIB_HTML_PUBLISH_ITEM this is the hover text on the publish icon in the list of files * Change icon (joomla#74) change the icon to use an outline for more consistency * lang * not core (joomla#75) * not core * Update en-GB.plg_installer_override.ini * namespace * cs * Updated files (joomla#82) * Update default_updated_files.php * Update en-GB.com_templates.ini * Update en-GB.com_templates.ini (joomla#81) * Update en-GB.plg_quickicon_overridecheck.ini (joomla#80) * Update en-GB.plg_quickicon_overridecheck.ini (joomla#79) * remove space (joomla#78) * Update en-GB.plg_quickicon_overridecheck.ini * Update en-GB.plg_quickicon_overridecheck.sys.ini * remove hardcoded id * null get function * state * clean * More changes "core" to "original" (joomla#85) * cs * update * plural
zero-24
pushed a commit
that referenced
this pull request
Sep 23, 2018
* This is a combination of 8 commits. This is the 1st commit message: > First WIP version of supporting nested subforms. This is the commit message #2: > Fix nested subforms not getting correct name attribute on input fields. This is the commit message #3: > Fix subform rows having invalid index, fix small typo. This is the commit message #4: > Replace the unique subform id via random bytes by just an increasing integer in the fields type rendering process. This is the commit message #5: > Implement feedback from PR at Joomla; > - Use a <template> HTML element for the template of the subform rows, > not a url encoded string inside of a <script> element. > - Fix code style errors reported by phpcs. > - Make the fixing of the unique attributes (name, id, etc) of input elements > of nested subform rows more errorprone, using the same method as the main > subform row. > - Manually add a minified version of the javascript file. This is the commit message #6: > Fix failing javascript tests due to changed structure of subform repeatable template container. This is the commit message #7: > Change subform repeatable javascript test to correctly check on > 0-indexed rows, previously they have been 1-indexed. This is the commit message #8: > Fix a problem where multi-level subforms on the same level doesnt trigger their template correctly. > Additionally added a note why the fixScripts() method is broken and how it could get better. * Commit code styling errors and add an aria label for the outermost 'add' button. * Fix double group-add button on repeatable subform type.
zero-24
pushed a commit
that referenced
this pull request
Nov 2, 2018
…ngle query, reduce 20, 50, 100 queries (page limit) to 1 (joomla#22117) * Categoy manager, get all counters via single query * Replace countItems() and countTagItems() methods with a reusuable counterRelations() method in ContentHelper class * CS * Since deploy version * Better ordering for states to property names array * Coding style (#6) * Removed unneeded parameter from counting methods * CS
zero-24
pushed a commit
that referenced
this pull request
Dec 15, 2020
Metismenu frontend - wrapping UL attributes in an array
This file contains hidden or 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
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.
Pull Request for Issue joomla#4115 .
Summary of Changes
fix conflicts 2) #__extensions
Testing Instructions