-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[6.0] Gsoc2021 35228 merge featured #43907
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
softforge
merged 58 commits into
joomla:6.0-dev
from
chmst:gsoc2021-35228-merge-featured
Feb 24, 2025
Merged
Changes from 20 commits
Commits
Show all changes
58 commits
Select commit
Hold shift + click to select a range
0131b8a
Select field featured
chmst 1a110a9
Change links pointing to featured
chmst 71f0e57
Merge model features into articles
chmst b1c92ce
Merge Views
chmst 6cafabd
Integrate featured into the articles list
chmst d39cdfe
Remove uused files
chmst 52236fc
sql cupdate space
chmst 1abf31c
child bar buttons featured / unfeatured
chmst 1f1f04a
Merge controller
chmst f0063ce
deptecate table class
chmst f648ff9
Featured Quickicon
chmst e97f37c
cs
chmst 3611375
remove unused imports
chmst 10532bc
cs
chmst 10ff935
cs
chmst 53219f4
quickicon methods cs
chmst 796a00d
cs
chmst de442db
cs
chmst 2a3a615
cs
chmst 6d578ab
Merge branch '6.0-dev' into gsoc2021-35228-merge-featured
richard67 326be16
Fix PHPCS (1)
richard67 d50f2ba
Fix PHPCS (2)
richard67 6a01522
PHPCS (3)
richard67 50a9f7f
Revert changes in featured table.
chmst 8483886
Change version "removed in 7.0" to "removed in 8.0"
chmst 42a94a3
Merge branch '6.0-dev' into gsoc2021-35228-merge-featured
chmst 2e9e095
Change filter text
chmst 79537fe
as recommended
chmst dd99cd8
cs
chmst fab5f02
Removed conflicting code
obuisard f2f35de
Removed blank lines
obuisard 57fcf8c
cs
chmst 9aaef98
indent
chmst 1bc3719
Fix quickicons articles / featured articles
chmst 180df89
simplify query, cs
chmst e2cb935
cs
chmst 2fe0a7c
Update administrator/components/com_content/tmpl/articles/default.php
chmst e0363f1
Merge branch '6.0-dev' into gsoc2021-35228-merge-featured
chmst 577b942
Update administrator/components/com_content/src/Controller/DisplayCon…
chmst 3a34cb6
Update administrator/components/com_content/src/View/Articles/HtmlVie…
chmst 3a92795
Fix double activated menuitems when featured is active
chmst cb3a155
updates as requested
chmst 5c040e1
Merge branch '6.0-dev' into gsoc2021-35228-merge-featured
bembelimen 6cacb16
Move featured filter back to filter section
bembelimen 4f7b1bd
Redirect featured option to proper filter
bembelimen 69985cd
Implement proper feature filter in articles model
bembelimen 2555bdc
Use state to check for featured
bembelimen 3138bf2
Fix preset
bembelimen 2eb7215
Fix quickicon
bembelimen a462eee
Fix SQL files
bembelimen c0ef187
Fix pagination
bembelimen d16678e
Fix quickicon count
bembelimen e3fa82c
Fix featured filter
bembelimen dc60a07
Fix deletion of featured articles
bembelimen 1f8769b
Fix filter change for featured
bembelimen c226469
Remove unneeded extra filter output in view
bembelimen b9953ff
Merge pull request #17 from bembelimen/6.0/chmst/featured-view
chmst d24908a
Featured filter first
chmst File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2 changes: 0 additions & 2 deletions
2
administrator/components/com_admin/sql/updates/mysql/6.0.0-2024-06-01.sql
This file was deleted.
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
6
administrator/components/com_admin/sql/updates/mysql/6.0.0-2024-08-11.sql
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| -- Update link to featured | ||
|
|
||
| UPDATE `#__menu` | ||
| SET `link` = 'index.php?option=com_content&view=articles&featured=1' | ||
| WHERE `link` = 'index.php?option=com_content&view=featured' | ||
| AND `client_id` = 1; |
2 changes: 0 additions & 2 deletions
2
administrator/components/com_admin/sql/updates/postgresql/6.0.0-2024-06-01.sql
This file was deleted.
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
6
administrator/components/com_admin/sql/updates/postgresql/6.0.0-2024-08-11.sql
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| -- Update link to featured | ||
|
|
||
| UPDATE "#__menu" | ||
| SET "link" = 'index.php?option=com_content&view=articles&featured=1' | ||
| WHERE "link" = 'index.php?option=com_content&view=featured' | ||
| AND "client_id" = 1; |
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
150 changes: 0 additions & 150 deletions
150
administrator/components/com_content/forms/filter_featured.xml
This file was deleted.
Oops, something went wrong.
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.