Commit graph

1723 commits

Author SHA1 Message Date
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
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
apa420 23cf815219 Which badges that are shown are now customizable #282 (#696) 2018-09-16 17:42:30 +02:00
apa420 56aac47fde fixed chatterino badges (#698)
* fixed chatterino badges
2018-09-16 17:27:51 +02:00
pajlada e332564e01
Merge pull request #702 from 23rd/patch-10-unshort-links
Added option of auto unshort links.
2018-09-16 17:24:48 +02:00
23rd 0d8b5cad63 Added setting to disable auto unshort links. 2018-09-06 17:59:49 +03:00
23rd 5f19a57f5a Refresh links of new messages.
As I understand links update when all message snapshots update, so we need to refresh url manually via signal.
2018-09-06 17:11:25 +03:00
23rd 2d1701cf86 Fixed build. 2018-09-06 13:54:28 +03:00
23rd fe24d09009 Replace url of link with new one from json. 2018-09-05 15:37:51 +03:00
Rasmus Karlsson 83dce820d8 Make directoriy ignoring more intelligent
Replace path stringifications with as_posix function, which will make
the generation reliable on both unix and windows systems
2018-09-05 01:26:17 +02:00
fourtf 018fe2ab10 fixed some shtuff 2018-09-04 22:29:21 +02:00
fourtf 1d16c0cf77 fixed crasherino 2018-09-04 22:05:27 +02:00
fourtf 1d682c4a93 added add split button 2018-09-04 21:39:54 +02:00
fourtf 3f4e9cdf91 added text for empty categories in emote popup 2018-09-04 20:09:06 +02:00
pajlada 12670e51b7
Merge pull request #697 from 23rd/patch-9-clear-highlights-scroll
Clear highlights scrollbar with messages.
2018-09-02 22:33:38 +02:00