Merge branch 'feature/rich-media-cachex' into 'develop'
[akkoma] / lib / pleroma / web / mastodon_api / views /
2019-01-04 rinpatchMerge branch 'feature/rich-media-cachex' into 'develop'
2019-01-04 kaniiniMerge branch 'fix/html-cache-content-collision' into...
2019-01-04 Rin ToshakaDifferent caches based on the module. Remove scrubber...
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-31 lambdaMerge branch 'fix/scrubber-cache' into 'develop'
2018-12-31 Rin ToshakaMove scrubber cache-related functions to Pleroma.HTML
2018-12-30 Rin ToshakaResolve merge conflict
2018-12-30 Rin ToshakaFriendship ended with Postgresql now Cachex is my best...
2018-12-30 Rin ToshakaAdded get_stripped_html_for_object. Renamed a few things
2018-12-29 Rin ToshakaI am not sure what's going on anymore so I'll just...
2018-12-29 kaniiniMerge branch 'carrot-bullying' into 'develop'
2018-12-29 kaniiniMerge branch '483_blocks_import_export' into 'develop'
2018-12-29 kaniiniMerge branch '471_invalid_accounts_rendering' into...
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-28 Ivan Tashkinov[#467] Refactored valid / invalid user rendering.
2018-12-28 Ivan Tashkinov[#471] Factored out User.visible_for?/2.
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-27 Ivan Tashkinov[#471] Prevented rendering of inactive local accounts.
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-12-23 lambdaMerge branch 'bugfix/trans_fix_url_videos' into 'develop'
2018-12-23 William Pitcockmastodon api: status view: remove obsolete peertube...
2018-12-23 lambdaMerge branch 'hotfix/activity-without-content' into...
2018-12-20 lambdaMerge branch 'ci-test-fix' into 'develop'
2018-12-20 kaniiniMerge branch '114_email_confirmation' into 'develop'
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 Ivan Tashkinov[#114] Added `pleroma.confirmation_pending` to user...
2018-12-16 HaelwennMerge branch 'develop' into 'develop'
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-15 lambdaMerge branch 'fix/views-ignore-unhandled-activites...
2018-12-15 lambdaMerge branch 'tests-warning-as-errors' into 'develop'
2018-12-14 hrefMerge branch 'fix/issue_433' into 'develop'
2018-12-14 hrefMerge branch '114_email_invites' into 'develop'
2018-12-14 hrefMerge branch 'fix/issue_272' into 'develop'
2018-12-14 Maksim Pechnikovfix case when tags is invalid
2018-12-14 Maksim Pechnikovfix tags
2018-12-14 hrefMerge branch 'pleroma-feature/compat/push-subscriptions...
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 Egor Kislitsynfix and improve web push; add configuration docs
2018-12-10 lambdaMerge branch 'fix_empty_bio_crash' into 'develop'
2018-12-10 lambdaMerge branch 'fix/mix-task-uploads-moduledoc' into...
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'support/bugfix_272' into 'develop'
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-10 lambdaMerge branch 'anonymize-filter-text' into 'develop'
2018-12-10 lambdaMerge branch 'develop' into 'fix/mix-task-uploads-modul...
2018-12-10 lambdaMerge branch 'parallel588/pleroma-support/compile_warni...
2018-12-09 Maksim Pechnikovfix compile warnings
2018-12-09 Maksim Pechnikovformatting
2018-12-09 Maksim Pechnikovfix hashtags in api response
2018-12-08 lambdaMerge branch 'fix/add-upload.ex' into 'develop'
2018-12-08 lambdaMerge branch 'fix/typo-relay-ex' into 'develop'
2018-12-07 lambdaMerge branch 'fix/gopher-respect-ip' into 'develop'
2018-12-07 lambdaMerge branch 'media-proxy-follow-redirect' into 'develop'
2018-12-07 lambdaMerge branch '394_user_tags' into 'develop'
2018-12-06 Ivan Tashkinov[#394] User view (Twitter & Mastadon API): wrapped...
2018-12-06 Ivan Tashkinov[#394] Refactoring.
2018-12-06 Rin ToshakaMerge develop
2018-12-06 Ivan Tashkinov[#394] Added `users.tags` and admin routes to tag and...
2018-12-06 kaniiniMerge branch 'fix/mastodon-api-settings' into 'develop'
2018-12-06 kaniiniMerge branch 'correct-and-improve-http-options' into...
2018-12-06 kaniiniMerge branch 're-mrf' into 'develop'
2018-12-06 kaniiniMerge branch 'feature/compat/push-subscriptions' into...
2018-12-06 Egor Kislitsynclean up
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri...
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks
2018-12-03 lambdaMerge branch 'fix-media-proxy-defaults' into 'develop'
2018-12-02 rinpatchMerge branch 'develop' into fix/theora-detection-read...
2018-12-01 kaniiniMerge branch 'validate-user-info' into 'develop'
2018-12-01 rinpatchAttempt to resolve merge conflict
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2018-11-30 lainMerge remote-tracking branch 'origin' into validate...
2018-11-20 lainFix most mastodon api bugs.
2018-11-20 William Pitcockmastodon api: account view: fix tests
2018-11-15 Hakaba HitoyoMerge remote-tracking branch 'official/develop' into...
2018-11-10 kaniiniMerge branch 'tests/prismo-url-map' into 'develop'
2018-11-03 kaniiniMerge branch 'feature/cors-again' into 'develop'
2018-11-03 HaelwennMerge branch 'bugfix/harden_status_output' into 'develop'
2018-11-03 Haelwenn (lanodan... Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
2018-11-01 kaniiniMerge branch 'feature/as2-page-support' into 'develop'
2018-11-01 William Pitcockmastodon api: add support for rendering Page objects
2018-11-01 kaniiniMerge branch 'feature/relay-tests' into 'develop'
2018-11-01 HaelwennMerge branch 'bugfix/prismo.news_article_url' into...
2018-11-01 Haelwenn (lanodan... Pleroma.Web.MastodonAPI.StatusView: Do not fail when...
2018-10-29 kaniiniMerge branch 'bugfix/mediaproxy-leaks' into 'develop'
2018-10-29 William Pitcocktwitter/mastodon api: always use mediaproxy URLs in...
2018-10-25 kaniiniMerge branch 'finmoji-optional' into 'develop'
2018-10-25 kaniiniMerge branch 'bugfix/ap-uri-user-search' into 'develop'
2018-10-25 HaelwennMerge branch 'bugfix/233-handle-missing-StatusView...
2018-10-25 Haelwenn (lanodan... [Pleroma.Web.MastodonAPI.StatusView]: Remove unused...
2018-10-25 Haelwenn (lanodan... [Pleroma.Web.MastodonAPI.StatusView]: Remove nils from...
2018-10-25 Haelwenn (lanodan... [Pleroma.Web.MastodonAPI.StatusView]: Return nil as...
2018-10-07 kaniiniMerge branch 'security/follow-always-async' into 'develop'
next