aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
AgeCommit message (Collapse)Author
2019-06-03update api to set skip_thread_containmentMaksim Pechnikov
2019-06-02Merge branch 'feature/notification-control-part-2' into 'develop'kaniini
notification controls, part 2 See merge request pleroma/pleroma!1204
2019-05-30Use Pleroma.Config everywhereEgor Kislitsyn
2019-05-25twitter api: user view: expose user notification settings under pleroma objectWilliam Pitcock
2019-05-23fix merge conflictSachin Joshi
2019-05-22Ability to reset avatar, profile banner and backgroudSachin Joshi
2019-05-21Add virtual :thread_muted? fieldAaron Tinio
that may be set when fetching activities
2019-05-15activitypub: remove contain_timeline()William Pitcock
2019-05-15CommonAPI: Refactor visibility, forbid public to private replies.lain
2019-05-15remove deprecated PleromaFE configurationSachin Joshi
2019-05-14Merge branch 'refactor/use-job-queue-everywhere' into 'develop'lambda
use job queue everywhere Closes #862 See merge request pleroma/pleroma!1142
2019-05-14clean up follow/block imports a littleWilliam Pitcock
2019-05-14Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-13user: migrate follow/blocks import to job queueWilliam Pitcock
2019-05-13differences_in_mastoapi_responses.md: fullname & bio are optionnalAlexander Strizhakov
[ci skip]
2019-05-09Use "repeated" instead of "retweeted" for repeated statuses in Twitter APIFrancis Dinh
This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
2019-05-07twitterapi: use order constraint to force descending orderWilliam Pitcock
2019-05-07Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Alexander Strizhakov
feature/845-improve-status-deletion
2019-05-03TwitterAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03Web.TwitterAPI.UserView: Also view local user emojisHaelwenn (lanodan) Monnier
2019-05-03formatter.ex: Add get_emoji_map/1Haelwenn (lanodan) Monnier
2019-05-01Merging with developAlex S
Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex
2019-04-28Fix `rights` in TwitterAPI's user entity being present only forrinpatch
Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.
2019-04-25Merge branch 'develop' into feature/disable-accountEgor Kislitsyn
2019-04-24Fix leaking private configuration parameters in Mastodon and Twitter APIs, ↵rinpatch
and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-23Extend Mastodon API with public endpoint for getting Favorites timeline of ↵Sergey Suprunenko
any user (#789)
2019-04-22added healthcheck setting to instance configAlex S
2019-04-22Use `User.get_cached*` everywhereEgor
2019-04-22Feature/826 healthcheck endpointAlexander Strizhakov
2019-04-22Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-20Fix incorrect multiple emoji tag handling introduced in initial implEkaterina Vaartis
2019-04-18Fix search in TwitterAPIrinpatch
2019-04-17Merge branch 'develop' into feature/database-compactionrinpatch
2019-04-16Handle new-style mastodon follow listsNormandy
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-15Remove inReplyToStatusIdrinpatch
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029
2019-04-11move user disable into deactivationEgor Kislitsyn
2019-04-11Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-04-10Merge branch 'feature/767-multiple-use-invite-token' into 'develop'lambda
Feature/767 multiple use invite token See merge request pleroma/pleroma!1032
2019-04-10Merge branch 'fix/emoji-api-nonsense' into 'develop'lambda
Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038
2019-04-10s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/Haelwenn (lanodan) Monnier
2019-04-10s/Pleroma.Mailer/Pleroma.Emails.Mailer/Haelwenn (lanodan) Monnier
2019-04-10Merge branch 'notification-pleroma-settings' into 'develop'kaniini
Notification controls Closes #738 See merge request pleroma/pleroma!988
2019-04-09Change response format of /api/pleroma/emoji to the one that actually makes ↵rinpatch
sense
2019-04-06code styleAlex S
2019-04-06Merge develop to 770-add-emoji-tagsAlex S
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06token -> invite renamingAlex S
2019-04-06twitter api registrationAlex S
fix for twitter api tests
2019-04-05Refactor html caching functions to have a key instead of a module, use more ↵rinpatch
correct terminology and fix summaries in mastoapi