3198 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
TranRed	b5efe12f56	renamed enum ToastReactions to ToastReaction (singular)	2019-05-02 00:01:18 +02:00
TranRed	cd1f717c36	deleted dead code ... not needed anymore since latest commit	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	2be81aa877	Update chatterino.pro	2019-05-02 00:01:18 +02:00
TranRed	724ad2118b	Update chatterino.pro	2019-05-02 00:01:18 +02:00
TranRed	d749a4771a	made CommonTexts.hpp look like other headers	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	01082b123f	Merge pull request #1050 from apa420/apa-pubsub-fix ... Changed to ref for better performance #1049	2019-05-01 22:36:32 +02:00
pajlada	8aa2d42ca9	Merge pull request #1045 from TranRed/patch-3 ... Added {message} parameter for moderation buttons	2019-05-01 22:35:07 +02:00
apa420	8d80eab649	Changed to ref for better performance	2019-05-01 22:28:46 +02:00
pajlada	216b21e0c3	Merge pull request #1049 from apa420/apa-pubsub-fix ... Pubsub messages now go into the correct channel	2019-05-01 22:22:03 +02:00
Rasmus Karlsson	effe91badc	clean up magic message suffix stuff	2019-05-01 22:10:51 +02:00
apa420	c60b717b98	Pubsub messages now go into the correct channel	2019-05-01 21:46:53 +02:00
pajlada	cf3612c19a	Merge pull request #1047 from apa420/patch-1 ... Update BUILDING_ON_WINDOWS.md add step with required dll's	2019-05-01 21:42:14 +02:00
apa420	7266ae2856	Merge pull request #1 from RAnders00/patch-2 ... Correct indent	2019-05-01 20:33:07 +02:00
Ruben Anders	91ade0d078	Correct indent	2019-05-01 20:30:14 +02:00
apa420	4a7856d997	Update BUILDING_ON_WINDOWS.md	2019-05-01 20:25:55 +02:00
Rasmus Karlsson	9d8838149f	Merge remote-tracking branch 'origin/master' into nightly	2019-05-01 19:58:43 +02:00
TranRed	b33478d8c6	stored original message text in message	2019-05-01 16:43:52 +02:00
TranRed	bbf649bf70	Added {message} parameter for moderation buttons	2019-05-01 16:08:45 +02:00
pajlada	5e7a1c4eb9	Merge pull request #1044 from tsoding/nixos ... Add NixOS Building Instructions	2019-05-01 15:57:01 +02:00
rexim	0644134f7c	Add NixOS Building Instructions	2019-05-01 20:18:29 +07:00
TranRed	34f820be18	implemented fallback logic for corrupted window layout (#1039) ... * fallback logic for corrupted window layout 1. before saving the window-layout a backup will created to avoid corruption due to crashes while saving 2. when starting chatterino and the window-layout file returns and empty window layout (due to corruptio) the backup will be read and the layout will be build from this data * Update WindowManager.hpp * used QSaveFile instead of crude custom implementation * implemented suggested feedback from review * proper method call was tired and slightly drunk Kapp	2019-05-01 09:58:13 +02:00
pajlada	ad559f9d97	Merge pull request #1038 from hemirt/master ... remove unprofessional (puke) inside comments	2019-04-29 20:59:16 +02:00
hemirt	e0e7d366d3	remove useless comment	2019-04-29 20:33:04 +02:00
hemirt	56956eea58	remove weeb hate	2019-04-28 23:23:04 +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	31ab2428f6	Pajlada made a nice trashcan, thank him :)	2019-04-28 12:46:55 +02:00
apa420	ae0122e389	Added a message when an invalid /delete appears	2019-04-28 11:31:34 +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
pajlada	124dd5e8bd	Merge pull request #1020 from 23rd/patch-22-travis-osx ... Edited .travis.yml to add compilation and deployment for OS X.	2019-04-27 19:12:00 +02:00
pajlada	20610d8e26	Merge pull request #1033 from 23rd/patch-25-icon-osx ... Fixed icon of application for OS X.	2019-04-27 19:11:44 +02:00
23rd	780b1e8622	Fixed icon of application for OS X.	2019-04-27 16:43:03 +03:00
pajlada	f1569a4cd7	Merge pull request #1026 from 23rd/patch-23-empty-message-retina ... Fixed display of text message in empty tabs for Retina screen.	2019-04-27 13:23:18 +02:00
23rd	53640a9097	Fixed display of text message in empty tabs for Retina screen.	2019-04-27 14:19:03 +03:00
pajlada	321d86de2c	Merge pull request #1021 from TETYYS/nightly ... Change to new character to make duplicate message error bypass work again	2019-04-26 23:36:54 +02:00
tetyys	40b4c2fefc	Change to new character to make duplicate message error bypass work again	2019-04-27 00:31:15 +03:00
pajlada	a5a0ad59b8	Merge pull request #1017 from TranRed/nightly ... Opening streams from toast + quickfix highlights in light theme	2019-04-26 23:02:48 +02:00
Rasmus Karlsson	d44e1476a5	Merge branch 'master' into nightly	2019-04-25 21:48:59 +02:00
pajlada	259657b868	Merge pull request #1014 from TranRed/patch-1 ... Updated links in building_on_windows.md	2019-04-25 21:45:26 +02:00
23rd	68ce262d9e	Edited .travis.yml to add compilation and deployment for OS X.	2019-04-25 11:49:06 +03:00
Rasmus Karlsson	3113513290	remove stupid log message	2019-04-23 09:10:34 +02:00
TranRed	ac1957ff68	Quick fix for highlighting in light themes ... set defaults for highlighting colors. Only use "hidden setting" when populated.	2019-04-22 18:32:58 +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
TranRed	e3281da139	Changed Boost link to 1.69.0 ... Changed link back from 1.70 to version 1.69. Version 1.70 was throwing compiler errors on different computers for me	2019-04-21 17:15:04 +02:00
TranRed	d7be324caa	changed C:/local/bin to C:\local\bin ... make it actually pastable into PATH	2019-04-20 20:51:22 +02:00
TranRed	3f1a4c6b1e	Update BUILDING_ON_WINDOWS.md ... OpenSSL 1.0 download link was dead. Updated to current version	2019-04-20 20:43:31 +02:00
TranRed	75ba46a55a	Updated Boost convenience link to newest relase ... Changed convenience link to (newest) release 1.70.0 instead of 1.67.0	2019-04-20 20:36:08 +02:00