Small Grammar change#11788
Merged
rdeutz merged 10 commits intojoomla:stagingfrom Aug 25, 2016
brianteeman:grammar
Merged
Conversation
This reverts commit 8f995f1.
|
I have tested this item ✅ successfully on a546b41 This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/11788. |
Member
|
I have tested this item ✅ successfully on a546b41 This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/11788. |
Member
|
RTC This comment was created with the J!Tracker Application at issues.joomla.org/joomla-cms/11788. |
Contributor
Author
|
Thanks |
roland-d
pushed a commit
to roland-d/joomla-cms
that referenced
this pull request
Sep 11, 2016
* toolbar * Revert "toolbar" This reverts commit 8f995f1. * Small grammar fix
roland-d
added a commit
to roland-d/joomla-cms
that referenced
this pull request
Sep 11, 2016
…areable-draft-content * origin/shareable-draft-content: (245 commits) Implement shareable draft links Cleaned up shared drafts view Added front-end token generarion Implement shared drafts view Remove obsolete file use only root (joomla#11703) com_search category results not displaying date (joomla#11802) warnings and errors, not notices ... (joomla#11801) [installation] Add javascript message titles and ajax errors strings (joomla#11800) Regression: Normalising head links and correcting hreflang for menu items associations (joomla#11769) Refactor allowEdit of backend category controller (joomla#11547) [com_contact] Move event trigger to correct place (joomla#11719) Improve the accessibility of the top menu in ISIS part 2 (joomla#11729) Show file extension (joomla#11776) change button -> a for the modal close button (joomla#11787) Small Grammar change (joomla#11788) Change message type to error when download of update package fails (joomla#11791) these are warnings not messages ... (joomla#11799) [plg_content_vote|pagebreak] Load language files only when needed (joomla#11730) [plg_system_stats] Load plugin language files only when needed (joomla#11728) Fix creation performance of form element menuparent, (slow down in menu item edit form, for item that belongs to large menu) (joomla#11628) ... # Conflicts: # administrator/components/com_admin/script.php # administrator/components/com_content/models/shared.php # administrator/components/com_content/views/shared/tmpl/default.php # administrator/language/en-GB/en-GB.xml # administrator/language/en-GB/install.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # installation/language/en-GB/en-GB.xml # language/en-GB/en-GB.xml # language/en-GB/install.xml # libraries/cms/pagination/pagination.php # libraries/cms/version/version.php # libraries/joomla/authentication/authentication.php # libraries/joomla/form/fields/color.php # libraries/joomla/form/fields/email.php # media/system/js/share-uncompressed.js # media/system/js/share.js # plugins/content/vote/vote.php
roland-d
added a commit
to roland-d/joomla-cms
that referenced
this pull request
Sep 11, 2016
…areable-draft-content * origin/shareable-draft-content: (253 commits) Fixed conflict Added menu item Code cleanup Implement shareable draft links Cleaned up shared drafts view Added front-end token generarion Implement shared drafts view Remove obsolete file use only root (joomla#11703) com_search category results not displaying date (joomla#11802) warnings and errors, not notices ... (joomla#11801) [installation] Add javascript message titles and ajax errors strings (joomla#11800) Regression: Normalising head links and correcting hreflang for menu items associations (joomla#11769) Refactor allowEdit of backend category controller (joomla#11547) [com_contact] Move event trigger to correct place (joomla#11719) Improve the accessibility of the top menu in ISIS part 2 (joomla#11729) Show file extension (joomla#11776) change button -> a for the modal close button (joomla#11787) Small Grammar change (joomla#11788) Change message type to error when download of update package fails (joomla#11791) these are warnings not messages ... (joomla#11799) ... # Conflicts: # administrator/components/com_admin/script.php # administrator/components/com_content/controllers/article.php # administrator/components/com_content/controllers/articles.php # administrator/components/com_content/models/forms/article.xml # administrator/components/com_content/views/article/view.html.php # administrator/components/com_content/views/articles/view.html.php # components/com_content/views/form/tmpl/edit.php # libraries/cms/pagination/pagination.php # libraries/joomla/form/fields/email.php # plugins/content/vote/vote.php
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
5 participants
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.
Before
After