Commit Graph

48 Commits

Author SHA1 Message Date
hemirt 3184234c19 Squashed commit of the following:
commit ea07bbef0be589cc5412bff0a25735ac713128e3
Merge: 0b36f436 5cfcf114
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 20:05:14 2018 +0200

    Merge branch 'blacklist' into blacklistnew

commit 5cfcf114b65ea7c0fca9654393ac2faa78610098
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 20:00:16 2018 +0200

    rename second pattern to replacement

commit f08cc4cf88c49140a282d3d29af5ad8e7179bb7c
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 19:52:30 2018 +0200

    delete out commented code

commit 1acb1278aa0109359e0e349ae240d10b34de9d34
Author: hemirt <hemirt@email.cz>
Date:   Sun Sep 23 19:52:03 2018 +0200

    fix replacement with emotes issues

commit 646268ab1883a955291f152029fa37f4416e681e
Author: hemirt <hemirt@email.cz>
Date:   Sun Aug 19 01:06:36 2018 +0200

    fix build

commit ad711b4c15ef0660c554af5ceea82397769a2313
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 e8e059f8473271128086c5230cf1c40b235af380
Author: hemirt <hemirt@email.cz>
Date:   Sun Aug 19 00:25:58 2018 +0200

    add replaced emotes into twitchEmotes

commit a63454f00de479cee1ab1eca18a8b4ab93e37d52
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 e7f2f397378d0582d989ff8fcbe83bcec41449a1
Author: hemirt <hemirt@email.cz>
Date:   Sat Aug 11 21:54:01 2018 +0200

    emotedata

commit f00d3da537ec14aebd9cbb84d63f7b16c196f199
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 00c9fa080aeb8a4a187743d708ba139cbed5a849
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 4385fcd13fe6e011b91a3f4a29fd440d019fc499
Author: hemirt <hemirt@email.cz>
Date:   Sun Jul 8 21:09:14 2018 +0200

    remove commented code

commit 1834342f74c4fbff38b81fa2c2fcfd6c55adc0d5
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 d3b6e294ed38fa8587c367c5da6f257641c28b86
Author: hemirt <hemirt@email.cz>
Date:   Sun Jul 8 16:21:33 2018 +0200

    ignore phrases
