noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
2536 commits 39 branches 37 tags 61 MiB
Commit graph

309 commits

Author SHA1 Message Date
hemirt 63b22ecf1d HistoricMessageAppearance 
Merge branch 'master' of https://github.com/fourtf/chatterino2
 2019-01-30 16:00:45 +01:00
pajlada 11a6345247
Merge pull request #935 from apa420/apa-red-timeoutmessages 
Option to disable the red stripes on greyed out messages
 2019-01-29 18:36:05 +01:00
apa420 bf57dff4bc
Formatting to clang standard 2019-01-29 18:34:03 +01:00
apa420 fa67cdb928
Grammar 2019-01-29 18:32:24 +01:00
apa420 88b1122369 added an option to disable the red stripes over timed out messages 2019-01-29 18:23:43 +01:00
hemirt 441f6189a1 Historic messages behaviour 
"Crossed and Greyed" -> default (and is current default)
"Crossed" -> just crossed
"Greyed" -> just greyed
"No change" -> no change in appearance
 2019-01-27 22:15:59 +01:00
apa420 bb840da988 Moved turbo badge to vanity 2019-01-23 17:52:53 +01:00
pajlada b09e87f837
Merge pull request #914 from hemirt/surrogatepairs 
Surrogatepairs
 2019-01-22 22:22:03 +01:00
hemirt 88cffb1949 show users in ignore page sorted 2018-12-02 22:59:18 +01:00
fourtf 52dcc2130e moved more stuff into appbase 2018-11-25 21:14:42 +01:00
fourtf 0b94d0f763 made appbase compile standalone 2018-11-25 15:02:48 +01:00
Rasmus Karlsson a4fd7b5366 Move settings into a separate JSON file. 
This will unfortunately mean losing your commands, but they can be restored by
converting the old commands.txt format into the commands.json file

Fix #372
 2018-11-03 13:37:09 +01:00
