Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again#3958
Merged
FreeTubeBot merged 2 commits intoFreeTubeApp:developmentfrom Aug 29, 2023
Conversation
…red by name again
PikachuEXE
requested review from
ChunkyProgrammer,
absidue,
efb4f5ff-1298-471a-8973-3d47447115dc and
kommunarr
github-actions
bot
added
the
PR: waiting for review
ChunkyProgrammer
previously approved these changes
Aug 28, 2023
Collaborator
|
suggestion: Could you add a code comment at the top of the file explaining why the order must be maintained? |
efb4f5ff-1298-471a-8973-3d47447115dc
previously approved these changes
Aug 28, 2023
PikachuEXE
dismissed stale reviews from efb4f5ff-1298-471a-8973-3d47447115dc and ChunkyProgrammer
via
1f5ab19
Member
Author
|
@jasonhenriquez @efb4f5ff-1298-471a-8973-3d47447115dc @ChunkyProgrammer |
ChunkyProgrammer
approved these changes
Aug 29, 2023
efb4f5ff-1298-471a-8973-3d47447115dc
approved these changes
Aug 29, 2023
github-actions
bot
removed
the
PR: waiting for review
PikachuEXE
added a commit
to PikachuEXE/FreeTube
that referenced
this pull request
Aug 29, 2023
* development: (65 commits) Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again (FreeTubeApp#3958) Replace labeler workflow with GH labeler (FreeTubeApp#3966) Fix HTML styling (e.g., hashtag links) showing up as raw HTML in descriptions (FreeTubeApp#3946) Make certain controls non-selectable / non-draggable - Part II (FreeTubeApp#3957) Translated using Weblate (German) Show video list buttons on hover or focus (FreeTubeApp#3954) Bump @babel/eslint-parser from 7.22.10 to 7.22.11 (FreeTubeApp#3962) Bump youtubei.js from 6.0.0 to 6.1.0 (FreeTubeApp#3965) Bump eslint-plugin-n from 16.0.1 to 16.0.2 (FreeTubeApp#3964) Bump eslint from 8.47.0 to 8.48.0 (FreeTubeApp#3963) Bump marked from 7.0.4 to 7.0.5 (FreeTubeApp#3961) Bump @babel/core from 7.22.10 to 7.22.11 (FreeTubeApp#3959) Make certain controls non-selectable / non-draggable (FreeTubeApp#3947) Add updated video resolution to auto selector (FreeTubeApp#3935) Fix Save icon blocking issue (FreeTubeApp#3951) * Update URL parser to recognize youtube.com/live/xxxxxxx (FreeTubeApp#3930) Translated using Weblate (Czech) Translated using Weblate (Portuguese) Translated using Weblate (Polish) Translated using Weblate (Arabic) ... # Conflicts: # src/renderer/main.js # src/renderer/scss-partials/_ft-list-item.scss
PikachuEXE
added a commit
to PikachuEXE/FreeTube
that referenced
this pull request
Aug 29, 2023
* feature/playlist-2023-05: (77 commits) * Update add to playlist prompt to add sort options ! Fix user playlist view incorrectly sorted playlists by latest updated first when filtered ! Fix add to play prompt max width * Update sorting options labels Make constants imported from @fortawesome/free-solid-svg-icons ordered by name again (FreeTubeApp#3958) Replace labeler workflow with GH labeler (FreeTubeApp#3966) ! Fix unable to visit previous video when playing first video in a playlist * Update upcoming video to allow saving in playlist * Show filtering input & sorting element when no. of playlist > 1 Fix HTML styling (e.g., hashtag links) showing up as raw HTML in descriptions (FreeTubeApp#3946) Make certain controls non-selectable / non-draggable - Part II (FreeTubeApp#3957) Translated using Weblate (German) Show video list buttons on hover or focus (FreeTubeApp#3954) Bump @babel/eslint-parser from 7.22.10 to 7.22.11 (FreeTubeApp#3962) Bump youtubei.js from 6.0.0 to 6.1.0 (FreeTubeApp#3965) Bump eslint-plugin-n from 16.0.1 to 16.0.2 (FreeTubeApp#3964) Bump eslint from 8.47.0 to 8.48.0 (FreeTubeApp#3963) Bump marked from 7.0.4 to 7.0.5 (FreeTubeApp#3961) Bump @babel/core from 7.22.10 to 7.22.11 (FreeTubeApp#3959) Make certain controls non-selectable / non-draggable (FreeTubeApp#3947) ...
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.
Pull Request Type
Related issue
"Issue" introduced by #3865
Description
When I try to merge
developmentinto my playlist branchI found duplicate icon constant entries due to new constants added in #3865 not ordered properly
This PR fixes it
Screenshots
Look at code diff is enough
Testing
None needed
Desktop
Additional context