noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity
1662 commits 38 branches 37 tags 62 MiB
Commit graph

1272 commits

Author SHA1 Message Date
apa420
1937e69830
Merge branch 'master' into apa-flashtaskbar 2018-10-06 18:24:07 +02:00
apa420
dbd730487b Cleaner code 2018-10-06 18:20:07 +02:00
apa420
5dce212cb4 Added functionality of making the flash taskbar last until the app is focused again (#767) 
* Added functionality of making the flash taskbar last until chatterino is focused again

* added it for every flash taskbar

Fixes #760
 2018-10-06 15:51:13 +00:00
Rasmus Karlsson
98c1d61e78 reformat 2018-10-06 17:41:23 +00:00
Rasmus Karlsson
67d9910bd5 Fix uninitialized memory usage error 2018-10-06 17:41:23 +00:00
Rasmus Karlsson
a196129171 Fix wrong format syntax 2018-10-06 17:41:23 +00:00
apa420
aac2afedf5 added it for every flash taskbar 2018-10-06 17:06:38 +02:00
apa420
29955bd595 Added functionality of making the flash taskbar last until chatterino is focused again 2018-10-06 16:58:41 +02:00
Felix Schmid
300852bbf5 added the settings shortcut to the keybindings window 2018-10-06 14:22:07 +00:00
pajlada
099fd88098
Merge pull request #743 from 23rd/patch-15-scroll-tabs 
Added scrolling over tabs with wheel to switch channels.
 2018-10-06 12:32:37 +00:00
23rd
871fde5f72 Reversed scroll behavior. 2018-10-06 14:18:27 +03:00
23rd
9f5da50bce Moved creating UserInfoPopup in one place. (#761) 
* Moved creating UserInfoPopup in one place.

* Added forgotten 'this'.

Fixes #759
 2018-10-06 10:13:14 +00:00
23rd
1fcfd8b13a Removed few-step scroll. 2018-10-05 23:57:02 +03:00
Ckat
b4683c5b35 add menu option to reload subscriber emotes 2018-10-05 19:52:33 +00:00
Ruben Anders
79f64a21c3 Fix typo: "authority badges" 2018-10-05 19:42:27 +00:00
pajlada
1f1175a034
Merge pull request #746 from DatGuy1/patch-3 
Don't change split header for whisper

Fixes #691
 2018-10-05 19:41:06 +00:00
pajlada
c4c4a8d575
Merge pull request #748 from Cranken/windowPos 
Fixed window moving 1px to the left each restart.
 2018-10-05 19:39:41 +00:00
Rasmus Karlsson
c6bca8e97b Allow addMessage to override message flags 2018-10-05 21:33:01 +00:00
pajlada
57eb8f9eb7
Merge pull request #744 from Chronophylos/custom-highlight-color 
Add hidden setting for highlight color
 2018-10-05 18:41:31 +00:00
Cranken
41ba06ffc2 Fixed window moving 1px to the left each restart. 2018-10-04 11:07:46 +02:00
Rasmus Karlsson
39a8e8193c fix whispers crashing if they contained twitch badges 2018-10-02 19:27:08 +02:00
DatGuy1
ad949dc1f6
Don't change split header for whisper 
Prevent normal channel split headers from changing colours when receiving a whisper
 2018-10-02 10:45:26 +03:00
Rasmus Karlsson
c872db3d9f add chatterino nightly version string to nightly builds 2018-10-01 21:44:23 +02:00
Chronophylos
378ea157a1 Add hidden setting for highlight color 2018-10-01 13:05:50 +02:00
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
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
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 ea07bbef0b
Merge: 0b36f436 5cfcf114
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 20:05:14 2018 +0200

    Merge branch 'blacklist' into blacklistnew

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

    rename second pattern to replacement

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

    delete out commented code

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

    fix replacement with emotes issues

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

    fix build

commit ad711b4c15
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 e8e059f847
Author: hemirt <hemirt@email.cz>
Date:   Sun Aug 19 00:25:58 2018 +0200

    add replaced emotes into twitchEmotes

commit a63454f00d
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 e7f2f39737
Author: hemirt <hemirt@email.cz>
Date:   Sat Aug 11 21:54:01 2018 +0200

    emotedata

commit f00d3da537
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 00c9fa080a
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 4385fcd13f
Author: hemirt <hemirt@email.cz>
Date:   Sun Jul 8 21:09:14 2018 +0200

    remove commented code

commit 1834342f74
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 d3b6e294ed
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
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