Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge upstream #159

Merged
merged 93 commits into from
Dec 2, 2022
Merged

Merge upstream #159

merged 93 commits into from
Dec 2, 2022

Conversation

TroyKomodo
Copy link

merge upstream

Nerixyz and others added 30 commits October 22, 2022 11:42
@Nerixyz
fix: Invalid/Dangling completion after updating input (Chatterino#4072)
457c572
@8thony @pajlada
Hide inline whispers in streamer mode (Chatterino#4076)
570746a 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
@xel86 @dnsge @pajlada
Make reply thread subtext easier to click (Chatterino#4067)
76530d0 
Co-authored-by: Daniel Sage <24928223+dnsge@users.noreply.github.com>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
@zneix
Migrated getSubage to v2 version of the API (Chatterino#4070)
f7fcc90
@pajlada
Fix .desktop icon path (Chatterino#4078)
53ec66f
@pajlada
Remove unused values from MessageLayoutContainer (Chatterino#4081)
e6e9b98
@Wissididom @pajlada
Copied and adjusted BUILDING_ON_LINUX.md from SevenTV (Chatterino#4085)
df22441 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
@Felanbird
Update IRC whisper error (Chatterino#4086)
b27d633
@dependabot
Bump ZedThree/clang-tidy-review from 0.10.0 to 0.10.1 (Chatterino#4083)
dd39bd6 
Bumps [ZedThree/clang-tidy-review](https://github.com/ZedThree/clang-tidy-review) from 0.10.0 to 0.10.1.
- [Release notes](https://github.com/ZedThree/clang-tidy-review/releases)
- [Changelog](https://github.com/ZedThree/clang-tidy-review/blob/master/CHANGELOG.md)
- [Commits](ZedThree/clang-tidy-review@v0.10.0...v0.10.1)

---
updated-dependencies:
- dependency-name: ZedThree/clang-tidy-review
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Nerixyz @pajlada
feat: Basic PubSub Manager for Live Emote Updates (Chatterino#4087)
ff684fc 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
@acdvs @pajlada
Add settings tooltips (Chatterino#3437)
fa93d63 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
@Y0dax @23rd @pajlada
Added stream titles to windows toast notifications (Chatterino#2044)
d23d5c1 
Co-authored-by: 23rd <23rd@vivaldi.net>
Co-authored-by: David Myers <dave-myers@outlook.com>
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
@pajlada
Add helper function for ensuring a function is run in the GUI thread (C…
e3af865 
…hatterino#4091)
@mohad12211
Add missing Text tag to reply message text (Chatterino#4092)
d3eed62
@brian6932
Grammar: Alias to -> Alias of (Chatterino#4093)
a033dbc
@pajlada
Include more error messaging for failed image uploads (Chatterino#4096)
abb69f6
@cbclemmer @pajlada
Migrate /chatters commands to use Helix api (Chatterino#4088)
495f3ed 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
@dnsge
Improve Appearance of Reply Curve (Chatterino#4077)
7640677
@pajlada
Fix recursive fetchChatters call (Chatterino#4097)
4196bba
@brian6932
Update OpenSSL convenience link (Chatterino#4098)
1098be1
@dnsge
Fix Reply Text Showing In Reply Thread Popup (Chatterino#4101)
36402a2
@Nerixyz @pajlada
deps[conan]: update openssl and boost on Windows (Chatterino#4100)
270a365 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
@pajlada
Update jurplel/install-qt-action GitHub Action from v2 to v3 (Chatt…
fcf3f2d 
…erino#4106)
@pajlada
Fix Twitch-specific filters not being applied (Chatterino#4107)
0500821
@pajlada
Fix uninitialized read in ChannelView's highlightedMessage_ (Chat…
e3e1845 
…terino#4109)
@pajlada
Revert "Fix Twitch-specific filters not being applied (Chatterino#4107)…
84a6e72 
…" (Chatterino#4111)
@Felanbird
Fix RapidJSON link not being https (Chatterino#4113)
f0ad606
@xel86 @pajlada
Migrate /commercial command to the Helix API (Chatterino#4094)
f00f766 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
@pajlada
Harden emote parsing (Chatterino#3885)
aac9ea5
@cbclemmer @Felanbird @pajlada
Migrate /mods command to helix API (Chatterino#4103)
e531161 
Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
fourtf and others added 15 commits November 20, 2022 20:51
@fourtf
bump to 2.4.0-beta
8279789
@Felanbird @pajlada
Fix issue with VIPs who have Asian Language display names (Chatterino…
5182625 
…#4174)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
@Nerixyz
fix: don't ignore mousePressEvent in SplitInput (Chatterino#4177)
254f89f 
Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
Fixes Chatterino#3844
@Nerixyz @pajlada
chore(msvc): replace /W3 with /W4 (Chatterino#4175)
ff4899f 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
@leon-richardt
fix: don't parent popup windows on Windows OS (Chatterino#4181)
9d1b8b0 
Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
fix Chatterino#3863
fix Chatterino#4180
@kornes
Fix low contrast of text in settings tooltip (Chatterino#4188)
b3e400a
@kornes @Felanbird @pajlada
Fix crash happening when QuickSwitcher is used with popout window (Ch…
330e0a9 
…atterino#4187)

Co-authored-by: Felanbird <41973452+Felanbird@users.noreply.github.com>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
@mohad12211 @pajlada
fix neutral elements order in multiple lines (Chatterino#4173)
fe2a9cc 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
@kornes
Fix white border appearing around maximized window (Chatterino#4190)
f2b35fb 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
fixes Chatterino#2205
@pajlada
Sort and force grouping of includes (Chatterino#4172)
032f290 
This change enforces strict include grouping using IncludeCategories

In addition to adding this to the .clang-format file and applying it in the tests/src and src directories, I also did the following small changes:

    In ChatterSet.hpp, I changed lrucache to a <>include
    In Irc2.hpp, I change common/SignalVector.hpp to a "project-include"
    In AttachedWindow.cpp, NativeMessaging.cpp, WindowsHelper.hpp, BaseWindow.cpp, and StreamerMode.cpp, I disabled clang-format for the windows-includes
    In WindowDescriptors.hpp, I added the missing vector include. It was previously not needed because the include was handled by another file that was previously included first.
    clang-format minimum version has been bumped, so Ubuntu version used in the check-formatting job has been bumped to 22.04 (which is the latest LTS)
@Nerixyz
perf: Speed Up Opening of Settings Dialog (Chatterino#4193)
a16342f 
fix Chatterino#1266
@kornes @pajlada
Fix unnecessary clears of split input selection (Chatterino#4197)
cc661d5 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
@Nerixyz
fix: iCCP - known incorrect sRGB profile (Chatterino#4199)
22bd78e 
When you start Chatterino, you get two warnings from libpng: libpng warning: iCCP: known incorrect sRGB profile.
This is because two resources shipped by Chatterino have this incorrect profile. This PR fixes that (essentially just convert file.png file.png).
@pajlada
Release v2.4.0 (Chatterino#4200)
a0f9310 
* Update make-release.md documentation

* Update changelog

* Update `com.chatterino.chatterino.appdata.xml` version

* Update `Version.hpp`

* Lint make-release.md

* Lint again
@pajlada
Fix Homebrew cask update workflow (Chatterino#4203)
1dd0693
@TroyKomodo TroyKomodo force-pushed the troy/merge-upstream branch 2 times, most recently from de12874 to e050547 Compare December 2, 2022 17:51
@Felanbird
Copy link

#include <optional> needs to be above #include <utility> instead of below #include "Paint.hpp" that'll make the formatter happy
image

@Felanbird Felanbird mentioned this pull request Dec 2, 2022
Merged
1 task
@TroyKomodo TroyKomodo force-pushed the troy/merge-upstream branch 2 times, most recently from f6b4963 to 0a39cac Compare December 2, 2022 20:18
Felanbird
Felanbird reviewed Dec 2, 2022
View reviewed changes
src/Application.cpp Outdated Show resolved Hide resolved
@TroyKomodo TroyKomodo merged commit 79c64e9 into chatterino7 Dec 2, 2022
@TroyKomodo TroyKomodo deleted the troy/merge-upstream branch December 2, 2022 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Felanbird Felanbird Felanbird left review comments

Assignees
No one assigned
Labels
no changelog entry needed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.