Diffusion Choqok 6c895cdb391c

Merge branch 'mastodon'
6c895cdb391c
Actions

Authored by scarpino on Feb 4 2020, 10:03 PM.

Description

Merge branch 'mastodon'

Details

Committed

scarpino

Feb 4 2020, 10:03 PM

Parents

R186:e46ea1df9842: Fix warnings
R186:7c79ba9815cc: Release 1.7.0

Branches

Unknown

Tags

Unknown

scarpino committed R186:6c895cdb391c: Merge branch 'mastodon' (authored by scarpino).Feb 4 2020, 10:03 PM

Merged Changes

Commit	Author	Details	Committed
e46ea1df9842	scarpino	Fix warnings	Feb 4 2020
027c16f195dc	scarpino	Replace acct with id	Feb 4 2020
e279021136bc	scarpino	The old website has been replaced by choqok.kde.org	Feb 4 2020
b00f8f711aab	scarpino	Add Mastodon support	Feb 4 2020

Changes (38)

		Path
M		README
M		choqok/mainwindow.cpp
M		libchoqok/account.cpp
M		libchoqok/microblog.cpp
M		microblogs/CMakeLists.txt
A	(dir)	microblogs/mastodon/
A		microblogs/mastodon/CMakeLists.txt
A		microblogs/mastodon/choqok_mastodon.desktop
A	(dir)	microblogs/mastodon/icons/
A		microblogs/mastodon/icons/128-apps-mastodon_microblog.png
A		microblogs/mastodon/icons/16-apps-mastodon_microblog.png
A		microblogs/mastodon/icons/22-apps-mastodon_microblog.png
A		microblogs/mastodon/icons/32-apps-mastodon_microblog.png
A		microblogs/mastodon/icons/48-apps-mastodon_microblog.png
A		microblogs/mastodon/icons/64-apps-mastodon_microblog.png
A		microblogs/mastodon/icons/CMakeLists.txt
A		microblogs/mastodon/mastodonaccount.cpp
P		microblogs/mastodon/mastodonaccount.h Copied from microblogs/pumpio/pumpioaccount.h
P		microblogs/mastodon/mastodoncomposerwidget.cpp Copied from microblogs/pumpio/pumpiocomposerwidget.cpp
P		microblogs/mastodon/mastodoncomposerwidget.h Copied from microblogs/pumpio/pumpiocomposerwidget.h
P		microblogs/mastodon/mastodondebug.cpp Copied from microblogs/ocs/ocsdebug.cpp
P		microblogs/mastodon/mastodondebug.h Copied from choqok/config/plugins/pluginsdebug.h
P		microblogs/mastodon/mastodondmessagedialog.cpp Copied from helperlibs/twitterapihelper/twitterapidmessagedialog.cpp
P		microblogs/mastodon/mastodondmessagedialog.h Copied from helperlibs/twitterapihelper/twitterapidmessagedialog.h
P		microblogs/mastodon/mastodoneditaccountwidget.cpp Copied from microblogs/pumpio/pumpioeditaccountwidget.cpp
P		microblogs/mastodon/mastodoneditaccountwidget.h Copied from microblogs/pumpio/pumpioeditaccountwidget.h
P		microblogs/mastodon/mastodoneditaccountwidget.ui Copied from microblogs/pumpio/pumpioeditaccountwidget.ui
A		microblogs/mastodon/mastodonmicroblog.cpp
P		microblogs/mastodon/mastodonmicroblog.h Copied from microblogs/pumpio/pumpiomicroblog.h
A		microblogs/mastodon/mastodonoauth.cpp
P		microblogs/mastodon/mastodonoauth.h Copied from helperlibs/twitterapihelper/twitterapioauth.h
P		microblogs/mastodon/mastodonoauthreplyhandler.cpp Copied from helperlibs/twitterapihelper/twitterapioauthreplyhandler.cpp
P		microblogs/mastodon/mastodonoauthreplyhandler.h Copied from microblogs/pumpio/pumpiooauthreplyhandler.h
P		microblogs/mastodon/mastodonpost.cpp Copied from microblogs/pumpio/pumpiopost.cpp
P		microblogs/mastodon/mastodonpost.h Copied from microblogs/pumpio/pumpiooauthreplyhandler.cpp
A		microblogs/mastodon/mastodonpostwidget.cpp
P		microblogs/mastodon/mastodonpostwidget.h Copied from microblogs/pumpio/pumpiopostwidget.h
M		microblogs/twitter/twitteraccount.cpp