aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
AgeCommit message (Collapse)Author
2019-04-02Merging develop into feature/770-add-emoji-tagsAlex S
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02Merge branch 'bugfix/share-mastodon' into 'develop'lambda
[OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002
2019-04-02Merge develop into feature/770-add-emoji-tagsAlex S
2019-04-02replace `Repo.get_by(User, nickname: nickname)` with ↵Egor Kislitsyn
`User.get_by_nickname(nickname)`
2019-04-02change `Repo.get(User, id)` => `User.get_by_id(id)`Egor Kislitsyn
2019-04-02change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`Egor Kislitsyn
2019-04-02add support for all status type (ostatus) and replase case with ifSachin Joshi
2019-04-02fetch url for OStatus to know if it is a/c or statusSachin Joshi
2019-04-01[OStatus] adds status to pleroma instance if the url given is a statusSachin Joshi
2019-04-01Adding tag to emoji ets tableAlex S
changes in apis
2019-03-28Add PUT /api/pleroma/notification_settings endpointeugenijm
2019-03-26Remove ActivityRepresenterrinpatch
2019-03-23Fix text being nullable in TwitterAPIrinpatch
2019-03-22Merge branch 'safe-mentions' into 'develop'kaniini
Add safe dm mode option. See merge request pleroma/pleroma!958
2019-03-21common api: move context functions from twitterapiWilliam Pitcock
2019-03-21UtilController: Return state of safe dm mentions.lain
2019-03-18Initial attempt at updating return typeZachary Dunn
2019-03-15Allow to mark a single notification as readeugenijm
2019-03-13Unify unfollow, accept and reject follow requests using CommonAPIeugenijm
2019-03-13Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/esHaelwenn (lanodan) Monnier
2019-03-13[Credo] make all variables use snake_caseHaelwenn (lanodan) Monnier
2019-03-13[Credo] fix Credo.Check.Readability.AliasOrderHaelwenn (lanodan) Monnier
2019-03-13[Credo] Fix the consistencyHaelwenn (lanodan) Monnier
2019-03-04Merge remote-tracking branch 'pleroma/develop' into feature/disable-accountEgor Kislitsyn
2019-03-04Merge branch 'unify-follow' into 'develop'kaniini
Unify follow code with CommonAPI Closes #690 See merge request pleroma/pleroma!889
2019-03-04allow users to disable their own accountEgor Kislitsyn
2019-03-04Fix DM visibility for blocking userseugenijm
2019-03-04Unify Mastodon and Twitter follow implementations using CommonAPIeugenijm
2019-03-03Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'kaniini
Add pagination and search to users See merge request pleroma/pleroma!873
2019-03-03Remove follow_request_count as it's not needed for FE anymore.eugenijm
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses `GET /api/pleroma/friend_requests` which they query on the initial page load.
2019-03-03Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'lambda
[#675] Do not show DMs in mentions timeline See merge request pleroma/pleroma!877
2019-03-01Add "local" params to users searchMaxim Filippov
2019-03-01Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'lambda
Bugfix #236 Prefer user look-up by nickname See merge request pleroma/pleroma!860
2019-03-01[#675] Do not show DMs in mentions timelinerinpatch
2019-02-28Use Mastodon API views in Admin APIMaxim Filippov
2019-02-28Merge branch 'with-mutes' into 'develop'kaniini
Add `with_muted` param. Closes #683 See merge request pleroma/pleroma!872
2019-02-28Added deactivated to the user vieweugenijm
2019-02-28Add pagination to users admin APIMaxim Filippov
2019-02-27Remove parts of the old activity view.lain
Not used anymore.
2019-02-27Add user muted status info to twitterapi.lain
2019-02-27Add more admin actionsMaxim Filippov
2019-02-24delegate user retrieval to the User module11backslashes
2019-02-22Move visibility into own module.lain
2019-02-20ReportsEgor
2019-02-18Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'kaniini
Add OAuth tokens endpoint See merge request pleroma/pleroma!805
2019-02-18Merge branch 'follow-request-count' into 'develop'kaniini
Follow request count See merge request pleroma/pleroma!817
2019-02-17Render only "id", "valid_until" and "app_name" in TokenViewMaxim Filippov
2019-02-16Add option to return all friends in twitter api.lain
Mainly useful for user export.
2019-02-15Add logic for keeping follow_request_count up-to-date on the `follow`,eugenijm
`approve_friend_request`, and `deny_friend_request` actions. Add follow_request_count to the user view.
2019-02-13Add revoke tokenMaxim Filippov