forked from Chatterino/chatterino2
-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into chatterino7
Now we're on commit d6b5921; Changes from upstream we pulled: - Major: Added username autocompletion popup menu when typing usernames with an @ prefix. (Chatterino#1979, Chatterino#2866) - Minor: The /live split now shows channels going offline. (Chatterino#2880) - Minor: Now shows deletions of messages like timeouts (Chatterino#1155, Chatterino#2841, Chatterino#2867, Chatterino#2874) - Bugfix: Moderation buttons now show the correct time unit when using units other than seconds. (Chatterino#1719, Chatterino#2864) - Bugfix: Fixed bit and new subscriber emotes not (re)loading in some rare cases. (Chatterino#2856, Chatterino#2857)
- Loading branch information
Showing
25 changed files
with
493 additions
and
209 deletions.
There are no files selected for viewing
This file contains 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 |
---|---|---|
|
@@ -81,7 +81,7 @@ jobs: | |
- name: Enable Developer Command Prompt | ||
if: startsWith(matrix.os, 'windows') | ||
uses: ilammy/msvc-dev-cmd@v1.8.1 | ||
uses: ilammy/msvc-dev-cmd@v1.9.0 | ||
|
||
- name: Build (Windows) | ||
if: startsWith(matrix.os, 'windows') && matrix.build-system == 'qmake' | ||
|
@@ -113,7 +113,7 @@ jobs: | |
- name: Upload artifact (Windows) | ||
if: startsWith(matrix.os, 'windows') | ||
uses: actions/[email protected].3 | ||
uses: actions/[email protected].4 | ||
with: | ||
name: chatterino-windows-x86-64-${{ matrix.qt-version }}-${{ matrix.build-system }}.zip | ||
path: build/chatterino-windows-x86-64.zip | ||
|
@@ -170,7 +170,7 @@ jobs: | |
|
||
- name: Upload artifact (Ubuntu) | ||
if: startsWith(matrix.os, 'ubuntu') | ||
uses: actions/[email protected].3 | ||
uses: actions/[email protected].4 | ||
with: | ||
name: Chatterino-x86_64-${{ matrix.qt-version }}-${{ matrix.build-system }}.AppImage | ||
path: build/Chatterino-x86_64.AppImage | ||
|
@@ -215,7 +215,7 @@ jobs: | |
|
||
- name: Upload artifact (MacOS) | ||
if: startsWith(matrix.os, 'macos') | ||
uses: actions/[email protected].3 | ||
uses: actions/[email protected].4 | ||
with: | ||
name: chatterino-osx-${{ matrix.qt-version }}-${{ matrix.build-system }}.dmg | ||
path: build/chatterino-osx.dmg | ||
|
@@ -239,32 +239,32 @@ jobs: | |
Nightly Build | ||
prerelease: true | ||
|
||
- uses: actions/[email protected].9 | ||
- uses: actions/[email protected].10 | ||
with: | ||
name: chatterino-windows-x86-64-5.15.2-qmake.zip | ||
path: windows/ | ||
|
||
- uses: actions/[email protected].9 | ||
- uses: actions/[email protected].10 | ||
with: | ||
name: chatterino-windows-x86-64-5.15.2-cmake.zip | ||
path: windows-cmake/ | ||
|
||
- uses: actions/[email protected].9 | ||
- uses: actions/[email protected].10 | ||
with: | ||
name: Chatterino-x86_64-5.15.2-qmake.AppImage | ||
path: linux/ | ||
|
||
- uses: actions/[email protected].9 | ||
- uses: actions/[email protected].10 | ||
with: | ||
name: Chatterino-x86_64-5.15.2-cmake.AppImage | ||
path: linux-cmake/ | ||
|
||
- uses: actions/[email protected].9 | ||
- uses: actions/[email protected].10 | ||
with: | ||
name: chatterino-osx-5.15.2-qmake.dmg | ||
path: macos/ | ||
|
||
- uses: actions/[email protected].9 | ||
- uses: actions/[email protected].10 | ||
with: | ||
name: chatterino-osx-5.15.2-cmake.dmg | ||
path: macos-cmake/ | ||
|
This file contains 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 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 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 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 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 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 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 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 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.