Fix conflicts#65
Merged
wilsonge merged 5028 commits intowilsonge:fix/finder-namespacefrom May 16, 2021
Merged
Conversation
…a#33324) * Remove release news from post installation messages screen * Update administrator/components/com_postinstall/tmpl/messages/default.php Co-authored-by: Quy <quy@fluxbb.org> * remove COM_POSTINSTALL_LBL_RELEASENEWS * remove deprecated method call and revert removal of FActory Co-authored-by: Quy <quy@fluxbb.org>
Fix copy paste error on the package details
* [4.0] Toolbar Close/Cancel The cancel button should have the text Cancel when its a new item Close when its an existing item With this PR I have fixed the few instances that incorrectly did not follow this pattern which is used in all the other 33 views. Summary of changes Create a New Article - Cancel Edit an Article - Close Create a Workflow - Cancel Edit a Workflow - Close Create a Workflow Stage - Cancel Edit a Workflow Stage - Close Create a Workflow Transition - Cancel Edit a Workflow Transition - Close Edit an image - Close Create a private message - Close Read a private message - Close * CS * space * article * space
Signed-off-by: Phil E. Taylor <phil@phil-taylor.com>
* Fix Hide All Messages
The $eid was always assigned 212 (ID of Joomla CMS) by ` $model->getState('eid', $model->getJoomlaFilesExtensionId())`
Now, this value is dynamically assigned based on the value of `#adminForm`'s eid input field (extension options dropdown field)
* fix reset messages
$eid was always assigned the value of 212 (ID of Joomla CMS) by `getJoomlaFilesExtensionId())` Now it dynamically takes the id from the URL parameters.
Also, removed line 39 as the PHPCS suggested I do so.
* update get to getInt
Signed-off-by: Phil E. Taylor <phil@phil-taylor.com> Co-authored-by: Quy <quy@fluxbb.org>
* Field contexts filter improvement * CS
when moving from bs2 to bs5 the label-* classes were changed to alert-* classes however there is no such class as alert-important - it should be alert-danger
Adds some margin so that the entire focus ring is visible. (Usually seen when you navigate using the keyboard) ### Before ### After
* Set color for text and links in position topbar * Add empty line
…33385) * Removed unused constants * Update com_workflow.ini * Transferring the class from DIV to UL
When you have filtered your items by the trashed status in most components there is an empty trash button on the toolbar. However for contacts, newsfeeds, redirects and tags the button is in the actions dropdown. For a consistent UI they should all be the same. To test apply the pr filter a component by trashed and observe the button
…3286) * Blank State for Categories of Extensions Allow more generic use of filering by where Further refine use of filtering Add Tags Blank State Refine the lookup with a non-generic filter dont use input use filter update copyright date Co-authored-by: Brian Teeman <brian@teeman.net> update copyright date Co-authored-by: Brian Teeman <brian@teeman.net> refactor due to upstream changes Refactor due to upstream change convert array to short syntax correct url remove unused lang Co-authored-by: Quy <quy@fluxbb.org> Correct help url add really unhelpful documentation link reindex array remove indent Special handling for the title as com_categories is a service component Update administrator/components/com_categories/tmpl/categories/blankstate.php add correct icon Signed-off-by: Phil E. Taylor <phil@phil-taylor.com> add link for learn more button Signed-off-by: Phil E. Taylor <phil@phil-taylor.com> revert Update administrator/components/com_tags/tmpl/tags/blankstate.php Co-authored-by: Quy <quy@fluxbb.org> Align => empty state rename from blank slate * Update administrator/components/com_categories/src/Model/CategoriesModel.php * Update administrator/components/com_tags/src/Model/TagsModel.php * remove deprecated calls and ensure only new button shown on empty state * Remove spaces * Prepared statement * make private Co-authored-by: Quy <quy@fluxbb.org>
* add com_cache blank slate * Dont display toolbar if no cache items * Add blank state language strings * namespace \count function calls * /s/you/if * Update administrator/components/com_cache/tmpl/cache/blankstate.php Co-authored-by: Brian Teeman <brian@teeman.net> * Update administrator/components/com_cache/tmpl/cache/blankstate.php Co-authored-by: Brian Teeman <brian@teeman.net> * Update administrator/language/en-GB/com_cache.ini Co-authored-by: Brian Teeman <brian@teeman.net> * Add icon Signed-off-by: Phil E. Taylor <phil@phil-taylor.com> * a-z lang strings Signed-off-by: Phil E. Taylor <phil@phil-taylor.com> * s/blankslate/emptystate * Short array syntax * Update administrator/language/en-GB/com_cache.ini Co-authored-by: Brian Teeman <brian@teeman.net> Co-authored-by: Brian Teeman <brian@teeman.net> Co-authored-by: Quy <quy@fluxbb.org>
* Empty State for Banner clients and tracks * Remove formURL Co-authored-by: Quy <quy@fluxbb.org>
* Global Check-in Empty State * remove language string not used * tabs * change text * cs * remove formURL Co-authored-by: Quy <quy@fluxbb.org>
* Empty state for com_redirect * merge from other pr * change icon * cs * alpha * Update administrator/language/en-GB/com_redirect.ini Co-authored-by: Quy <quy@fluxbb.org> * Update administrator/components/com_redirect/tmpl/links/emptystate.php Co-authored-by: Brian Teeman <brian@teeman.net> Co-authored-by: Quy <quy@fluxbb.org> Co-authored-by: Brian Teeman <brian@teeman.net>
* fix: Convert session ids returned from PostgreSQL as resources into strings * fix: Correct typo in variable name * style: Fix cs issues * refactor: Delete session data only if session ids are available
The black tooltips are supposed to have rounded corners. However the search tooltips do not. This PR resolves that. There may be a better way than using !important but I couldn't find it. Dont forget to rebuild the css ### Before ### After
The template overrides column was missing a scope. These cells should contain a scope attribute to identify their association with td elements.
It is absolutely not necessary to change titles to tooltips. It is a pointless exercise with zero benefits that would need to be done in a gazillion places. The only time we should be using the black tooltips is as a replacement for the bootstrap tooltips. They are NOT a replacement for titles.
…4finder-namespace # Conflicts: # administrator/components/com_finder/Indexer/Adapter.php # plugins/finder/categories/categories.php # plugins/finder/contacts/contacts.php # plugins/finder/content/content.php # plugins/finder/newsfeeds/newsfeeds.php # plugins/finder/tags/tags.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
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 should fix the conflicts for joomla#26384