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

843 commits

Author SHA1 Message Date
Felix Schmid 300852bbf5 added the settings shortcut to the keybindings window 2018-10-06 14:22:07 +00:00
pajlada 099fd88098
Merge pull request #743 from 23rd/patch-15-scroll-tabs 
Added scrolling over tabs with wheel to switch channels.
 2018-10-06 12:32:37 +00:00
23rd 871fde5f72 Reversed scroll behavior. 2018-10-06 14:18:27 +03:00
23rd 9f5da50bce Moved creating UserInfoPopup in one place. (#761) 
* Moved creating UserInfoPopup in one place.

* Added forgotten 'this'.

Fixes #759
 2018-10-06 10:13:14 +00:00
23rd 1fcfd8b13a Removed few-step scroll. 2018-10-05 23:57:02 +03:00
Ckat b4683c5b35 add menu option to reload subscriber emotes 2018-10-05 19:52:33 +00:00
Ruben Anders 79f64a21c3 Fix typo: "authority badges" 2018-10-05 19:42:27 +00:00
Rasmus Karlsson c6bca8e97b Allow addMessage to override message flags 2018-10-05 21:33:01 +00:00
Rasmus Karlsson c872db3d9f add chatterino nightly version string to nightly builds 2018-10-01 21:44:23 +02:00
23rd 7122e47817 Added scrolling over tabs with wheel to switch channels. 2018-10-01 03:32:20 +03: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
Cranken 22d009962d Now saves the enable highlight on new message tab setting. 2018-09-30 15:02:30 +02:00
pajlada 0e794f5a6d
Merge pull request #739 from Cranken/enableHighlightTab 
Option to disable highlight of tab; disabled switching tabs by only right clicking
 2018-09-30 12:30:52 +00:00
Cranken f6e6916263 Fixed variable naming style. 2018-09-30 14:31:00 +02:00
tetyys 612c9c94dc Clear scroll bar when switching channels in a ChannelView 2018-09-30 11:53:17 +00:00
Cranken abb01b54f5 Fixed clang format. 2018-09-30 13:44:41 +02: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
Cranken 839f78e19b Update regardless of button. 2018-09-29 22:35:33 +02:00
Cranken 036abd4852 Don't switch tab if only right mouse is pressed on other tab. 2018-09-29 22:30:31 +02:00
Cranken f25f31a837 Added button on tab to enable/disable highlighting. 2018-09-29 22:24:48 +02:00
23rd 4c5a0472cd Activate opened emote popup. (#733) 2018-09-25 11:37:24 +00:00
Rasmus Karlsson 0b36f43611 make the list of ignored usernames into a set instead, making it more maintanable 
change "open twitch channel in new split" menu action text
 2018-09-21 22:46:00 +02:00
23rd 9a6650b56c Added button in menu to join to channel. (#724) 2018-09-21 20:35:14 +02: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 a733b6975d make emote popup emote insertions less risky 2018-09-21 22:01:21 +02:00
23rd eb230494a6 Dont add scrollbar highlights in /mentions. 2018-09-21 13:54:12 +02:00
23rd 579c6b9bf9 Trim channelname in join channel window. 2018-09-21 13:43:10 +02:00
23rd f813c2de3b Improved insertion of emotes from popup. 2018-09-20 10:57:22 +02:00
23rd 88477829ef Replaced size() check with empty(). 2018-09-19 13:01:22 +02:00
23rd acd03a3280 Dont show empty categories in viewer list. 2018-09-19 13:01:22 +02: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 1d16c0cf77 fixed crasherino 2018-09-04 22:05:27 +02:00
fourtf 1d682c4a93 added add split button 2018-09-04 21:39:54 +02:00
fourtf 3f4e9cdf91 added text for empty categories in emote popup 2018-09-04 20:09:06 +02:00
23rd d0ea0f2478 Clear highlights scrollbar with messages. 2018-09-02 03:02:12 +03:00
Rasmus Karlsson d16307a484 reformat 2018-09-01 12:33:27 +00:00
Rasmus Karlsson 08b4179a44 Add back "clear messages" in split functionality 2018-09-01 12:19:15 +00:00
apa420 c5a88f6af3 fixed stuff 2018-08-29 19:58:55 +02:00
pajlada 597a8eeb2b
Merge pull request #686 from 23rd/patch-8-fixed-down-arrow 
Fixed down key in input field.
 2018-08-29 10:24:47 +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
23rd 235f9eebf1 Added 'this'. 2018-08-29 02:22:57 +03: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 bfe87b699a Refactored cursorToEnd. 2018-08-27 21:22:53 +03:00
23rd f6d0cc9e6b Fixed down key in input field. 2018-08-27 21:12:38 +03:00
23rd 0f2d6a4a22 Added hotkey for Emote menu. 2018-08-27 15:36:01 +03:00
apa420 15bcb5a2fb Initially done with PR 2018-08-26 13:49:15 +02:00
23rd ce155299e9 Added right-click on nickname to reply on whisper. (#680) 2018-08-26 10:42:00 +02:00
23rd 539d8c20d2 Put isValid() in variable. 2018-08-25 21:29:14 +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
23rd d6c4244b79 Fixed double click in emote popup. (#679) 2018-08-25 10:08:10 +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
23rd 5253ab3f85 Added tooltip to links via BTTV API. 2018-08-24 13:16:55 +03:00
23rd 8a1c30408a Set displayName to UserInfo link as value. (#675) 2018-08-22 15:16:19 +02:00
23rd be4b3f1a38 Don't add empty messages to message history. (#674) 2018-08-22 00:57:44 +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
apa420 15e9e3e642 Added functionality of colored splits when live 2018-08-17 21:19:15 +02:00
fourtf 8bcc9c487b Fixes #411, #516 2018-08-16 00:16:33 +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
fourtf 44c16f1b3a badges 2018-08-14 17:45:36 +02:00
apa420 b671fc4133 Tried chaning the color of the split when a channel is live 2018-08-14 16:29:52 +02:00
Daniel Pasch c4e3bf1a8c Fix compiling on macOS High Sierra (#665) 
* mac docs update relating to qt 

give a little more detailed installation guide for the qt installation

* Fix compiling on clang, now compiles on macOS High Sierra
 2018-08-13 20:10:32 +02:00
fourtf f6e110b7fb fixed and optimized the autocompletion 2018-08-13 14:04:35 +02:00
fourtf f1fbd7ee5c Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-08-12 23:30:18 +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
Lajamerr Mittesdine 7ff4f12257 Fix Global FFZ emotes in Emote Popup (#663) 
There was two instances of Global BTTV emotes.
Changed the second instance to Global FFZ emotes.
 2018-08-12 01:12:03 +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
fourtf c768bd9bd9 fixed image animations 2018-08-11 17:15:17 +02:00
fourtf c719bb6b74 categorized emtotepopup 2018-08-11 14:26:02 +02:00
Rasmus Karlsson 6fa32607d3 fix misspelling of the rapidjson include file thing 2018-08-11 14:10:20 +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 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 6344fa6b23 loading images on their own thread 2018-08-09 20:46:58 +02:00
fourtf 878daf6eee added link to license 2018-08-09 16:44:04 +02:00
fourtf cb235ef532 fixed ocd inducing 1 pixel offsets 2018-08-09 16:20:09 +02:00
apa420 b68c7ded5f WIP notification settings, doesn't actually work 2018-08-09 15:41:03 +02:00
fourtf 81f2f8781a fixed window frame for qt 5.11.1 2018-08-09 15:13:11 +02:00
fourtf e1f180ac28 added qt version number to about tab 2018-08-09 06:34:14 +02:00
fourtf 94813fe3df added subfunctions for ChannelView() 2018-08-08 20:06:20 +02:00
fourtf bdfe24035b fixed rectangle being off by 1 pixel in split container 2018-08-08 19:42:14 +02:00