chatterino2
Code Issues
1,672 Commits 3 Branches 0 Tags
bb6c2b6135a31b68c770abb4df3a3c277ba5cc9e
Commit Graph

97 Commits

Author SHA1 Message Date
apa420 bb6c2b6135 Cleaner flashing code (#774) 2018-10-07 10:55:44 +00: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 a2fb4ca104 reformat 2018-09-30 16:55:41 +00:00
hemirt e7f74aa8ca ignorephrase format 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
pajlada e2a7765964 Merge branch 'master' into apa-notification-on-live 2018-09-16 17:43:53 +02:00
apa420 ca5bb104db hopefully it will now compile on linux 2018-09-01 13:01:54 +02:00
apa420 01ca055763 fixed issue where when a channel was going offline it would do a toast if the channel was notified 2018-08-29 22:22:32 +02:00
apa420 c5a88f6af3 fixed stuff 2018-08-29 19:58:55 +02:00
apa420 c3065db16d highlighting whispers works better and looks better 2018-08-29 01:21:36 +02:00
apa420 6a29fbb6dc Merge branch 'master' into apa-notification-on-live 2018-08-28 23:23:46 +02:00
apa420 8ea3b6c8ee Added fakechannels 2018-08-26 13:19:09 +02: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 8f77dccb91 testing emoji because having windows 8 sucks 2018-08-24 18:38:27 +02:00
apa420 e58e76ef1e added more playsound stuff 2018-08-24 18:05:36 +02:00
fourtf af7b742a23 changed .clang-format 2018-08-15 22:46:20 +02:00
apa420 b671fc4133 Tried chaning the color of the split when a channel is live 2018-08-14 16:29:52 +02:00
apa420 93bbe33664 Cleaned some stuff up and did some things 2018-08-12 21:05:12 +02:00
apa420 320558ee63 more stuff done, does compile, changed vector for map 2018-08-12 20:21:21 +02:00
apa420 05d5709bb9 stuff does compile 2018-08-12 18:54:32 +02:00
apa420 54166ec130 temp stuff 2018-08-12 15:29:40 +02:00
fourtf f6414c9d7e remove settings and paths from Application 2018-08-12 12:56:28 +02:00
fourtf 1ec1ecd52b fixed crash when moderation buttons are enabled 2018-08-12 00:02:05 +02:00
fourtf 44f5a15da3 turning a lot of includes into forward declares 2018-08-11 22:23:06 +02:00
apa420 2de99ca9f5 update, should now be working Toasts for splitheader channels 2018-08-11 16:11:51 +02:00
fourtf c719bb6b74 categorized emtotepopup 2018-08-11 14:26:02 +02:00
apa420 77411f7012 WIP commit 2018-08-11 12:47:03 +02:00
fourtf cf9560508c improving code quality 2018-08-10 20:53:13 +02:00
fourtf edfae49cc9 simplified Image 2018-08-10 18:56:17 +02:00
apa420 125af43d90 Fixed issue, everything except the main feature work now 2018-08-10 00:15:42 +02:00
apa420 5437a6dd4d update which actually let's you compile, but doesn't properly save an item after renaming it 2018-08-10 00:04:50 +02:00
apa420 5c6d2f36b5 WIP notification settings, doesn't actually work 2018-08-09 15:41:32 +02:00
apa420 b68c7ded5f WIP notification settings, doesn't actually work 2018-08-09 15:41:03 +02:00
fourtf 381177dd24 refactored EnumFlags 2018-08-07 07:55:31 +02:00
fourtf c26422aec1 refactored MessageBuilder 2018-08-07 01:35:24 +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
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 f33cc884b2 Fixed issue with Excluded users not saving from the highlights tab (#624) 2018-07-16 17:09:29 +02:00
fourtf 1614b11e42 Refactored TwitchChannel 2018-07-15 20:28:54 +02:00
apa420 ba99d62139 Fixed /ignore and /unignore as well as give description for the command (#611) 
* Fixed /ignore and /unignore as well as give description for the command
 2018-07-13 22:23:03 +02:00
apa420 5d2be3ae2a fixed issue with timeoutbuttons #613 2018-07-13 02:06:35 +02:00
apa420 fb0cdf78cb Added description when typing /follow (#606) 
* Added description when typing /follow

* syntax fix of 1364e0e707dd6f0989291e1f399460c5a114dbb5
 2018-07-12 18:57:11 +02:00
apa420 7288c5a0b6 removed unecessary #include 2018-07-12 10:58:29 +02:00
apa420 801779b872 fixed stuff for PR 2018-07-12 10:52:18 +02:00
apa420 c26e18c2bf Added functionality of /follow and /unfollow 2018-07-12 03:54:54 +02:00
fourtf c609a9fd37 started to refactor Application 2018-07-07 11:41:13 +02:00
DatGuy1 b12c4e1d45 Add text command to display logs (#574) 
* Add text command to display logs

* Allow @username instead of username
 2018-07-07 10:25:12 +02:00
fourtf 280bb4cf8e Renamed private members 2018-07-06 19:24:35 +02:00