chatterino2
Code Issues
1,636 Commits 3 Branches 0 Tags
7122e478174545bd2bccd8d1aa7d49ae99cd6d8e
Commit Graph

1636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
23rd 7122e47817 Added scrolling over tabs with wheel to switch channels. 2018-10-01 03:32:20 +03:00
Rasmus Karlsson cd571a7e25 clean up warnings 2018-09-30 17:15:17 +00:00
Rasmus Karlsson a2fb4ca104 reformat 2018-09-30 16:55:41 +00:00
pajlada d79a8b81b1 Merge pull request #736 from TETYYS/message-limit-fix 
Changed LimitedQueue::space() to signed value, eliminating underflows
 2018-09-30 14:50:47 +00:00
pajlada 101e53c5dd Merge pull request #741 from Cranken/saveHighlight 
Now saves the enable highlight on new message tab setting.
 2018-09-30 13:42:36 +00:00
Cranken 22d009962d Now saves the enable highlight on new message tab setting. 2018-09-30 15:02:30 +02:00
pajlada 0e794f5a6d Merge pull request #739 from Cranken/enableHighlightTab 
Option to disable highlight of tab; disabled switching tabs by only right clicking
 2018-09-30 12:30:52 +00:00
Cranken f6e6916263 Fixed variable naming style. 2018-09-30 14:31:00 +02:00
Cranken 753b2cf139 Fixed messages getting added multiple times after roomstate change. 2018-09-30 12:17:58 +00:00
Rasmus Karlsson 141fdc7ca8 update settings/signals version again 2018-09-30 13:56:58 +00:00
tetyys 612c9c94dc Clear scroll bar when switching channels in a ChannelView 2018-09-30 11:53:17 +00:00
Cranken abb01b54f5 Fixed clang format. 2018-09-30 13:44:41 +02:00
hemirt e7f74aa8ca ignorephrase format 2018-09-30 11:42:23 +00:00
hemirt 6ca4f661a7 clangformat 2018-09-30 11:42:23 +00:00
hemirt 4eefeb80e7 remove dead line 2018-09-30 11:42:23 +00:00
hemirt 3184234c19 Squashed commit of the following: 
commit ea07bbef0be589cc5412bff0a25735ac713128e3
Merge: 0b36f436 5cfcf114
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 20:05:14 2018 +0200

    Merge branch 'blacklist' into blacklistnew

commit 5cfcf114b65ea7c0fca9654393ac2faa78610098
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 20:00:16 2018 +0200

    rename second pattern to replacement

commit f08cc4cf88c49140a282d3d29af5ad8e7179bb7c
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 19:52:30 2018 +0200

    delete out commented code

commit 1acb1278aa0109359e0e349ae240d10b34de9d34
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 19:52:03 2018 +0200

    fix replacement with emotes issues

commit 646268ab1883a955291f152029fa37f4416e681e
Author: hemirt <hemirt@email.cz>
Date:   Sun Aug 19 01:06:36 2018 +0200

    fix build

commit ad711b4c15ef0660c554af5ceea82397769a2313
Merge: e8e059f8 8bcc9c48
Author: hemirt <hemirt@email.cz>
Date:   Sun Aug 19 00:52:38 2018 +0200

    Merge branch 'master' of https://github.com/fourtf/chatterino2 into blacklist

commit e8e059f8473271128086c5230cf1c40b235af380
Author: hemirt <hemirt@email.cz>
Date:   Sun Aug 19 00:25:58 2018 +0200

    add replaced emotes into twitchEmotes

commit a63454f00de479cee1ab1eca18a8b4ab93e37d52
Merge: e7f2f397 63eaf3b9
Author: hemirt <hemirt@email.cz>
Date:   Sat Aug 11 22:38:16 2018 +0200

    Merge branch 'master' of https://github.com/fourtf/chatterino2 into blacklist

commit e7f2f397378d0582d989ff8fcbe83bcec41449a1
Author: hemirt <hemirt@email.cz>
Date:   Sat Aug 11 21:54:01 2018 +0200

    emotedata

commit f00d3da537ec14aebd9cbb84d63f7b16c196f199
Author: hemirt <hemirt@email.cz>
Date:   Sat Jul 28 19:53:55 2018 +0200

    rename variables to fit better, emotes in capture groups from regex work

commit 00c9fa080aeb8a4a187743d708ba139cbed5a849
Author: hemirt <hemirt@email.cz>
Date:   Mon Jul 9 19:53:53 2018 +0200

    add case sensitivity checkbox and fix validity issues due to isValid
    that checked regex

commit 4385fcd13fe6e011b91a3f4a29fd440d019fc499
Author: hemirt <hemirt@email.cz>
Date:   Sun Jul 8 21:09:14 2018 +0200

    remove commented code

