projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'muting' into 'develop'
[akkoma] / lib / pleroma / web / mastodon_api / views /
2019-03-03 kaniiniMerge branch 'muting' into 'develop' tree | commitdiff
2019-03-03 rinpatchMerge branch 'remove-todo-txt' into 'develop' tree | commitdiff
2019-03-03 kaniiniMerge branch 'features/bio_rel_me' into 'develop' tree | commitdiff
2019-03-03 kaniiniMerge branch 'feature/add-pagination-to-users-admin... tree | commitdiff
2019-03-03 lambdaMerge branch 'fix/dont-show-dms-in-mentions-timeline... tree | commitdiff
2019-03-02 rinpatchMerge branch 'bugfix/oauth-scopes-join' into 'develop' tree | commitdiff
2019-03-01 lambdaMerge branch 'bugfix/236-ambiguous-route-for-numerical... tree | commitdiff
2019-02-28 Maxim FilippovUse Mastodon API views in Admin API tree | commitdiff
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop' tree | commitdiff
2019-02-28 kaniiniMerge branch 'with-mutes' into 'develop' tree | commitdiff
2019-02-28 hrefMerge branch 'customizable_auth' into 'develop' tree | commitdiff
2019-02-28 kaniiniMerge branch 'speedup-follow-requests' into 'develop' tree | commitdiff
2019-02-28 kaniiniMerge branch 'deactivated-in-user-view' into 'develop' tree | commitdiff
2019-02-28 lambdaMerge branch 'feature/mastoapi-embedded-relationships... tree | commitdiff
2019-02-27 lainAdd user muted status info to MastodonAPI. tree | commitdiff
2019-02-27 William Pitcockmastodon api: embed relationship card under account... tree | commitdiff
2019-02-22 kaniiniMerge branch 'fix/twittercards' into 'develop' tree | commitdiff
2019-02-20 kaniiniMerge branch 'feature/reports' into 'develop' tree | commitdiff
2019-02-20 EgorReports tree | commitdiff
2019-02-20 kaniiniMerge branch 'nicer-share-urls' into 'develop' tree | commitdiff
2019-02-20 lainAdd some nicer urls in status view. tree | commitdiff
2019-02-20 Ivan Tashkinov[#468] Merged `upstream/develop`. tree | commitdiff
2019-02-20 lambdaMerge branch 'muting' into 'develop' tree | commitdiff
2019-02-19 Ekaterina VaartisUpdate the mute implementation to the current codebase tree | commitdiff
2019-02-19 Ekaterina VaartisImplement muting, add it to the mastodon API tree | commitdiff
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards tree | commitdiff
2019-02-19 Ivan Tashkinov[#468] Merged `upstream/develop`. tree | commitdiff
2019-02-19 lambdaMerge branch 'fix/check-follower-collection-in-is_priva... tree | commitdiff
2019-02-19 lambdaMerge branch 'fix/ap_id-unique_constraint' into 'develop' tree | commitdiff
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop' tree | commitdiff
2019-02-18 kaniiniMerge branch 'patch-image-description' into 'develop' tree | commitdiff
2019-02-18 kaniiniMerge branch 'feature/add-oauth-tokens-endpoint' into... tree | commitdiff
2019-02-18 kaniiniMerge branch 'features/flavour-switching' into 'develop' tree | commitdiff
2019-02-18 kaniiniMerge branch 'follow-request-count' into 'develop' tree | commitdiff
2019-02-18 kaniiniMerge branch 'csv-export' into 'develop' tree | commitdiff
2019-02-17 lambdaMerge branch 'develop' into 'docs/add-clients-to-ex_doc' tree | commitdiff
2019-02-17 lambdaMerge branch 'docker-speedup' into 'develop' tree | commitdiff
2019-02-17 lambdaMerge branch 'mastoapi-stop-capping-attachments' into... tree | commitdiff
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts. tree | commitdiff
2019-02-16 rinpatchRemove a limit on attachments in Mastodon API and docum... tree | commitdiff
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2019-02-14 kaniiniMerge branch 'fix/credo-issues-test' into 'develop' tree | commitdiff
2019-02-11 rinpatchMerge branch 'feature/thread-muting' into 'develop' tree | commitdiff
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting tree | commitdiff
2019-02-11 Karen KonouRefactor as per Rin's suggestions, add endpoint tests tree | commitdiff
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10... tree | commitdiff
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop' tree | commitdiff
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop' tree | commitdiff
2019-02-10 Karen Konourefactor, status view updating, error handling tree | commitdiff
2019-02-09 Haelwenn (lanodan... de-group alias/es tree | commitdiff
2019-02-09 Haelwenn (lanodan... Make credo happy tree | commitdiff
2019-02-08 lambdaMerge branch 'fix/do-split-migration-for-local-users... tree | commitdiff
2019-02-08 Karen KonouMerge branch 'develop' into feature/thread-muting tree | commitdiff
2019-02-08 rinpatchMerge branch 'develop' into feature/keyword-policy tree | commitdiff
2019-02-06 HaelwennMerge branch 'bugfix/rich-media-card' into 'develop' tree | commitdiff
2019-02-06 William Pitcockmastodon api: rich media: don't clobber %URI struct... tree | commitdiff
2019-02-06 rinpatchMerge branch 'fix/activitypub-user-view-badmap' into... tree | commitdiff
2019-02-06 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-02-05 kaniiniMerge branch 'fix-dm-index' into 'develop' tree | commitdiff
2019-02-05 kaniiniMerge branch 'feature/ap-c2s-whoami' into 'develop' tree | commitdiff
2019-02-05 kaniiniMerge branch 'feature/split-hide-network-v2' into ... tree | commitdiff
2019-02-05 kaniiniMerge branch 'bugfix/rich-media-image-nil' into 'develop' tree | commitdiff
2019-02-05 William Pitcockmastodon api: fix rendering of cards without image... tree | commitdiff
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-02-04 rinpatchMerge branch 'hotfix/hellthread-deprecation-warning... tree | commitdiff
2019-02-04 kaniiniMerge branch 'mime-riff' into 'develop' tree | commitdiff
2019-02-04 rinpatchMerge branch 'fix/rich-media-relative-path' into 'develop' tree | commitdiff
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-02-02 rinpatchCheck if rich media uri is relative tree | commitdiff
2019-02-02 rinpatchUse with instead of if in the card tree | commitdiff
2019-02-02 rinpatchmerge only if page_url is an absolute path tree | commitdiff
2019-02-02 rinpatchFix rich media relative path tree | commitdiff
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop' tree | commitdiff
2019-02-01 hrefMerge branch '534_federation_targets_reachability'... tree | commitdiff
2019-01-31 HaelwennMerge branch 'docs/pleroma-api-invite-token' into ... tree | commitdiff
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop' tree | commitdiff
2019-01-31 HaelwennMerge branch 'features/glitch-soc-frontend' into 'develop' tree | commitdiff
2019-01-31 Egor KislitsynMerge remote-tracking branch 'MAIN/develop' into featur... tree | commitdiff
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop' tree | commitdiff
2019-01-29 HaelwennMerge branch 'feature/rich-media-part-2-electric-boogal... tree | commitdiff
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`. tree | commitdiff
2019-01-28 HaelwennMerge branch 'safe-render-activities' into 'develop' tree | commitdiff
2019-01-28 hrefre f83bae7c: remove unnecessary filter tree | commitdiff
2019-01-28 William Pitcockmastodon api: card: force OGP images through mediaproxy tree | commitdiff
2019-01-28 William Pitcockrich media: add helpers module, use instead of Mastodon... tree | commitdiff
2019-01-28 William Pitcockmastodon api: embed card in status object tree | commitdiff
2019-01-28 William Pitcockmastodon api: factor out status card fetching, move... tree | commitdiff
2019-01-28 Haelwenn (lanodan... [MastoAPI][GlitchAPI] Add bookmarks tree | commitdiff
2019-01-27 lambdaMerge branch 'safe-render-activities' into 'develop' tree | commitdiff
2019-01-27 kaniiniMerge branch 'discard-invalid-likes' into 'develop' tree | commitdiff
2019-01-27 hrefViews: wrap activity rendering in a rescue tree | commitdiff
2019-01-27 kaniiniMerge branch 'flake-random-worker-id' into 'develop' tree | commitdiff
2019-01-27 kaniiniMerge branch 'features/mastoapi-multi-hashtag' into... tree | commitdiff
2019-01-27 HaelwennMerge branch 'features/masto-account-view-rights' into... tree | commitdiff
2019-01-27 Haelwenn (lanodan... Web.MastodonAPI.AccountView: Add is_moderator and is_admin tree | commitdiff
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop' tree | commitdiff
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider' tree | commitdiff
2019-01-25 kaniiniMerge branch 'classic-flakeids' into 'develop' tree | commitdiff
2019-01-23 kaniiniMerge branch 's3-namespace' into 'develop' tree | commitdiff
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git