summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-10-07Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'Haelwenn
2019-10-07mrf/simple_policy: check actor against accept/rejectHaelwenn (lanodan) Monnier
2019-10-06Merge branch 'backport/custom-field-update' into 'maint/1.1'kaniini
2019-10-06Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'rinpatch
2019-10-06changelogAriadne Conill
2019-10-06Fix muted notification migration only working with a schemarinpatch
2019-10-06Merge branch 'fix/bad-migration' into 'develop'kaniini
2019-10-06Extract if block into private functionkPherox
2019-10-06Update test for custom fields when content-type urlencodedkPherox
2019-10-06Update test for custom fields when name empty stringkPherox
2019-10-06Change to delete empty name fieldkPherox
2019-10-06Fix type of fields_attributeskPherox
2019-10-06Rename fields to fields_attributeskPherox
2019-10-06Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'kaniini
2019-10-06Fix muted notification migration only working with a schemarinpatch
2019-10-06Merge branch 'backport/fix-report-email' into 'maint/1.1'kaniini
2019-10-06add changelogAriadne Conill
2019-10-06Fix credo issuesrinpatch
2019-10-06Do not refetch local objectsrinpatch
2019-10-06Preserve internal fields when reinjectingrinpatch
2019-10-06Move object internal fields to a constantrinpatch
2019-10-06Set updated_at even if the object stayed the samerinpatch
2019-10-06Fix wrong argument order when calling NaiveDateTime.diffrinpatch
2019-10-06Capture log in object refetch testsrinpatch
2019-10-06Initial poll refresh supportrinpatch
2019-10-06Use the user.id instead of nickname in report URLsfeld
2019-10-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-06Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'kaniini
2019-10-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Merge branch 'fix/report-email' into 'develop'feld
2019-10-06Use the user.id instead of nickname in report URLsfeld
2019-10-06[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mas...Ivan Tashkinov
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-...Ivan Tashkinov
2019-10-06Merge branch 'develop' into 'reactions'lain
2019-10-06Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limite...Ivan Tashkinov
2019-10-06Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'Haelwenn
2019-10-05Merge branch 'backport/update-activity-fixes' into 'maint/1.1'kaniini
2019-10-05update changelogAriadne Conill
2019-10-05CommonAPI: Create profile updates as public.lain
2019-10-05ActivityPub / Transmogrifier: Correctly store incoming Update id.lain
2019-10-05Merge branch 'split-masto-api/leftovers' into 'develop'kaniini
2019-10-05Merge branch 'accept-embedded-announce-object' into 'develop'kaniini
2019-10-05Merge branch 'unread-conversation-count' into 'develop'kaniini
2019-10-05Mastodon API: Add `pleroma.unread_conversation_count` to the Account entityeugenijm
2019-10-05Merge branch 'update-activity-fixes' into 'develop'kaniini
2019-10-05Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-05CommonAPI: Create profile updates as public.lain
2019-10-05ActivityPub / Transmogrifier: Correctly store incoming Update id.lain