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

490 commits

Author SHA1 Message Date
fourtf 56f0e5e76a removed the chrome style tabs 2018-04-01 16:42:00 +02:00
Rasmus Karlsson be66338fe2 General cleanups/reformats 
- Clean up imports
- Comment EmojiData
- Reorder TwitchAccount constructor
- Fix typo in TwitchChannel
- Add emoji parsing test code at the bottom of EmoteManager
 2018-03-31 13:44:15 +02:00
fourtf 700b15c483 improved new tabs 2018-03-30 16:26:45 +02:00
Rasmus Karlsson 5a88f084a3 Add setting to not fetch chatters for bigger streamers 
Work on #57
 2018-03-30 15:46:47 +02:00
Rasmus Karlsson 1cac80c8ba Changed how the channel live status is stored 2018-03-30 15:42:08 +02:00
Rasmus Karlsson 1b9fa36e06 add mouseMove signal to SignalLabel 
Make use of the mouseMove signal in SplitHeader for the stream uptime
tooltip
 2018-03-30 14:48:35 +02:00
Rasmus Karlsson 1c7f397f1b Move signallabel code out from its header 2018-03-30 14:39:33 +02:00
Rasmus Karlsson d4f37f786b Once again reset completion model first time tab is pressed. This ensures we never tab the wrong username, but it's really expensive. 2018-03-30 13:51:15 +02:00
fourtf ec349f5978 added experimental new tabs 2018-03-30 13:44:01 +02:00
Rasmus Karlsson dc578a5f29 Add "Timeout action" setting 2018-03-25 11:07:03 +02:00
Rasmus Karlsson 41fbcc738b Fix and improve Streamlink code 
Move streamlink code to its own file

Fixes #275

Untested on linux, but should work decently there as well.
 2018-03-24 14:15:27 +01:00
Nikolai Zimmermann 6c56e9cc82 Don't add duplicats to message history (#277) 2018-03-24 12:22:03 +01:00
Rasmus Karlsson b2f041989c Move CompletionModel to a more appropriate folder 2018-03-24 12:13:22 +01:00
Rasmus Karlsson d9bd39e8a4 Remove "CompletionManager". Completion models are now stored in Channel 
Chatters list is now updated every 5 minutes
 2018-03-24 12:02:07 +01:00