Rasmus Karlsson ac4a496a06 Update to latest settings library version 2018-11-03 13:00:07 +01:00
fourtf 5e69354178 added two missing settings 2018-10-31 21:23:19 +01:00
fourtf 7b06405a1c allowing editing the timestamp freely 2018-10-31 21:13:01 +01:00
fourtf 246f999a40 improvements on settings dialog 2018-10-31 20:57:29 +01:00
fourtf 33ecc2759d fixed compilation on linux 2018-10-31 20:40:57 +01:00
fourtf 3c3be99177 new settings page 2018-10-31 19:49:15 +01:00
fourtf d500ab59ea added setting for compact emotes Fixed #821 2018-10-29 21:48:15 +01:00
hemirt c13a88e3b6 custom theme multiplier support (#825) 2018-10-25 21:52:12 +02:00
pphop 02eeedb338 added toggle for greying out historic messages (#822) 2018-10-25 21:47:52 +02:00
Marco Schmid c49f17cc07 help text added for f5 2018-10-23 20:08:00 +02:00
fourtf 1872163ec4 Open settings when clicking moderation button and no moderation actions are found 2018-10-21 15:32:28 +02:00
fourtf e259b9e39f added brace wrapping after if and for 2018-10-21 13:43:02 +02:00
fourtf 4f4d717a52 minor changes 2018-10-20 19:15:28 +02:00
pphop a584259785 improve "last message read" indicator (#802) 2018-10-20 13:25:24 +02:00
coral 6eab491baa Added icons for every single settings item! 2018-10-19 15:53:19 -07:00
ckath c38bb05bb4 correct options text of hiding buttons 2018-10-13 12:50:11 +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
Felix Schmid 300852bbf5 added the settings shortcut to the keybindings window 2018-10-06 14:22:07 +00:00
Ruben Anders 79f64a21c3 Fix typo: "authority badges" 2018-10-05 19:42:27 +00: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
hemirt 6ca4f661a7 clangformat 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
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
fourtf 018fe2ab10 fixed some shtuff 2018-09-04 22:29:21 +02:00
fourtf 1d682c4a93 added add split button 2018-09-04 21:39:54 +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 875e12f728
Merge pull request #684 from 23rd/patch-7-hotkey-emote-menu 
Added hotkey for Emote menu.
 2018-08-29 01:34:56 +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 0f2d6a4a22 Added hotkey for Emote menu. 2018-08-27 15:36:01 +03:00
23rd f8c42918a6 Added option to turn off link info tooltips. 2018-08-25 21:29:08 +03: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
Rasmus Karlsson 3fc91bded5 Move some helper functions to Helpers.hpp 2018-08-19 16:26:32 +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 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 44f5a15da3 turning a lot of includes into forward declares 2018-08-11 22:23:06 +02:00
fourtf c719bb6b74 categorized emtotepopup 2018-08-11 14:26:02 +02:00
fourtf edfae49cc9 simplified Image 2018-08-10 18:56:17 +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
fourtf 878daf6eee added link to license 2018-08-09 16:44:04 +02:00
apa420 b68c7ded5f WIP notification settings, doesn't actually work 2018-08-09 15:41:03 +02:00
fourtf e1f180ac28 added qt version number to about tab 2018-08-09 06:34:14 +02:00
fourtf d89b62692a refined SplitHeader 2018-08-08 15:35:54 +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
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
Rasmus Karlsson 7cdfa173c7 enable external link opening in attributions 
Fix #641
 2018-07-28 11:20:18 +00:00
fourtf 3b3c5d8d75 added code to handle a single connection 2018-07-16 17:23:41 +02: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
apa420 db099260ad Added functionality of reading log-size in the moderation-folder (#600) 2018-07-11 14:23:21 +02: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 eeb514c444 minor changes 2018-07-05 18:17:12 +02:00
fourtf 42550129e7 reworked the Look settings page 2018-07-05 17:38:24 +02:00
fourtf 80c8e11cec refactored the ignores page a bit 2018-07-05 16:45:34 +02:00
fourtf 1da23e5e91 renamed IgnoreUsersPage to IgnoresPage 2018-07-05 16:22:25 +02:00
DatGuy1 9c7c99928f Add highlighting of all messages from a certain user (#564) 
* Rework to use controllers

* Rework to use controllers

* Add doHighlight

* Cherry pick?

* Fixes per PR

* Remove file
 2018-07-05 15:58:20 +02:00
apa420 eb69cbf5f5 The file-url for logging is now displayed as a smaller link (#570) 
* The file-url for logging is now displayed as a smaller link, todo: Show link on hover

* added a label to the folder-url in the settings
 2018-07-05 15:57:08 +02:00
apa420 2e1fdbec32 Changed where the bold @username setting is found 2018-07-04 18:10:50 +02:00
Rasmus Karlsson a66a2f2e8d Add a list of contributors to the about page 2018-07-04 16:52:14 +00:00
apa420 318e8b6234 Bold @username 2018-07-04 14:01:39 +02:00
Rasmus Karlsson acf77beff2 Remove file that I accidentally re-added 2018-07-04 13:58:38 +00: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
fourtf 3a9de8cb86 renamed classes AppearancePage and BahaviourPage 2018-07-03 17:45:31 +02:00
fourtf cd57b2b518 renamed AppearancePage and BehaviourPage 2018-07-03 17:45:31 +02:00
Rasmus Karlsson 78dede21f4 Fix linux not compiling 2018-07-03 17:42:38 +00:00
hemirt ef4c7dbe60 Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-07-03 17:21:41 +02:00
fourtf d6c6a552d8 added preview channel view to the appearance tab 2018-07-03 16:56:36 +02:00
Rasmus Karlsson e757a6504b Run clang-format-all.sh 2018-07-03 15:20:00 +00:00
hemirt 126e344f18 rename Ver to Dotted, fix show current value on first open 2018-07-03 15:45:25 +02:00
hemirt 4f30d950c7 fix current index, depends on value of setting 
fix default value of the combobox for the collapse lines, incorrectly
always shows first item of the box, instead of current value
 2018-07-03 15:43:54 +02:00
fourtf 63a596ef16 added moderation action settings back in 2018-07-03 15:00:21 +02:00
hemirt 37d3f5a24a last message pattern 2018-07-03 13:44:59 +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 604e5ed682 fixed upper/lower case fiesta 2018-06-26 17:42:35 +02:00
fourtf d09b14db26 removed Const.hpp and Credentials.hpp in favor of TwitchCommon.hpp 2018-06-26 17:25:24 +02:00
fourtf 08e552f5f6 ran clang-format on all files 2018-06-26 17:20:03 +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 0bc08a364c created directory for dialogs 2018-06-26 15:11:45 +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
ch-ems 7f5b07a9f9 fixes font selection window showing behind if 'window always on top' is 
enabled.
 2018-06-25 16:59:50 +02:00
fourtf 63c213a36a fixed spelling of "separate" 2018-06-24 18:32:00 +02:00
fourtf 2b99a3574c changed firefox extension link to the english one 2018-06-24 10:57:37 +02:00
fourtf f728a1fbd7 added browserextensionpage 2018-06-23 22:49:07 +02:00
fourtf 89d9076715 polishing for the update 2018-06-23 22:17:57 +02:00
fourtf 440a3c41fe LayoutCreator<T>::operator * now returns a reference 2018-06-22 12:34:33 +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
datguy 56fcc496cf made the 'add account' popup box actually pop up to the foreground 2018-06-18 23:33:06 +02:00
fourtf ea9f9e7f18 added ui scaling 2018-06-11 15:07:04 +02:00
Rasmus Karlsson 578795fbc3 Fix logging to a custom folder 
Progress on #352
 2018-06-06 20:30:34 +02:00
fourtf d2de34914b added scrollbars to the about page 2018-06-06 20:04:57 +02:00
Rasmus Karlsson 3eab6150cf fix emoji set combobox not loading from settings 2018-06-06 11:42:41 +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 4716d73ee2 added keyboard bindings to the settings 2018-06-05 19:39:18 +02:00
Rasmus Karlsson 3c3abba202 Fix some compilation errors caused by an incorrect merge 2018-06-05 15:19:39 +02:00
pajlada 4ad0ed4d45
Merge branch 'master' into logging 2018-06-05 13:16:20 +02:00
fourtf 10b0466052 changed scrollbar bg 2018-06-05 00:14:47 +02:00
fourtf 8de0a59533 ircconnection and about page 2018-06-04 21:05:18 +02:00
fourtf 2c1e045017 added licenses to the about page 2018-06-04 17:28:45 +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 829809b0e1 added rightclicking selections to copy them 2018-06-04 14:39:26 +02:00
fourtf 6156b1f430 added categories to the accountspage 2018-05-28 08:34:54 +02:00
fourtf 9fc791a440 clear the list of joined/parted users 2018-05-27 13:37:49 +02:00
fourtf 0fed9ca5d2 added add account login back in 2018-05-27 03:17:33 +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
fourtf 4de2a6b65f added a setting to collapse long messages by default 2018-05-24 11:35:50 +02:00