commit 1834342f74c4fbff38b81fa2c2fcfd6c55adc0d5
Author: hemirt <hemirt@email.cz>
Date:   Sun Jul 8 21:03:13 2018 +0200

    IgnorePhrase replacement

    also removes twitch emotes info about the matched and changed parts and
    shifts positions of other emotes from emote infos to the corresponding new
    position

commit d3b6e294ed38fa8587c367c5da6f257641c28b86
Author: hemirt <hemirt@email.cz>
Date:   Sun Jul 8 16:21:33 2018 +0200

    ignore phrases
 2018-09-30 11:42:23 +00:00
apa420 86024ade24 fixes that timeout/ban messages didn't show (#728) 2018-09-30 10:50:47 +00:00
Cranken 839f78e19b Update regardless of button. 2018-09-29 22:35:33 +02:00
Cranken 036abd4852 Don't switch tab if only right mouse is pressed on other tab. 2018-09-29 22:30:31 +02:00
Cranken f25f31a837 Added button on tab to enable/disable highlighting. 2018-09-29 22:24:48 +02:00
pajlada 3868feb0fa Update README.md 2018-09-27 11:00:28 +02:00
tetyys 45d0bd6299 Changed LimitedQueue::space() to signed value, eliminating underflows 2018-09-26 22:21:38 +03:00
23rd 4c5a0472cd Activate opened emote popup. (#733) 2018-09-25 11:37:24 +00:00
Rasmus Karlsson 0b36f43611 make the list of ignored usernames into a set instead, making it more maintanable 
change "open twitch channel in new split" menu action text
 2018-09-21 22:46:00 +02:00
23rd 9a6650b56c Added button in menu to join to channel. (#724) 2018-09-21 20:35:14 +02:00
apa420 a3a7317e62 [WIP] Fixing stuff in light/white theme (#723) 
* fixed color in light/white them when a tab lights pink

* fixes background color of chatterino in white/light-themes

* Fixed emoji-button in light/white-theme

* added light/white-theme addsplit-button

* forgot to add the image-file
 2018-09-21 20:18:52 +02:00
Rasmus Karlsson a733b6975d make emote popup emote insertions less risky 2018-09-21 22:01:21 +02:00
Rasmus Karlsson 92bf1adf88 fix tabbing usernames with @ 2018-09-21 13:57:49 +02:00
23rd eb230494a6 Dont add scrollbar highlights in /mentions. 2018-09-21 13:54:12 +02:00
apa420 d751d1939e used different linebreaking as suggested from 23rd 2018-09-21 13:43:33 +02:00
apa420 f4ba61efc3 fixed tooltip on twitch emotes in a cheesy fasion 2018-09-21 13:43:33 +02:00
23rd 579c6b9bf9 Trim channelname in join channel window. 2018-09-21 13:43:10 +02:00
apa420 ea17d23224 apa fixed custom subscriber badges tooltip 2018-09-20 21:59:34 +02:00
Rasmus Karlsson 56b1fd6913 Increase timeout on FFZ channel emote requests 
We might want to send some message upon these sort of errors happening

Fix #709
 2018-09-20 13:39:19 +02:00
Rasmus Karlsson 8eba7a0182 add method to NetworkRequest to fetch the underlying url string 2018-09-20 13:37:20 +02:00
Rasmus Karlsson 641c5822d7 fix various warnings 2018-09-20 13:09:37 +02:00
23rd 30f51d8137 Removed useless arg from appendTwitchEmote(). 2018-09-20 10:57:36 +02:00
23rd f813c2de3b Improved insertion of emotes from popup. 2018-09-20 10:57:22 +02:00
23rd 88477829ef Replaced size() check with empty(). 2018-09-19 13:01:22 +02:00
23rd acd03a3280 Dont show empty categories in viewer list. 2018-09-19 13:01:22 +02:00
pajlada 6a9252ac12 Merge pull request #711 from 23rd/update-contributor 
Update contributors.txt.
 2018-09-19 12:51:32 +02:00
23rd 3deffde0ee Update contributors.txt. 2018-09-19 03:41:44 +03:00
fourtf 47c93fb118 fixed memory corruption 2018-09-17 12:51:16 +02:00
pajlada 1d097c3344 Merge pull request #708 from qubard/patch-2 
replace malloc with make_unique (minor)
 2018-09-17 10:45:53 +02:00
pajlada d40d0e922e Update contributors.txt 2018-09-17 10:45:12 +02:00
cub 4c5f2e41e5 replace malloc with make_unique 2018-09-17 02:45:11 -03:00
Rasmus Karlsson bad9d5e521 Add missing WinToast submodule 2018-09-16 20:01:28 +02:00
Rasmus Karlsson a00921a220 update settings and signals library versions 2018-09-16 19:53:13 +02:00
pajlada 45988fc510 Merge pull request #678 from apa420/apa-notification-on-live 
Notification when a stream goes live
 2018-09-16 17:44:39 +02:00
pajlada e2a7765964 Merge branch 'master' into apa-notification-on-live 2018-09-16 17:43:53 +02:00