2018-09-30 11:42:23 +00:00
Rasmus Karlsson bad9d5e521 Add missing WinToast submodule 2018-09-16 20:01:28 +02:00
Rasmus Karlsson a00921a220 update settings and signals library versions 2018-09-16 19:53:13 +02:00
Rasmus Karlsson 9bfbdefd2f Update settings library version 2018-07-15 14:30:04 +00:00
Rasmus Karlsson bfe6b90877 update settings and signals library versions 2018-07-15 11:56:04 +00:00
Rasmus Karlsson 22bf008bdf Update new settings library version 2018-07-15 11:03:25 +00:00
pajlada 10df071077 Breakpad implementation (#535)
* qBreakpad simple implementation

* update chatterino.pro for linux

* Add breakpad building script for linux
2018-06-27 23:06:37 +00:00
Rasmus Karlsson f76512c31e Remove authenticated get function from urlfetch
Implement twitch account emote getter function in TwitchAccount
2018-06-27 00:16:30 +00:00
Rasmus Karlsson aba6d1b840 update settings version 2018-06-26 00:42:22 +00:00
fourtf 3c9c3493ae improved the extension 2018-05-30 17:17:27 +02:00
fourtf fe3ab1f1b9 fixed linux compilation 2018-05-28 19:49:37 +02:00
fourtf 6bd787423d added template model/view magic for commands 2018-04-29 23:26:17 +02:00
Rasmus Karlsson 9bb7a3fa74 Update external settings lib version 2018-04-28 15:20:40 +02:00
fourtf 9426a9d633 Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-04-28 13:48:49 +02:00
Rasmus Karlsson 25a7db7179 Update external settings lib version 2018-04-27 17:38:30 +02:00
fourtf b176dc5295 switched up the settings pages 2018-04-25 20:35:32 +02:00
Rasmus Karlsson 0718277271 Update settings library version 2018-04-22 14:09:38 +02:00
pajlada 23cf8cc484 PubSub system (#346)
* Add websocketpp dependency

* Initial pubsub commit

Renamed selection min and max variables to selectionMin and selectionMax
to bypass windows min/max macros being stupid.

TwitchAccount is now initialized with its User ID. It cannot be changed
after it has been initialized.

* Update openssl folder

* Update installation instructions

* Split up websocketpp dependency to its own code only and openssl.pri

* Add missing include to asio steady_timer

* Update dependencies for linux
2018-04-15 15:09:31 +02:00
fourtf ed50f1835f added debug information on F10 2018-04-11 22:54:34 +02:00
Rasmus Karlsson 5433daa1ea Update settings library. make use of new define 2018-04-11 22:54:34 +02:00
fourtf fc758846f6 made the code actually compile 2018-01-22 20:14:43 +01:00
fourtf bd50b2ae79 Fixes #248 user color not normalized 2018-01-22 14:35:51 +01:00
Rasmus Karlsson cb0d078648 windows builds now use rapidjson from a submodule 2018-01-07 03:32:03 +01:00
Rasmus Karlsson dc9f1b96eb update settings library version 2018-01-04 00:11:00 +01:00
Rasmus Karlsson 258288bad9 Some settings can now be "reverted" by pressing cancel in the settings dialog
Modify visibility of some members of SettingsDialog
update external libraries
Progress on #180
2017-12-28 19:34:20 +01:00
Rasmus Karlsson 468ede66ea update external lib versions 2017-12-22 16:33:30 +01:00
Rasmus Karlsson 47647ee4b1 update settings lib version 2017-12-22 14:50:44 +01:00
Rasmus Karlsson 86a9f194f9 Clean up account switcher stuff
Update settings library version

Fixes #9
2017-12-20 00:41:35 +01:00
Rasmus Karlsson 87182d078c Further simplify font label updating in settings dialog 2017-12-17 21:11:19 +01:00
Rasmus Karlsson c7feec20d8 Update signals library version 2017-12-17 15:06:42 +01:00
Rasmus Karlsson bb081b710e Update settings and signals library version 2017-12-17 03:37:46 +01:00
Rasmus Karlsson af35c1f335 fix fmt dependency cuz qmake hates .cc file extensions 2017-09-24 19:20:53 +02:00
Rasmus Karlsson 0088374694 update settings version again :bbaper: 2017-07-31 00:54:58 +02:00
Cranken 8fb0671834 Added Highlights (#86)
Added Highlights
2017-07-31 00:37:22 +02:00
Rasmus Karlsson 8a97dfd604 update settings version 2017-07-27 23:32:15 +02:00
Rasmus Karlsson 9b13581fa8 Include third party string-formatting lib 2017-07-23 11:57:30 +02:00
Rasmus Karlsson c5c2718dc0 Use addChat instead of re-implementing the same code (thanks hemirt)
Some refactoring

Updated settings library version
2017-07-02 13:37:24 +02:00
Rasmus Karlsson 3c2ee99731 working on something 2017-07-02 12:36:50 +02:00
Rasmus Karlsson f2ef14422b update settings lib version 2017-06-27 14:14:11 +02:00
Rasmus Karlsson 39056f40ef update settings version again :bbaper: 2017-06-27 10:09:13 +02:00
Rasmus Karlsson 7df7da70cb A lot of changes
Remove unused constructor of messages::Message
Fixed LimitedQueueSnapshot _-prefixes
Changed LimitedQueueSnapshot's usage of int to std::size_t
ColorScheme is no longer a singleton
Created a "BaseWidget" class which is pretty much a QWidget except it
has a reference of ColorScheme since most widgets will need a reference
to the style they should use.
BaseWidget can be implemented either with a BaseWidget parent (which
will copy the ColorScheme reference from the parent) or with a
normal QWidget parent and an explicit ColorScheme reference.
Save main window geometry on close
Fix font changing in the Settings Dialog
Update settings library version
2017-06-26 19:53:31 +02:00
Rasmus Karlsson c2e67e4b90 attempt to implement urlFetch with a timeout 2017-06-26 15:53:43 +02:00
Rasmus Karlsson 1d8795ef1b update settings version 2017-06-17 15:15:58 +02:00
Rasmus Karlsson 2305afe700 add humanize as a dependency 2017-06-11 21:01:08 +02:00
Rasmus Karlsson ccf8e3bd83 move around files 2017-06-06 14:48:14 +02:00
Rasmus Karlsson 980e71ab40 add settings submodule 2017-05-30 13:51:06 +02:00
hemirt e7b727fa64 fix MSVC (2015) libcommuni link errors, and use correct warn flag (#44)
* use fixed libcommuni submodule

* warn flag -W4 should be used for MSVS instead of -Wall, move libcommuni
define and include together

* define correct warning flags for MSVC and else
2017-05-27 23:35:58 +02:00
fourtf 2b4fa8071f asd 2017-01-03 21:19:33 +01:00