Rasmus Karlsson ad12a818b2 change around variables names to make things a bit more clear 2018-03-24 11:15:33 +01:00
hemirt ab42a30108 Tabbing (#287) 
* change dotted last read message indicator to a line, remove
airbrushgrenade

* sort emotes in tab completion

* implement tabbing usernames

* FeelsOkayMan

* fix emotes and usernames comparing; formatting

* remove private/personal stuff

* change lastmessageindicator back to default verpattern
 2018-03-24 11:12:24 +01:00
fourtf a9d706048c modified "show message length" settings text 2018-02-09 13:50:02 +01:00
fourtf c3287a1da8 dream come true 2018-02-06 00:10:30 +01:00
fourtf 6b483640cd added username in the titlebar 2018-02-05 23:32:38 +01:00
fourtf 9b1300212a Fixes #266 graphical gliches after changing theme color 2018-02-05 21:33:22 +01:00
fourtf a44758ad23 Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-02-05 21:20:38 +01:00
fourtf b351c40d29 refactored irc 2018-02-05 15:11:50 +01:00
Rasmus Karlsson 556dbe0456 Fix whisper receiving 
Added setting to display them inline under "Special Channels" page

Store a twitch users color in the TwitchUser struct
this is useful if we ever want to use the users own color.
The users own color is only updated once he has written once in chat

Add helper method for calling function only on normal channels

Fixes #54
 2018-02-04 16:33:46 +01:00
Rasmus Karlsson 25979d4535 Unscuffed settings log page 2018-02-03 16:21:41 +01:00
Nikolai Zimmermann e2b54edb2d Fix build error (#264) 2018-01-30 13:31:18 +01:00
fourtf 0d417dfa2d minor style changes 2018-01-29 13:23:45 +01:00
fourtf 12b30eb2ed minor changes to the pr 2018-01-28 18:05:01 +01:00
fourtf 74fec12848 Merge branch 'master' of https://github.com/Confuseh/chatterino2 into Confuseh-master 2018-01-28 17:53:16 +01:00
fourtf 643486da14 enabled compact emtoes again 2018-01-28 16:29:47 +01:00
confuseh a104e92ad5 Add additional options for streamlink, remove static from qualitypopup 
Fixes #261
 2018-01-28 14:10:12 +00:00
Rasmus Karlsson 2f0844ebd9 Basic logging implemented 
Implemented scuffed logging settings page
Add helper function to PathManager to create an arbitrary folder
 2018-01-28 14:23:55 +01:00
fourtf f474db9443 minor changes in MessageLayout 2018-01-28 04:07:45 +01:00
fourtf 11775071b9 made Link a struct 2018-01-28 03:52:52 +01:00
fourtf 99aac9eb6a minor code improvements 2018-01-28 03:48:15 +01:00
fourtf 431b9a8c1f Merge branch 'master' of https://github.com/fourtf/chatterino2 2018-01-28 03:39:47 +01:00
fourtf 591ab4d8da simplified message.cpp 2018-01-28 03:29:42 +01:00
fourtf e518cff06e fixed icon scale in settings dialog 2018-01-27 21:51:08 +01:00
fourtf 34775094f6 fixed #252 clicking emotes in the emote popup 2018-01-27 21:42:47 +01:00
fourtf d33adff5c9 fixed emotes popup emotes 2018-01-27 21:13:22 +01:00
fourtf 56a7b05103 fixed titlebar scaling 2018-01-25 21:11:14 +01:00
fourtf ac6cbe9daf fixed + button size 2018-01-25 20:51:17 +01:00
fourtf 0a8073d0e5 refactored SplitInput 2018-01-25 20:49:49 +01:00
fourtf 8ab0fa4378 Fixes #259 dropping split on + button 2018-01-24 22:09:26 +01:00
fourtf de9e1b641d Fixes #234 links 2018-01-24 21:44:31 +01:00
fourtf f35ca0d2c8 fixed right clicking links 2018-01-24 21:16:00 +01:00
fourtf 05339aad2d started fixing clicking emtoes 2018-01-24 20:58:53 +01:00
fourtf 74fd6c9663 Fixes #258 theme change doesn't apply 2018-01-24 20:35:26 +01:00
fourtf f4863cbccb added buttons to the custom window frame 2018-01-24 20:27:56 +01:00
fourtf 93cfcbd3f1 added empty ketboard settings page 2018-01-24 15:34:04 +01:00
fourtf 36b010e046 added custom window frame for windows 2018-01-24 15:08:22 +01:00
fourtf 2b94c4cd33 renamed SharedChannel to ChannelPtr for consistency 2018-01-24 13:15:41 +01:00
fourtf fa344deaf0 fixed #237 /mentions 2018-01-23 23:28:06 +01:00
fourtf d741bf6df3 added SpecialChannelPage with a description for /mentions 2018-01-23 23:10:27 +01:00
fourtf 0f4ec70bf3 Fixes #53 last read message indicator 2018-01-23 22:48:33 +01:00
fourtf 8a77f918f6 fixed timestamps not updating when changed in the settings 2018-01-23 21:56:25 +01:00
fourtf dd05ea28fe added basic keyword ignore setting 2018-01-23 21:35:42 +01:00
Nikolai Zimmermann cb6af11b5a Changed some multiplier from 1000 to 100 2018-01-23 14:54:02 +01:00
fourtf 06be94b9a6 Fixes #179 tabs can't be repositioned 2018-01-22 21:31:45 +01:00
fourtf 305191d4b3 fixed #177 user popup being off the screen 2018-01-22 20:52:32 +01:00
fourtf fc758846f6 made the code actually compile 2018-01-22 20:14:43 +01:00
fourtf d966c24bc3 fixed #250 tooltips don't stay in window geometry 2018-01-22 15:06:36 +01:00
fourtf 3104aae80a fixed crash 2018-01-19 23:41:02 +01:00
fourtf de3a490257 added streamview widget 2018-01-19 14:49:21 +01:00
Rasmus Karlsson 702d4b2eec Rework the Account Popup Widget 
Fixed Account Popup Widget Follow/Unfollow
Ignoring now also works, but doesn't have the ability to unignore

Add a URL Delete method to the network manager

Fixes #235
 2018-01-18 18:20:40 +01:00
Bur0k 97411c045c Calling deleteLater() in CloseSplit 
Instead of removing the TwitchChannel manually in CloseSplit, a request
to delete this widget will be sent to QT.
In the destructor the TwitchChannel will be removed as planned.
 2018-01-17 20:09:53 +01:00
Bur0k 728b6e74a8 Remove the Twitch Channel when closing the split 2018-01-17 20:09:53 +01:00
confuseh 84186da16c Add missing streamlink option & make preferredQuality lowercase 2018-01-17 18:47:35 +01:00
fourtf f3357cf0f4 Fixes #225 fix am/pm for timestamps 2018-01-17 18:36:12 +01:00
fourtf 4ddb4616ee _ 2018-01-17 17:18:28 +01:00
fourtf 7310f1b888 fix for bur0k 2018-01-17 17:17:26 +01:00
fourtf b3951262c8 messages refresh when toggeling the button 2018-01-17 17:02:34 +01:00
fourtf e694214243 added toggle for moderation mode 2018-01-17 16:52:51 +01:00
fourtf 01efa1f447 Fixes #233 manual reconnect 2018-01-17 15:07:55 +01:00
fourtf 6d6b99f3ef added moderation buttons 2018-01-17 14:14:31 +01:00
fourtf 8dc4f8945e fixes empty tooltips showing 2018-01-17 03:26:32 +01:00
fourtf 776a975624 Fixes #232 opening streams in browser 2018-01-17 03:18:47 +01:00
fourtf e1ff4c818e added background color to the accountswitchwidget 2018-01-17 02:22:57 +01:00
fourtf 1fe7e652b1 added a tip to the SplitHeader when you have >1 tab 2018-01-17 02:04:10 +01:00
fourtf 0a3c6e29c7 added Alt+LeftClick to move splits around 2018-01-17 01:20:19 +01:00
fourtf 285c2e8688 Fixes #243 2018-01-16 18:59:10 +01:00
fourtf 66014d07a0 minor changes to the close tab confirm dialog 2018-01-16 18:55:30 +01:00
Bur0k 17f5fd0ff1 Added a confirmation Dialog when trying to close a tab 2018-01-16 18:44:25 +01:00
fourtf 0ca916717c added basic buggy text copying 2018-01-16 02:39:31 +01:00
fourtf a33ac76f99 fixed the default scrollbar size 2018-01-16 01:40:52 +01:00
fourtf a190eda075 fixed text selection 2018-01-16 00:26:04 +01:00
fourtf 6701c3d0b2 fixed compiling 2018-01-15 04:08:48 +01:00
fourtf d045f6963a disabled custom window frame for now 2018-01-15 01:59:05 +01:00
fourtf c50e6d7809 started working on a custom window frame 2018-01-15 01:35:35 +01:00
fourtf 177cd734ab centered splitheader title again 2018-01-14 22:24:21 +01:00
fourtf e0372a2453 moved dpi handling out of helper file 2018-01-14 21:59:45 +01:00
fourtf e19a83679f moved window logic from BaseWidget to BaseWindow 2018-01-14 21:55:36 +01:00
fourtf 8deb096a27 switched to proper icon for SplitHeader 2018-01-13 04:08:39 +01:00
fourtf 61d0229b4c refactored the SplitHeader 2018-01-13 04:05:38 +01:00
fourtf bc93ef7214 added settings page for moderation 2018-01-13 03:06:10 +01:00
fourtf faf5da2bf7 fixed notification tab not having an icon 2018-01-13 02:21:08 +01:00
fourtf 96feb9b54c _ 2018-01-13 02:18:13 +01:00
fourtf cec6f7ce9d fixed settingsdialogtab image being offset 2018-01-13 02:17:07 +01:00
fourtf 2073447df7 added highlights page again 2018-01-13 02:00:02 +01:00
fourtf d16bbf6899 fixed icons in settings pages 2018-01-13 00:18:18 +01:00
fourtf 2f0658935a added AboutPage back in again 2018-01-13 00:05:49 +01:00
Rasmus Karlsson 7772f245f6 refactor the refactor 2018-01-12 23:33:04 +01:00
fourtf e0bb061c81 refactored the settings dialog 2018-01-12 23:09:27 +01:00
Rasmus Karlsson 54502bc8b5 F5 adds a fake message to the IRCManager 
current messages have valid cheermotes in them
 2018-01-12 20:25:19 +01:00
fourtf a339c4ca0a fixes #221 2018-01-11 21:03:40 +01:00
fourtf 10850c0ec7 I BROKE EVERYTHING 
refactored the rendering process
 2018-01-11 20:17:41 +01:00
Bur0k c240d6f7c2 Added Qt::X11BypassWindowManagerHint to the WindowFlags of ToolTipWidget (#222) 2018-01-10 00:30:40 +01:00
Rasmus Karlsson ca0d672609 reformat settingsdialog.cpp 
this is just a reason to push a build to try out the CI
 2018-01-09 08:58:23 +01:00
nuuls 1eb256bd4e
fixed < in emote names breaking the <br> and tooltips on mac 2018-01-07 23:47:08 +01:00
nuuls 92cc1f354b
fixed scaling issue on mac and compilation issue 2018-01-07 23:26:11 +01:00
coral 1348032b57 High DPI logo 2018-01-07 12:03:04 -08:00
coral 6f1f91e78e Goodbye QGraphicsView 2018-01-07 11:55:41 -08:00
Rasmus Karlsson 08859deabc reformat settingsdialog.cpp 
just pushing this to test auto build/deploy :kkona:
 2018-01-07 17:28:42 +01:00
coral 1fab5adaf8 About box added in Settings, early implementation 2018-01-07 00:05:41 -08:00
coral 6377331364 Changed the global emoji symbol 2018-01-06 23:05:09 -08:00
Rasmus Karlsson 9fa9d7f0e3 Implement preferred emote quality setting. 
This doesn't work super well for Twitch emotes because they don't
conform to a proper emote scaling standard

Fixes #150
 2018-01-07 02:59:46 +01:00
coral 5baba39cdc NOT UGLY ICON PLX 2018-01-06 17:59:02 -08:00
fourtf a32d1c063c searching is now case insensitive 2018-01-07 00:05:32 +01:00
fourtf 6fec6514fa made int division float division 2018-01-06 21:47:19 +01:00
Rasmus Karlsson 26170e4fdb Add CTRL+SHIFT+T and CTRL+SHIFT+W to Open and Close tabs 
Fixes #21
 2018-01-06 21:00:41 +01:00
fourtf 29046b3aa1 fixed scrollbar divide by zero 2018-01-06 20:57:16 +01:00
Rasmus Karlsson b8e268f969 Implement CTRL+1 to CTRL+9 hotkeys for switching tabs 
Progress on #21
 2018-01-06 20:27:26 +01:00
Rasmus Karlsson 8aa459d826 Move shortcut creation code to its own helper file 2018-01-06 20:24:04 +01:00
fourtf e5b8e33eb3 removed fps limit 
it didn't increase performance and just made it look 'laggier'
 2018-01-06 18:21:00 +01:00
fourtf 20eab57db5 added highlights to the scrollbar 2018-01-06 03:48:56 +01:00
fourtf a4656f3ab5 added slight offset when notebook has no button 2018-01-05 23:55:41 +01:00
fourtf 3bf3490aa3 increased speed of smooth scrolling 2018-01-05 23:32:06 +01:00
fourtf 315cfd8605 bundling timeouts from same user 2018-01-05 23:14:55 +01:00
fourtf 47a813d5d6 added search popup 2018-01-05 13:42:23 +01:00
fourtf 02b73cfa27 I accidently an assignment 2018-01-05 12:22:03 +01:00
fourtf df81a0e5a5 Pause chat while hovering. Fixes #208 
Also pauses when clicking with double-click-links enabled and while
selecting text
 2018-01-05 11:22:51 +01:00
fourtf 4ac03f396f removed "Commands don't save" text 2018-01-05 11:04:37 +01:00
fourtf 8418e36e49 Fixed a bug where scrolling layouts wrong 
It used the wrong with to layout the messages.
 2018-01-05 10:41:21 +01:00
fourtf 69488eb2ea fixed off by one error 2018-01-05 03:41:31 +01:00
fourtf 898d1d26e7 added window icon 2018-01-05 03:30:43 +01:00
Rasmus Karlsson 069e42360b further fix setting collision 2018-01-05 03:19:41 +01:00
fourtf 1606ea648b added smoothscrolling on new message 2018-01-05 03:15:04 +01:00
Rasmus Karlsson e58c5ec11b Fix window geometry loading 
Fixes #181
 2018-01-05 03:09:44 +01:00
Rasmus Karlsson 334860dad2 Remove unused appdatapath class 
Reformat some code
 2018-01-05 03:00:29 +01:00
fourtf fd8ddcff55 fixes #113 2018-01-05 02:55:28 +01:00
fourtf 947589358b fixed #15 2018-01-05 02:05:59 +01:00
fourtf 43568556be Fixes #195 2018-01-05 01:31:01 +01:00
fourtf 23e5100227 refresh rate lock for ChannelView 2018-01-05 00:15:03 +01:00
fourtf fc1fb35947 changed text of the jump-to-bottom-button 2018-01-05 00:01:31 +01:00
fourtf 4a2850c4f5 moved selection into its own file 2018-01-04 23:50:30 +01:00
fourtf 4a91372f8f fixed #182 2018-01-04 23:35:36 +01:00
fourtf 8693203c6d added command tab to settings but they don't save 2018-01-04 04:03:51 +01:00
Rasmus Karlsson 9044700ec6 Convert remaining settings to the new settings system 2018-01-04 02:23:59 +01:00
Rasmus Karlsson df733282be Move highlight phrases to new settings system 
Add a setting serialize/deserializer for QString
Add constructor to ChatterinoSetting that doesn't take a default value
 2018-01-04 01:52:37 +01:00
coral 0e8b50c4e9 New setting menu icons! (#189) 
* LUL

* Added system icon for OSX
 2018-01-02 03:44:52 +01:00
eb4ba30d9f omited struct names in ThemeManager 2018-01-02 02:21:38 +01:00
3e5937011a the rewrite that nobody wanted 2018-01-02 02:15:11 +01:00
330a79f6f1 made message grey out when user it timed out 2018-01-01 23:29:54 +01:00
3fc4ddea56 I hate c++ and everything it stands for 2018-01-01 22:29:21 +01:00
5a26d5f17f put singletons into their namespace 2017-12-31 22:58:35 +01:00
bfa2f1637e refactored the managers 2017-12-31 00:50:07 +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 caddb2c778 Add the "Close Tabs" feature 
Also made notebooks open a container if no tabs are loaded

Fixes #166
 2017-12-28 18:17:25 +01:00
0cdf974310 Merge branch 'master' of https://github.com/fourtf/chatterino2 2017-12-28 17:50:24 +01:00
e0bdc5ccf9 forgot to remove this xD 2017-12-28 16:56:24 +01:00
Rasmus Karlsson c9c2aa6dce Fixed crash bug described by Cranken in #165 2017-12-28 16:26:35 +01:00
ece0482502 removed autoscoll and gotobottom from emotepopup 2017-12-28 00:48:21 +01:00
2cdc404eb4 fixed rounding issue that caused an infinite loop 2017-12-27 23:18:42 +01:00
9bbacdfae4 changed login url in logindialog 2017-12-27 22:26:23 +01:00
4f3f9906f1 commented code out that didn't compile 2017-12-27 21:29:56 +01:00
fourtf 2fc546cada made scrollbar a thin boi 
Expands when hovered with the mouse
 2017-12-26 19:14:36 +01:00
fourtf 9dd6966e8c graphicbuffers of msgs offscreen get discarded now 2017-12-26 18:24:02 +01:00
fourtf 6c23925406 fixed render hints at wrong places 2017-12-26 17:41:03 +01:00
fourtf 5df7651670 removed a debug log 2017-12-26 17:31:15 +01:00
fourtf 285c72a83d fixed "jump to bottom" now disapearing after click 2017-12-26 17:15:23 +01:00
fourtf 4e4cc9223e tweaked the light themes 2017-12-26 16:54:39 +01:00
Rasmus Karlsson 13b39e374b Tabs now highlight when a highlight is received 
Work on #88
 2017-12-26 12:32:24 +01:00
Rasmus Karlsson 7a8cc91eec Move HighlightState to common.hpp 2017-12-26 12:30:32 +01:00
Rasmus Karlsson ebd682730a rename highlight style to highlight state 2017-12-26 12:05:14 +01:00
Rasmus Karlsson 03962db367 move some logic abou updated state to twitchuser 2017-12-26 11:59:26 +01:00
fourtf 0ca4a098e1 Fixed tooltip now closing properly. Fixes #159 2017-12-24 23:56:08 +01:00
fourtf 91099c028e moved the tooltip close logic to basewidget 2017-12-24 16:01:01 +01:00
fourtf 2bf53f73f8 oh no the bad commit descriptions are back D: 2017-12-23 23:24:35 +01:00
Cranken a617873f6a Implemented a new, better looking tooltip. (#158) 
* Implemented a new, better looking tooltip.

* Pajlada fix.

* Fixed dragging behaving incorrectly.

* Fixed out of focus hovering getting stuck.
 2017-12-23 22:17:38 +01:00
fourtf fc81b118c7 replaced qt font scaling 
remove the qt font scaling and added code that uses the actual scale/dpi value
 2017-12-23 21:18:13 +01:00
Rasmus Karlsson ec63bc59be Fix autocomplete not being refreshed properly upon first TAB 2017-12-22 16:50:33 +01:00
Rasmus Karlsson 2bd80763e7 Fix some obvious warnings 
Ignore some stupid warnings
 2017-12-22 15:13:42 +01:00
Rasmus Karlsson d8c01ce374 Save chats and tabs in new settings system 2017-12-22 14:44:31 +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 be3c85d72d Move some variables into const.hpp 
Clean up some code in the AccountManager
 2017-12-19 16:13:02 +01:00
Rasmus Karlsson 324dfc9ee9 Fix account adding and account removing. 
This needs to be fully tested before I'm comfortable closing #9

The "advanced" tab also needs testing

We might also want to move the login website to chatterino.com and make
it look nicer
 2017-12-19 15:12:33 +01:00
Rasmus Karlsson 4b36893818 Add simple tooltip system 2017-12-19 03:38:42 +01:00
fourtf 01dbaed781 disabled tabs in the settings that are ununsed 2017-12-19 03:37:07 +01:00
fourtf 6f0620ead6 added emojis to the emote popup 2017-12-19 03:18:27 +01:00
Rasmus Karlsson 14e80d5012 Implement mouse scroll speed setting 
Fixes #145
 2017-12-19 02:48:19 +01:00
fourtf e39b9093f9 fixed selection color for light theme 2017-12-19 02:37:58 +01:00
fourtf f8e4d9a737 changes for light theme 
- fixed light colored text being too bright
- fixed the ripple effect being white on grey
 2017-12-19 02:24:05 +01:00
Rasmus Karlsson 1a870685b0 Implement the "inline" account switch button 
Make the account switch listview into a widget
 2017-12-19 02:17:01 +01:00
fourtf 4010c49c84 fixed messages not redrawing after changing theme 2017-12-19 01:54:51 +01:00
fourtf f9487b1dae fix accountpopup code style aka add 5 mio this-> 2017-12-19 01:25:57 +01:00
fourtf 368ec7c903 fixed coding style for scrollbar 2017-12-19 01:11:35 +01:00
fourtf c950e9c58a added some code for collapsing messages 2017-12-19 00:10:03 +01:00
Rasmus Karlsson 5c6411b50b Added "Anonymous" (aka not logged in) as an option for the account chooser 2017-12-18 23:50:39 +01:00
Rasmus Karlsson bf39851776 update window title when changing accounts 2017-12-18 23:50:39 +01:00
fourtf e46357ad9b small fixes for the scrollbar 2017-12-18 22:13:46 +01:00
fourtf f8cf983b7c added an option to disable smooth scrolling 2017-12-18 20:18:20 +01:00