Commit graph

88 commits

Author SHA1 Message Date
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
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
23rd 0d8b5cad63 Added setting to disable auto unshort links. 2018-09-06 17:59:49 +03:00
pajlada 873b0b3c67
Merge pull request #693 from apa420/apa-minor
Highlighting whispers works better and looks better
2018-08-29 10:22:16 +02:00
pajlada 6eb21f4b68
Merge pull request #677 from 23rd/patch-4-link-tooltip-bttv
Added tooltip to links.
2018-08-29 01:23:17 +02:00
apa420 c3065db16d highlighting whispers works better and looks better 2018-08-29 01:21:36 +02:00
apa420 c5d5825b5a Added functionality of option of highlightsound on whisper (#692)
Fixes #640
2018-08-29 00:30:11 +02:00
apa420 6a29fbb6dc
Merge branch 'master' into apa-notification-on-live 2018-08-28 23:23:46 +02:00
23rd f8c42918a6 Added option to turn off link info tooltips. 2018-08-25 21:29:08 +03:00
Rasmus Karlsson 70199e00d2 Remove unused 'preferred emote quality' setting 2018-08-25 12:29:43 +00:00
apa420 c4679bf048 almost implemented the faekchannels, just need to fix the timer, pls help pajlada 2018-08-25 14:13:26 +02:00
apa420 e58e76ef1e added more playsound stuff 2018-08-24 18:05:36 +02:00
apa420 8d5b93fe82 push for now 2018-08-19 19:02:49 +02:00
Rasmus Karlsson a07255be2d Add ability to customize cache folder
Add an advanced settings page, currently only housing the "Cache" category

Fix #541
2018-08-19 16:26:33 +02:00
apa420 3d109a6ca3 added settings for dot next to channel name 2018-08-18 13:07:12 +02:00
fourtf 5068c9a64e Fixes #161 2018-08-15 23:48:16 +02:00
apa420 05d5709bb9 stuff does compile 2018-08-12 18:54:32 +02:00
fourtf 44f5a15da3 turning a lot of includes into forward declares 2018-08-11 22:23:06 +02:00
apa420 b68c7ded5f WIP notification settings, doesn't actually work 2018-08-09 15:41:03 +02:00
fourtf d89b62692a refined SplitHeader 2018-08-08 15:35:54 +02:00
fourtf f71ff08e68 changed to 80 max column 2018-08-06 21:17:03 +02:00
fourtf c71795da17 Merge branch '4tf' 2018-08-06 18:41:30 +02:00
apa420 43ba408568 Added functionality of customizable split headers #637 (#648)
* Added functionality of customizable split headers

* removed empty line
2018-08-06 16:42:23 +02:00
apa420 c6cfb548f5 added functionality of 'boldness-slider' #647 (#650) 2018-08-06 16:41:27 +02:00
apa420 7e3292e900 Dynamic lowercase link setting - did request (#612)
* Added functionality of dynamic lowercase links

* fixed fourtfs request, lajamerr has a better solution though

* Fix matching and lowercasing of domain only.

* Update TwitchMessageBuilder.cpp

Added what fourtf asked in a good  way
NOTE: I removed a : from the regex since otherwise it would fuck up

* fixed stuff and removed debugs

* fixed stuff
2018-08-06 16:40:12 +02:00
fourtf c2e2dfb577 this commit is too big 2018-08-02 14:23:27 +02:00
fourtf 3b3c5d8d75 added code to handle a single connection 2018-07-16 17:23:41 +02:00
apa420 9dda0a05fa @boldUsernames now work dynamically with the setting (#607) 2018-07-12 18:56:54 +02:00
fourtf 280bb4cf8e Renamed private members 2018-07-06 19:24:35 +02:00
fourtf eeb514c444 minor changes 2018-07-05 18:17:12 +02:00
apa420 318e8b6234 Bold @username 2018-07-04 14:01:39 +02:00
DatGuy1 e9fb5971da Add option to make link domains lowercase (#557) 2018-07-04 13:53:49 +02:00
Rasmus Karlsson 03b7fae09e Refactor highlight blacklist to use the model system
Fix #560
2018-07-04 11:45:10 +00:00
hemirt 37d3f5a24a last message pattern 2018-07-03 13:44:59 +02:00
fourtf c3c2b934ba moved ChatterinoSetting into src/common 2018-06-28 20:06:09 +02:00
fourtf 8ced5a1e25 renamed *Manager classes 2018-06-28 19:51:07 +02:00
fourtf 2df142bd50 renamed *Manager files 2018-06-28 19:46:45 +02:00
Renamed from src/singletons/SettingsManager.hpp (Browse further)