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
2334 commits 38 branches 37 tags 62 MiB
Commit graph

408 commits

Author SHA1 Message Date
Chronophylos
378ea157a1 Add hidden setting for highlight color 2018-10-01 13:05:50 +02:00
Rasmus Karlsson
cd571a7e25 clean up warnings 2018-09-30 17:15:17 +00:00
Cranken
22d009962d Now saves the enable highlight on new message tab setting. 2018-09-30 15:02:30 +02: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
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
641c5822d7 fix various warnings 2018-09-20 13:09:37 +02:00
fourtf
47c93fb118 fixed memory corruption 2018-09-17 12:51:16 +02:00
cub
4c5f2e41e5
replace malloc with make_unique 2018-09-17 02:45:11 -03: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
apa420
ca5bb104db hopefully it will now compile on linux 2018-09-01 13:01:54 +02:00
apa420
05d0b20919 I checked the wrong filepath 2018-08-31 18:18:05 +02:00
apa420
5555c41d7e fixed toasts for all platforms 2018-08-29 23:39:02 +02:00
apa420
c5a88f6af3 fixed stuff 2018-08-29 19:58:55 +02: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
apa420
15bcb5a2fb Initially done with PR 2018-08-26 13:49:15 +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
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
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
21c4880ace for pajlada 2018-08-19 15:09:00 +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
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
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
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
7a9af4ae84 moved menu code to ripple effect button 2018-08-07 23:46:00 +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
35d462d1f1 worked on Image 2018-08-06 18:25:47 +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
Rasmus Karlsson
f1af162dab clean up some includes 2018-07-15 12:03:41 +00:00
Rasmus Karlsson
22bf008bdf Update new settings library version 2018-07-15 11:03:25 +00:00
apa420
12093d1bb6 Adding elements to the preview in the look tab (#605) 
* fixes issue #584

* Added different elements to the preview in the look tab
 2018-07-12 18:58:56 +02:00
apa420
9dda0a05fa @boldUsernames now work dynamically with the setting (#607) 2018-07-12 18:56:54 +02:00
Rasmus Karlsson
926a753a54 Load twitch emotes on initialize as well 
Fix #581
 2018-07-07 21:55:09 +02:00
fourtf
6bf7ba1ebe fixed compilation 2018-07-07 12:03:37 +02:00
fourtf
c609a9fd37 started to refactor Application 2018-07-07 11:41:13 +02:00
Rasmus Karlsson
6a418e6e59 Refactor NetworkRequest class 
Add followUser and unfollowUser methods to TwitchAccount
 2018-07-07 11:09:27 +00:00
fourtf
280bb4cf8e Renamed private members 2018-07-06 19:24:35 +02:00
fourtf
aa3df2e6d8 refactored Channel 2018-07-06 17:30:12 +02:00
fourtf
741c1f7820 refactored Window 2018-07-06 17:03:57 +02:00
fourtf
eeb514c444 minor changes 2018-07-05 18:17:12 +02:00
fourtf
f2238729f1 worked on the UpdatePromptDialog 2018-07-05 11:42:40 +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
ef4c7dbe60 Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-07-03 17:21:41 +02:00
Rasmus Karlsson
e757a6504b Run clang-format-all.sh 2018-07-03 15:20:00 +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
86347dc63e renamed Themes to Theme 2018-06-28 20:03:04 +02:00
fourtf
c01d1ed732 step 1: push, step 2: try to compile 2018-06-28 19:57:06 +02:00
fourtf
848bbc71aa removed that pile of garbage IrcManager 2018-06-28 19:54:40 +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
fourtf
5604ae6a67 removed functions from SettingsManager that shouldn't be there 2018-06-28 19:38:57 +02:00
fourtf
37be58ebcf fixed browser extensions not working when opening the browser before 
chatterino
 2018-06-27 22:56:56 +02:00
fourtf
08e552f5f6 ran clang-format on all files 2018-06-26 17:20:03 +02:00
fourtf
6ee1fc303e removed SplitColumn 2018-06-26 17:16:58 +02:00
fourtf
54eb07e116 removed namespaces 2018-06-26 17:06:17 +02:00
fourtf
2df0566492 removed namespaces 2018-06-26 16:37:59 +02:00
fourtf
15abedd869 moved files into src/common 2018-06-26 15:33:51 +02:00
fourtf
0bc08a364c created directory for dialogs 2018-06-26 15:11:45 +02:00
fourtf
22f528cd21 put all split widgets inside the same directory 2018-06-26 14:39:22 +02:00
fourtf
a9bf9cf722 rename #3 2018-06-26 14:09:39 +02:00
fourtf
c9722b9780 rename #2 2018-06-26 13:24:55 +02:00
fourtf
ec04f10895 rename #1 2018-06-26 13:23:57 +02:00
fourtf
63c213a36a fixed spelling of "separate" 2018-06-24 18:32:00 +02:00
fourtf
a91ac5cdf0 channged piss color to blue 2018-06-23 23:48:54 +02:00
fourtf
89d9076715 polishing for the update 2018-06-23 22:17:57 +02:00
Rasmus Karlsson
b2f454aca4 Change header color when split is active 
Colors might need to change but they work for now

Fix #495
 2018-06-23 11:54:00 +00:00
fourtf
e534bdfeca update manager 2018-06-22 10:22:25 +02:00
fourtf
5155039293 added #ifdef back in for windows updates 2018-06-21 23:03:13 +02:00
fourtf
8f34a0af59 fixed the updating mechanism 2018-06-21 23:02:42 +02:00
fourtf
00d538b368 fixed creating messagebox on wrong thread 2018-06-21 22:44:48 +02:00
fourtf
713d0c9599 minor change to the update system 2018-06-21 22:39:17 +02:00
fourtf
e204dfdb17 added updating mechanic 2018-06-21 22:02:35 +02:00
fourtf
2f91e3097a changed settings paths 2018-06-21 13:02:34 +02:00
fourtf
e28bc805f6 changed highlighted message color 2018-06-19 20:48:57 +02:00
fourtf
01f3f401ac wip changes 2018-06-19 19:00:02 +02:00
fourtf
3f9a48fd72 fixed linux 2018-06-11 19:11:33 +02:00
fourtf
ea9f9e7f18 added ui scaling 2018-06-11 15:07:04 +02:00
fourtf
9b26fce781 changes for light mode 2018-06-11 15:07:04 +02:00
Rasmus Karlsson
e8683c3e8e Remove unused includes in EmoteManager 2018-06-07 16:40:31 +02:00
Rasmus Karlsson
578795fbc3 Fix logging to a custom folder 
Progress on #352
 2018-06-06 20:30:34 +02:00
fourtf
c308883a2a added basic user info popup 2018-06-06 13:35:33 +02:00
fourtf
86e4a669ad added basic new user popup 2018-06-06 13:35:33 +02:00
fourtf
714d3178d6 disabled the custom log path as it doesn't save in the proper 
directories
 2018-06-06 00:46:37 +02:00
Rasmus Karlsson
334f778f42 Experimental emoji sets implemented 
Fixes #376
 2018-06-06 01:30:26 +02:00
fourtf
51bde1098e fixed sending whispers from /whispers 2018-06-05 18:51:14 +02:00
Rasmus Karlsson
b410db844d Remove old emoji parsing test code 
it can be recovered from the repo if we decide to make a test suite eShrug
 2018-06-05 17:28:36 +02:00
Rasmus Karlsson
f56b2e2fc2 Remove unused code 2018-06-05 17:28:36 +02:00
Rasmus Karlsson
8db3bf483e Remove unused chatterino emotes 2018-06-05 17:28:36 +02:00
Rasmus Karlsson
e09e0a5ab4 Move emojis to its own class 2018-06-05 17:28:36 +02:00
Rasmus Karlsson
8e70f02e3b Move gif timer stuff to its own class 
Clean up unused includes
 2018-06-05 17:28:36 +02:00
Rasmus Karlsson
78664f79ee Move FFZ emotes to its own class 2018-06-05 17:28:36 +02:00
Rasmus Karlsson
f83c07be53 Move bttv emotes to its own class 2018-06-05 17:28:36 +02:00
Rasmus Karlsson
e12d386a5a Move twitch emote-related stuff to TwitchEmotes class 2018-06-05 17:28:36 +02:00
Rasmus Karlsson
3a8ceede4e Remove unused functions from EmoteManager 2018-06-05 17:28:36 +02:00
pajlada
4ad0ed4d45
Merge branch 'master' into logging 2018-06-05 13:16:20 +02:00
Lajamerr Mittesdine
819812c458 Revisement 3 of Fixing the text emotes 
Fix of a fix of a fix of a fix.
 2018-06-05 00:32:11 +02:00
Lajamerr Mittesdine
b2d049c782 Revisement 2 of Fixing emote text 
Fixing the fix of the fix.
 2018-06-05 00:32:11 +02:00
Lajamerr Mittesdine
4430f0b9a9 Revisement of fixing text emotes 
Fixing the order of text emotes.
 2018-06-05 00:32:11 +02:00
Lajamerr Mittesdine
3c8bb5e9bb Fix a few issues with text emotes. 
1. Fix the heart emote text overlay.
2. Added a missing text emote to the replacements.
3. Replace > with &gt;
 2018-06-05 00:32:11 +02:00
fourtf
10b0466052 changed scrollbar bg 2018-06-05 00:14:47 +02:00
fourtf
5e7fc909e7 fixed an issue 2018-06-04 21:03:06 +02:00
fourtf
70617e294f added int setting for collapsed messages 2018-06-04 16:34:47 +02:00
fourtf
7ad4e36dbb improved handling of relayouting messages 2018-06-04 16:10:54 +02:00
fourtf
66dab0a6b7 selects correct image when scaling emotes 2018-06-04 15:11:06 +02:00
fourtf
db233ffbdc fixed copying 3x versions of bttv channel emotes 2018-06-04 14:52:21 +02:00
fourtf
5923e30132 fixed emote popup images 2018-06-04 12:48:23 +02:00
fourtf
4a2709cbc3 fixed resub messages 2018-06-04 12:23:23 +02:00
fourtf
04b7cc5ce8 fixed tab name sometimes not changing 2018-06-01 16:01:49 +02:00
fourtf
3a78068810 forgot to commit in a while 2018-06-01 14:20:46 +02:00
fourtf
a3e4c92b9f put the account emotes into groups 2018-05-31 16:20:46 +02:00
fourtf
4f35d8854a made message backgrounds overflow into the scrollbar 2018-05-31 12:59:43 +02:00
fourtf
3c9c3493ae improved the extension 2018-05-30 17:17:27 +02:00
fourtf
e01a3a0978 added some more race conditions to the browser extension 2018-05-29 23:58:37 +02:00
fourtf
fe3ab1f1b9 fixed linux compilation 2018-05-28 19:49:37 +02:00
fourtf
0f8375a2f3 improved chatterino native 2018-05-28 18:25:19 +02:00
fourtf
6156b1f430 added categories to the accountspage 2018-05-28 08:34:54 +02:00
fourtf
7e68e662e3 renamed Twitch to twitch 2018-05-26 20:26:25 +02:00
fourtf
8c9be20f9b changed AccountManager to AccountController 2018-05-26 20:25:00 +02:00
fourtf
b016f0fb88 added settings to show part and join messages 2018-05-26 18:06:55 +02:00