Commit graph

3296 commits

Author SHA1 Message Date
Leon Richardt
b06eb9df83 Normalize line endings in already existing files 2019-09-08 22:27:57 +02:00
fourtf
3404cc503c fixed compile on unix 2019-09-08 22:01:14 +02:00
Leon Richardt
8064f8a49e Add .gitattributes file to normalize line endings
This should make sure that line endings for text files are converted to
LF.

Some reading: https://git-scm.com/docs/gitattributes#_effects
2019-09-08 22:01:12 +02:00
fourtf
e1a9a437f1 fixed pingsound not playing sometimes 2019-09-08 21:57:14 +02:00
fourtf
4f356f80cf BaseWindow smol refactor 2019-09-08 21:45:46 +02:00
fourtf
3158ed4085 fixed user popup size issues 2019-09-08 20:05:40 +02:00
fourtf
343cd3970a bump version 2019-09-08 18:46:57 +02:00
fourtf
24a1996a68 fix project file 2019-09-08 18:17:18 +02:00
fourtf
cf23838099 added irc support 2019-09-08 18:06:43 +02:00
fourtf
47e7944adf
Merge pull request #1298 from apa420/apa-bits
Fixed cheers not showing up in chat
2019-09-08 18:03:25 +02:00
fourtf
9f1eb654fd
Merge branch 'master' into apa-bits 2019-09-08 18:02:58 +02:00
apa420
0c6a26d897 IFDEF QT_DEBUG 2019-09-08 17:40:30 +00:00
apa420
ffc483049c Pepega 2019-09-08 17:36:26 +00:00
apa420
0eb633cfa0 Removed some examples 2019-09-08 17:31:00 +00:00
apa420
3f411805b7 Forgot to add file 2019-09-08 17:27:04 +00:00
apa420
289811dc7d Moved example cheers to new file 2019-09-08 17:25:42 +00:00
apa420
5c602fea94 Resolved review 2019-09-08 16:01:38 +00:00
fourtf
c6a05f289d removed useless table column in user highlights 2019-09-08 15:10:10 +02:00
fourtf
87c0ff76e7 added setting to open links in incognito by default 2019-09-08 14:59:51 +02:00
fourtf
9d2665ab17 fixed minimized and maximized size not saving on windows 2019-09-08 14:25:01 +02:00
Rasmus Karlsson
94048595f6 Split parseChannelResponse into two functions: parseModBadge and
parseChannelEmotes
2019-09-08 14:08:18 +02:00
Rasmus Karlsson
862164bc2b make ffz custom mod badge atomic 2019-09-08 14:08:18 +02:00
Rasmus Karlsson
2cd07435bd Remove more unused includes 2019-09-08 14:08:18 +02:00
Rasmus Karlsson
57ba829775 Remove previously added includes to Image 2019-09-08 14:08:18 +02:00
Rasmus Karlsson
dbce128cc3 Remove "custom on success" logic from Image.
Create a new message element and message layout element type for mod badges.
2019-09-08 14:08:18 +02:00
Rasmus Karlsson
256a65a12e Load mod badge information from the FFZ API instead of assuming the URL.
This lets us load all sizes of the emote if they are available.

Channel with all versions of the mod badge: https://api.frankerfacez.com/v1/room/pajlada
Channel with only one version of the mod badge: https://api.frankerfacez.com/v1/room/apa420
Channel with no mod badge: https://api.frankerfacez.com/v1/room/forsen
2019-09-08 14:08:18 +02:00
apa420
c08eaa4640 Higher cheer tiers now show and added tests 2019-09-08 13:40:11 +02:00
apa420
cd64b5eff5 Removed old tests 2019-09-08 12:47:36 +02:00
apa420
48fcc1a1a1 Fixed cheers not showing up in chat Fixes #1031 2019-09-08 12:45:25 +02:00
fourtf
4ec10e720c adjusted size of user switch popup 2019-09-08 12:43:12 +02:00
fourtf
b14154a811 Fixes #996 can't ctrl+c in search popup 2019-09-08 12:31:27 +02:00
TranRed
21f65b716d Merge branch 'Ch2Usercard' of https://github.com/TranRed/chatterino2 into Ch2Usercard 2019-09-08 12:05:46 +02:00
TranRed
d3c4d4b8cf moved anonymous namespace into chatterino namespace 2019-09-08 12:05:41 +02:00
pajlada
dd996d1b8a
Merge pull request #1281 from Chatterino/logsGtSearch
Allow searching in LogsPopup
2019-09-08 10:59:13 +02:00
pajlada
4846479d36
Merge pull request #1295 from leon-richardt/regex-case-sensitivity
Add Setting for Case-Sensitivity in Highlights
2019-09-08 10:37:35 +02:00
Leon Richardt
a62b7ac094 Add setting for case-sensitivity in highlights 2019-09-07 19:01:52 +02:00
fourtf
a268abfd4c Allow searching in LogsPopup 2019-09-04 00:29:58 +02:00
fourtf
9ee286f60f Fixes #1279 bttv global V3 2019-09-03 23:32:22 +02:00
fourtf
69aa5db2be changed version format 2019-09-03 19:54:17 +02:00
fourtf
3e85a29ab6 2.1.4 Beta 1 2019-09-03 19:19:57 +02:00
Rasmus Karlsson
f94b44188d Use BTTV V3 API
Fixes #1275
2019-09-03 15:09:49 +02:00
fourtf
1c0ed6b1aa slightly changed layout for logs and cache 2019-09-03 13:09:33 +02:00
fourtf
577e2e0a21 moved cache into general page 2019-09-03 12:46:22 +02:00
fourtf
41a49b854e fixed autogenerated resources formatting 2019-09-03 12:07:52 +02:00
fourtf
299cc84e04 fixed compilation 2019-09-03 12:02:58 +02:00
fourtf
6aa6e084af removed unused settings pages 2019-09-03 11:49:44 +02:00
fourtf
ac26bd8d2d fixed "open appdata button" always showing 2019-09-03 11:38:15 +02:00
fourtf
ab816e18bd Merge branch 'search-settings' 2019-09-03 11:28:10 +02:00
fourtf
3ab40b280b fixed some margins 2019-09-03 11:24:40 +02:00
fourtf
f7ee778af6 some style changes to settings 2019-09-03 11:15:38 +02:00