User Notes #30
Merged
User Notes #30
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
Integration work
Artofuser
… notes layout; add plural support to notes icon counter; fix up code style.
Artofuser
Artofuser
Added published up and published down fields to user note table Added published column to user notes view Added missing language strings
Conflicts: administrator/modules/mod_menu/tmpl/default_enabled.php
Closed
| * | ||
| * @since 2.5 | ||
| */ | ||
| protected function populateState() |
There was a problem hiding this comment.
Strict standards: Declaration of UsersModelNotes::populateState() should be
compatible with that of JModelList::populateState()
|
Method signature fixed. Also added missing bits to the Hathor users view, default layout. However, I'm not familiar with what is required for new view layouts in Hathor (not sure that's really my responsibility, but anyway). If there's documentation you can point me to to guide me through how to do that I can take a stab at it, otherwise I think that should be the responsibility of the experts that maintain Hathor (in which case, just shoot me a pull request). |
|
Ok, I will ask Andrea to create the layout for Hathor. Currently, the pull request cannot be merged |
Conflicts: administrator/components/com_users/models/users.php
|
Merge conflict fixed. |
| // Apply the range filter. | ||
| if ($range = $this->getState('filter.range')) | ||
| { | ||
| jimport('joomla.utilities.date16'); |
There was a problem hiding this comment.
Typo? I think the 16 shouldn't be there.
|
A suggestions for the future: Could we please only merge big pull requests like this after they've been rebased into just a couple of commits (the less the better, but at least one per author is required). This would make the commit history much more meaningful and easier to read. It's really not needed to follow how a feature grew to be, when I browse the history I just wanna see the when the feaute hit the repro. |
mwatt
pushed a commit
to mwatt/joomla-cms
that referenced
this pull request
Jul 2, 2016
Thanks @okonomiyaki3000 Use output buffering around JLayoutHelper::render
wilsonge
pushed a commit
that referenced
this pull request
Jan 23, 2017
Add some grunt functionality
wilsonge
pushed a commit
that referenced
this pull request
May 31, 2017
* codestyle * code style * codestyle * codestyle * codestyle * thanks @wojsmol * corrections - thanks @Quy * corrections - thanks @Quy * oops * make @Quy happy * Update article.xml * Remove space * Update config.xml (#14) * Update filter.xml (#15) * Update config.xml (#16) * Update profile.xml (#17) * Update application.xml (#18) * Update article.xml (#19) * Update filter_articles.xml (#20) * Update config.xml (#24) * Update config.xml (#23) * Update filter_fields.xml (#22) * Update filter_featured.xml (#21) * Update override.xml (#25) * Update config.xml * Update config.xml (#26) * Update itemadmin_alias.xml (#30) * Update itemadmin.xml (#29) * Update item.xml (#27) * Update item_alias.xml (#28) * Update itemadmin_url.xml (#31) * Update module.xml (#32) * Update plugin.xml (#33) * Update config.xml (#34) * Update link.xml (#35) * Update config.xml (#36) * Update style.xml (#38) * Update config.xml (#37) * Update note.xml (#42) * Update group.xml (#41) * Update filter_debuggroup.xml (#40) * Update config.xml (#39) * corrections for @andrepereiradasilva * gotya
anuragteapot
added a commit
to anuragteapot/joomla-cms
that referenced
this pull request
Aug 26, 2018
laoneo
pushed a commit
that referenced
this pull request
Sep 6, 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 (#52) Correct Dates and do not use date of file any more * Store Date as UTC and show it in server time zone (#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 (#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 (#66) * multi * cs * delete files in media folder for joomla toolbar (#67) * Fix button switchers style. (#70) * button * CS * changed uitab.addTab for updated files * Bring back core.js changes. (#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 (#71) * Language changes (#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 (#74) change the icon to use an outline for more consistency * lang * not core (#75) * not core * Update en-GB.plg_installer_override.ini * namespace * cs * Updated files (#82) * Update default_updated_files.php * Update en-GB.com_templates.ini * Update en-GB.com_templates.ini (#81) * Update en-GB.plg_quickicon_overridecheck.ini (#80) * Update en-GB.plg_quickicon_overridecheck.ini (#79) * remove space (#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" (#85) * cs * update * plural
roland-d
pushed a commit
to roland-d/joomla-cms
that referenced
this pull request
Sep 3, 2019
Fix javascript to remove switcher references
richard67
referenced
this pull request
in richard67/joomla-cms
Apr 3, 2020
obuisard
pushed a commit
to obuisard/joomla-cms
that referenced
this pull request
Feb 21, 2023
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.
This patch adds the ability to attach notes to a user.
Adds:
The patch also modifies the main user list. In a new site, there will be an "Add Note" icon against each user. This will link to a note edit form where you can add a note with a subject, description, category and review date.
When notes are added to a user the main user list shows two more icons: an icon that links to a modal popup summary of the notes, and an icon to jump to the full notes list filtering on that user.
Feature tracker reference: http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&tracker_id=8549