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
3778 commits 39 branches 37 tags 61 MiB
Commit graph

492 commits

Author SHA1 Message Date
Daniel Pasch 8532c6d3bc
Add thumbnails to link tooltips if available (#1664) 
This feature is off by default and can be enabled in the settings with the "Show link thumbnail" setting. This feature also requires the "Show link info when hovering" setting to be enabled.

thumbnails support is only there for direct image links, twitch clips, and youtube links. can be expanded in the future in the /api repo

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
 2020-05-10 12:11:10 +02:00
Mm2PL 2b1c9794b7
Add confirmation box for uploads. 2020-05-09 13:14:41 +02:00
fourtf 354ad6a362 Merge branch 'master' of https://github.com/chatterino/Chatterino2 2020-04-19 21:06:06 +02:00
fourtf 6052846bc3 added checks to mitigate floating point crashes 2020-04-19 21:05:40 +02:00
pajlada 3091842ddc
Clarified that Redeemed Highlights are from Channel Points, not Bits (#1635) 2020-04-19 12:18:28 +02:00
fourtf 120f73db13 added additional checkbox for highlighted bits messages, fixes #1637 2020-04-18 20:05:05 +02:00
fourtf 097f4ccb3a refined highlight and added bits highlights 2020-04-15 23:15:45 +02:00
apa420 2ac0b60952
option to hide viewer count and duration of the stream when you hover on the split (#1626) 
Fixes #1621
 2020-04-13 12:24:27 +02:00
23rd f489d23a8d
Added ability to open stream in external video player via URI scheme. (#1623) 2020-04-11 11:43:35 +02:00
Mm2PL 175e41c586
Bring back seconds in timestamps (#1616) 
Fixes #1605
 2020-03-29 13:06:44 +02:00
mmb L 82354327e5
Add option for username tab completion only with an @ prefix (#1573) 
* add an additional check for username completion without an @ prefix

* Changed setting name

* default userCompletionOnlyWithAt to false
 2020-02-29 11:52:49 +01:00
fourtf b887f1c90e fix crash 2020-02-28 19:05:50 +01:00
fourtf e537277fa8 did some more things and stuff 2020-02-23 23:07:28 +01:00
fourtf 5ad427bd61 moved some Settings from Application to Settings 2020-02-23 22:15:13 +01:00
fourtf f8a9850151 absorbed HighlightController into Application 2020-02-23 21:18:40 +01:00
fourtf df91ea44c4 refactored ModeratinActions 2020-02-23 20:10:47 +01:00
fourtf 8ae9abb250 refactored IgnoredController 2020-02-23 20:01:35 +01:00
fourtf 2ebe07bace removed compat functions in SignalVector 2020-02-23 19:44:13 +01:00
fourtf 843e2ad994 refactored HighlightController 2020-02-23 19:31:43 +01:00
fourtf 03cf6e81ff fixed spaces and margins in general settings 2020-02-21 03:01:48 +01:00
fourtf 70e5bd1bfd lazily initialize settings pages 2020-02-21 01:59:58 +01:00
fourtf 78ca0cb84f moved settings tab icons to SettingsDialog 2020-02-21 01:22:50 +01:00
fourtf 4a69095d5f fix 2020-02-20 23:43:54 +01:00
fourtf 59aa59106e updated R9K shortcut text 2020-02-10 17:26:51 +01:00
fourtf d16732f023 moved and renamed similarity settings to R9K 2020-02-10 17:25:13 +01:00
fourtf 0d519b479c changed wording in settings 2020-02-10 16:41:49 +01:00
hemirt 1fd64be7f5
Makes it possible to hide one man spam (#1496) 2020-02-02 08:31:37 -05:00
Leon Richardt 497ce2d2f2 Better Highlights: Fix Unintentional Color Update (#1522) 
* HighlightPhrase: Fix wrong documentation

* Use right constructor for new HighlightPhrases

* Fix preset highlights changing unintentionally

Prior to this commit, the callback for reacting to user input on the
highlight table (namely, `HighlightingPage::tableCellClicked`) only
checked for the row number in order to determine whether preset
highlights (self highlights, whispers, and subscriptions) need to be
updated. Hence, changing rows 0 through 2 in the "User Highlights" tab
would also update the preset highlights.

This commit adds a check to determine whether the callback was triggered
by the "Messages" highlight tab, or not.
 2020-01-27 00:16:09 +01:00
Leon Richardt 5957551d06 Better Highlights (#1320) 
* Support for user-defined sounds and colors

* Make color & sound columns selectable

* Add custom row for subscription highlights

* Add subscriptions to custom highlights and centrally manage highlight colors

* Dynamically update message highlight colors
 2020-01-25 11:03:10 +01:00
pajlada 3c8992cac1
Remove FMT dependency (#1472) 
All occurrences of log() have been replaced with qDebug()

bonus meme: remove a bunch of std::string usages in the pubsub client

Fixes #1467
 2020-01-03 20:51:37 +01:00
apa420 be898e88dd Add setting to stack bits (#1452) 2019-12-21 10:36:46 +01:00
SupDos ba685b291f Typo in Settings (#1441) 
small one character typo
 2019-12-15 15:58:58 +01:00
fourtf 6f710823ed renamed getInstance() -> instance() for singletons 2019-10-07 22:42:34 +02:00
fourtf aeab038bc8 removed get function prefix in Version 2019-10-07 22:32:11 +02:00
fourtf f25e52b218 attach extension to opera/vivaldi or all windows 2019-10-07 20:23:28 +02:00
TranRed 1d306c1dd9 Revert "broke everything (revert if needed)" 
This reverts commit f9d50954d9.
 2019-09-27 14:05:03 +02:00
TranRed f9d50954d9 broke everything (revert if needed) 2019-09-27 13:51:12 +02:00
fourtf 9874bd779a formatted all files with clang 9 2019-09-26 00:51:05 +02:00
fourtf ca0db97d09 ammend 2.1.5 added setting for experimental irc support 2019-09-22 17:12:09 +02:00
fourtf 431d35e528 added setting to restart on SIGSEGV 2019-09-22 15:32:36 +02:00
pajlada 452b65b4dd
Merge pull request #1315 from leon-richardt/commit-hash-settings 
Add Version Information to "About" Page
 2019-09-21 10:10:04 +02:00
Leon Richardt baf52d7563 Add version information to "About" page 2019-09-19 23:31:04 +02:00
fourtf 88d8bf7cec renamed members in Helpers.cpp 2019-09-18 16:32:07 +02:00
fourtf 5ca0fc0c8f
Merge branch 'master' into moderation 2019-09-18 16:14:45 +02:00
fourtf 3ab7362304 Merge branch 'master' into irc-support 2019-09-18 13:03:16 +02:00
fourtf 07133166d9 added setting to show unhandled irc commands 2019-09-18 11:11:50 +02:00
fourtf 6298b74884 fixed compilation on non-msvc 2019-09-16 21:08:14 +02:00
fourtf 3a9f9fa17b added setting for pause on hover length 2019-09-16 11:36:19 +02:00
fourtf fd8987cf1b fixed typo 2019-09-16 10:44:05 +02:00
fourtf 63126899ec added pause while key is down 2019-09-16 10:43:20 +02:00
fourtf 7c6f744e73 added insecure credential store 2019-09-13 19:26:52 +02:00
fourtf 8241ce7097 added qtkeychain dependency 2019-09-09 22:18:56 +02:00
Leon Richardt b06eb9df83 Normalize line endings in already existing files 2019-09-08 22:27:57 +02:00
fourtf c6a05f289d removed useless table column in user highlights 2019-09-08 15:10:10 +02:00
fourtf 87c0ff76e7 added setting to open links in incognito by default 2019-09-08 14:59:51 +02:00
Leon Richardt a62b7ac094 Add setting for case-sensitivity in highlights 2019-09-07 19:01:52 +02:00
fourtf 1c0ed6b1aa slightly changed layout for logs and cache 2019-09-03 13:09:33 +02:00
fourtf 577e2e0a21 moved cache into general page 2019-09-03 12:46:22 +02:00
fourtf 6aa6e084af removed unused settings pages 2019-09-03 11:49:44 +02:00
fourtf ac26bd8d2d fixed "open appdata button" always showing 2019-09-03 11:38:15 +02:00
fourtf ab816e18bd Merge branch 'search-settings' 2019-09-03 11:28:10 +02:00
fourtf 3ab40b280b fixed some margins 2019-09-03 11:24:40 +02:00
fourtf f7ee778af6 some style changes to settings 2019-09-03 11:15:38 +02:00
fourtf eaaa52260e smol fixes 2019-09-02 19:00:17 +02:00
fourtf b0459ba646 add basic hiding of SettingsTabs 2019-09-02 16:39:21 +02:00
fourtf dc1c7cb419 2.1.3 2019-09-02 12:29:18 +02:00
fourtf e1e953272b moved some settings around 2019-09-02 10:55:17 +02:00
fourtf 42581598e1 added "beta update" settings 2019-09-02 10:55:17 +02:00
fourtf 54c26d2228 fixed width when searching 2019-09-02 09:44:25 +02:00
fourtf 0b49f696ce added filtering to general page and greying out some items to the other 
pages
 2019-09-01 23:23:20 +02:00
fourtf f949605477 added descriptions to collection settings 2019-08-26 14:36:06 +02:00
fourtf e7b4527a0f added regex help link 2019-08-26 14:07:21 +02:00
fourtf 238d213072 punctuation changes 2019-08-26 13:29:04 +02:00
fourtf a6ab9be8d6 fixed double : in general settings 2019-08-26 13:22:44 +02:00
fourtf 20e978ad85 changed up settings 2019-08-26 13:18:23 +02:00
fourtf cced199eaf added button to import commands from chatterino 1 2019-08-26 11:46:52 +02:00
fourtf 77aec1d3eb improved description of double click link setting 2019-08-26 10:58:47 +02:00
23rd cdc7051e56 Considerably refactored code of Usercard. 2019-08-25 09:47:00 +02:00
23rd 25871bdc2f Slightly refactored code of Usercard. 2019-08-24 17:09:41 +02:00
TranRed 5cd067aab0 readded used "unused" variable 2019-08-22 21:33:50 +02:00
fourtf b513caf572 added settings to mention users with , 2019-08-21 01:08:15 +02:00
fourtf b84c3ac3be Fixes #1220 Added setting do disable timeout stacking 2019-08-21 00:41:48 +02:00
fourtf 7697ec01b4 removed old NetworkRequest api 2019-08-20 22:16:17 +02:00
Leon Richardt f2b2e3142f Implement simpler fix for emote completion bug 
This commit implements a simpler fix for the problem described in #1209.
The setting's signal is connected to a reset of `completionInProgress_`
so that the completion model is updated on the next word already.

This commit also removes the older approach tackling this issue.
 2019-08-18 21:37:20 +02:00
TranRed 0e3ab64bd2 deleted unused QStringList 2019-08-18 18:57:30 +02:00
TranRed 015fc155d5 Refactored settings 
made settings use Vectors instead of 8 single setting entries
 2019-08-18 18:42:48 +02:00
Leon Richardt be5318f275 Fix emote completion bug 
This commit fixes a bug that would occur when changing the completion
mode from prefix-only to substring while mid-completion.
In that case, the suggestion list was not updated until the next
completion attempt.

This is fixed by forcing a suggestion list refresh whenever the
setting's checkbox is updated.
 2019-08-17 21:31:31 +02:00
Leon Richardt 58d892a8c2 Make Emote Tab Completion Search for Substrings (#1204) 
* Make emote tab completion search for substrings

Previously, tab completion only searched for emotes that start
with the current prefix under the cursor. This commit makes tab
completion look for the current prefix as a substring in any position,
not just the start.

Examples:
    * In forsen's channel, tabbing on "pls" will cycle through "DonaldPls", "forsenPls",
    "GachiPls", "nyanPls" and "SourPls".

    * As a forsen subscriber, tabbing on "sen1" will complete to "forsen1".

    * As a pajlada subscriber, tabbing on "shrug" will cycle through
    "pajaShrugL" and "pajaShrugR". (Unless you are in a channel with
    more "shrug" emotes, of course.)

* Add a setting for prefix and substring completion

This commit adds a setting under the "Miscellaneous" section to allow
user to choose whether they want prefix-only or substring emote
completion.

The QCompleter filter mode and `addString` function are now chosen
according to the user's setting.

* Improve description of emote completion setting

Also reintroduce a blank line that went missing.
 2019-08-17 17:17:38 +02:00
Mateusz Ż eb38b53c04 Fix Settings UI inconsistencies (#1202) 
* Move "About" tab in Settings

* Resize Settings window

This prevents from spawning horizontal scroll (which is caused by too long line
in "Attributions" group)

* Fix "show license" link width

If you clicked empty space next to link application assumed you clicked link.
I fixed that by using QLabels instead of SignalLabel (there's something "wrong"
with them, but I couldn't find what)
 2019-08-14 20:03:42 +02:00
23rd da039bfdfa Added setting to colorize usernames who have not set own color. 2019-08-11 19:48:43 +03:00
fourtf 4e4c7d4c0b Set default username boldness to DemiBold (63) 2019-07-28 20:24:39 +02:00
Rasmus Karlsson 3679125e2f Reformat 2019-07-28 13:21:54 +02:00
Rasmus Karlsson 954b1b138a Add a setting for the timeout stack style: 
"Stack" is the default behaviour, it will search 20 messages up and 5
seconds back in time to stack the timeout.
"Stack sparingly" will try to do the same, but only if the user has not
typed a message inbetween the this and the last timeout.

Fixes #1157
 2019-07-28 13:21:54 +02:00
fourtf 39f44d74b3 Added autorun on boot setting for windows. 2019-07-23 23:56:14 +02:00
TranRed dc01cbf2a3 simplified settings page UI 
simplfied UI and removed unneccessary code
 2019-07-19 17:34:25 +02:00
TranRed 00ad80d93d unscuffed settings tab 
removed copy past cody in favor of an itsy-bitsy more flexible solution
 2019-07-19 16:20:31 +02:00
TranRed c45bb144e9 Fixed spinbox ranges 2019-07-19 13:15:50 +02:00
TranRed 7a3673e9f6 changed max custom timeout input to 99 
simplicity
 2019-07-18 23:34:40 +02:00
TranRed 24faaf8734 created first version of settingstab: Timeouts 
scuffed prototype

To-Dos:
- make the UI look cleaner
- clean up copy&pasted coding
 2019-07-18 23:02:55 +02:00
pajlada fb6a55847d
Merge pull request #1140 from TranRed/inlineWhisperHighlight 
Added setting and functionality to highlight inline whispers
 2019-07-14 19:32:09 +02:00
TranRed d725155569 Added setting and functionality to highlight inline whispers 
Inline whispers will be displayed with highlighted background color.

New Flag needed to differentiate between normal whisper (highlighted) and whisper with mention.
 2019-07-14 16:35:32 +02:00
Ruben Anders 667d2dbdda
Add VIP to settings description of badge toggle 2019-07-14 15:31:40 +02:00
Rasmus Karlsson 27114c5154 Restore option to disable emote images 
Condensed into a single option, which will disable/enable all emote and emoji images

Also moved badges into their own element
 2019-06-22 14:34:54 +02:00
apa420 70bb63d20f Added option for shift, used clang and made setting uneditable 2019-06-11 22:54:20 +02:00
rexim f362548e28 (#976) Use int for emotesTooltipPreview 2019-06-12 02:05:18 +07:00
rexim 8b79faf958 Make Emotes Tooltip Preview disablable in the Settings 2019-06-11 23:20:04 +07:00
Rasmus Karlsson e1483bfd8a Make Twitch message history loading optional (On by default) 2019-05-25 11:24:10 +02:00
Rasmus Karlsson 0263248668 Add attribution for Twitch emote data provided by twitchemotes.com 2019-05-21 22:53:40 +02:00
fourtf 42cb0e4ec3 Removed left padding from general settings page 2019-05-19 01:03:31 +02:00
Rasmus Karlsson 1a7a5409ab do a full reformat according to our current .clang-format 2019-05-10 23:31:10 +02:00
apa420 834b1f3c53 Option to hide system moderation messages (#1066) 2019-05-10 23:16:34 +02:00
apa420 3ea496a99b Added boldness adjustment for fonts (#1057) 
* Added boldness adjustment for fonts

* Moved setting and changed description of it
 2019-05-10 22:37:44 +02:00
23rd 9654650bee Renamed variables to clear some warnings. 2019-05-10 22:18:05 +02:00
23rd efec76df5b Removed unused local vars. Slightly refactored code. 2019-05-10 22:18:05 +02:00
TranRed b5efe12f56 renamed enum ToastReactions to ToastReaction (singular) 2019-05-02 00:01:18 +02:00
TranRed a592a3e882 Connected ComboBox to currentIndexChanged 
implemented proper connection to combobox (currentIndexChanged instead of currentTextChanged)

Thanks, pajlada! FeelsGoodMan
 2019-05-02 00:01:18 +02:00
TranRed 2a590adba7 Implemented requested changes 
changed setting from String to int.
changed EnumCase

I used createComboBox only has an implementation that handles stringsettings. I implemented my own combobox to handle the ToastsSettings now. Not sure if this is the best way. Won't come up with something smarter for now.
 2019-05-02 00:01:18 +02:00
TranRed c20629c165 Refactored opening from toasts 
implemented maps and map look up functions
 2019-05-02 00:01:18 +02:00
TranRed f76df80575 creates common texts for opening streams 
Texts for opening streams were used in multiple locations. Created a file to store GUI texts like this and replaced were applicable
 2019-05-02 00:01:18 +02:00
pajlada 77f57bcff2
Merge pull request #1012 from apa420/apa-deleted-messages 
Added support for single deleted messages
 2019-04-28 12:51:57 +02:00
apa420 3c1d264689 Added trashcan, replaced messageID var with this-message().id, removed pubsub stuff that didn't belong 2019-04-28 02:25:05 +02:00
TranRed ad38d0ca1c Added setting for opening streams from toast 
Implemented #710

Added options for opening streams from clicking the toas notficiation: (according to options in splits)
- open in browser
- open player in browser
- open in streamlink (needs to be tested, but should in theory work, since I only use the already existing function)
- don't open the stream (in case someone wants to prevent opening streams "by accident")
 2019-04-22 09:03:52 +02:00
fourtf 9be0d7d458 removed red stripes and connected tape cut visuals 2019-04-17 17:02:13 +02:00
pajlada 0737922915
Merge pull request #998 from apa420/apa-remove-moderated-messages 
Option to hide moderated messages (timed out messages)
 2019-04-16 14:38:20 +02:00
apa420 817c40d733 Added continue for readability and removed to hide moderated messages 2019-04-16 14:36:15 +02:00
pajlada 43504114b5
Merge pull request #994 from apa420/apa-after-x-lines 
Made wording more consistent in generalpage
 2019-04-16 14:33:01 +02:00
pajlada 695d200d79
Merge pull request #1007 from pphop/pphop-show-ignored 
Show ignored users messages anyway setting
 2019-04-14 16:59:40 +02:00
pphop 320d74b287 implement show ignored users setting 2019-04-13 01:12:39 +05:00
Ruben Anders 00d4fbf9ed Add {channel} replacement 2019-04-11 12:21:11 +02:00
apa420 562bdae09f Option to hide moderated messages (timed out messages) 2019-04-10 15:32:18 +02:00
apa420 12600b553f Made wording more consistent in generalpage 2019-04-05 21:39:04 +02:00
ckath fac1a6d00c comply to style guies 2019-04-04 11:51:18 +02:00
ckath b3af777382 add back settings for hiding buttons 2019-04-04 11:51:18 +02:00
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