summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-19Merge branch 'set-cache-on-user-tag-update' into 'develop'lambda
Update user cache when user tags are updated See merge request pleroma/pleroma!840
2019-02-19Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'lambda
properly check for follower address in is_private? See merge request pleroma/pleroma!841
2019-02-19Merge branch 'fix/ap_id-unique_constraint' into 'develop'lambda
mark ap_id unique_constraint See merge request pleroma/pleroma!842
2019-02-19mark ap_id unique_constraintrinpatch
2019-02-19properly check for follower address in is_private?rinpatch
2019-02-19Update user cache when user tags are updatedeugenijm
2019-02-18Merge branch 'feature/jobs' into 'develop'kaniini
Job Queue See merge request pleroma/pleroma!732
2019-02-18Merge branch 'patch-image-description' into 'develop'kaniini
Patch to support image descriptions for pleroma-fe See merge request pleroma/pleroma!626
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 'features/flavour-switching' into 'develop'kaniini
[MastoAPI] Add switching of frontend flavours See merge request pleroma/pleroma!807
2019-02-18Merge branch 'follow-request-count' into 'develop'kaniini
Follow request count See merge request pleroma/pleroma!817
2019-02-18Merge branch 'csv-export' into 'develop'kaniini
Add option to return all friends in twitter api. Closes #602 See merge request pleroma/pleroma!833
2019-02-18Fix testMaxim Filippov
2019-02-17Render only "id", "valid_until" and "app_name" in TokenViewMaxim Filippov
2019-02-17Merge branch 'docs/add-clients-to-ex_doc' into 'develop'lambda
mix.exs: Add docs/Clients.md to docs.extras See merge request pleroma/pleroma!835
2019-02-17Merge branch 'develop' into 'docs/add-clients-to-ex_doc'lambda
# Conflicts: # mix.exs
2019-02-17Merge branch 'docker-speedup' into 'develop'lambda
Docker speedup See merge request pleroma/pleroma!837
2019-02-17Merge branch 'mastoapi-stop-capping-attachments' into 'develop'lambda
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon See merge request pleroma/pleroma!834
2019-02-17Update Differences-in-MastodonAPI-Responses.mdlambda
2019-02-17Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'lambda
Fix recipient count in hellthread policy See merge request pleroma/pleroma!836
2019-02-17More speedup, test fixes.lain
2019-02-17more tests for HellthreadPolicyrinpatch
2019-02-17[#468] Formatting fix.Ivan Tashkinov
2019-02-17[#468] Merged `upstream/develop`, resolved conflicts.Ivan Tashkinov
2019-02-17[#468] Refactored OAuth scopes' defaults & missing selection handling.Ivan Tashkinov
2019-02-17Speed up docker postgres.lain
2019-02-17Fix recipient count in hellthread policyrinpatch
2019-02-17Fix formatingrinpatch
2019-02-17Add differences in MastoAPI responses to mix.exs extrasrinpatch
2019-02-16Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switchingHaelwenn (lanodan) Monnier
2019-02-16[MastoAPI] Add switching of frontend flavoursHaelwenn (lanodan) Monnier
2019-02-16mix.exs: Add docs/Clients.md to docs.extrasHaelwenn (lanodan) Monnier
[ci skip]
2019-02-16Add a section on how to identify a pleroma instance, clarify that post ↵rinpatch
upload limit is not capped too
2019-02-16Merge branch 'welcome-message' into 'develop'rinpatch
Add optional welcome message. See merge request pleroma/pleroma!832
2019-02-16Remove a limit on attachments in Mastodon API and document the changes in ↵rinpatch
responses from vanilla mastodon
2019-02-16WelcomeMessage: specify that the user has to be local.lain
2019-02-16WelcomeMessage: Get rid of Ecto reference.lain
2019-02-16Check that the welcome message is sent from the correct user.lain
2019-02-16Add option to return all friends in twitter api.lain
Mainly useful for user export.
2019-02-16Add optional welcome message.lain
2019-02-15[#468] Defined OAuth restrictions for all applicable routes.Ivan Tashkinov
Improved missing "scopes" param handling. Allowed "any of" / "all of" mode specification in OAuthScopesPlug. Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
2019-02-15Merge branch 'bugfix/oauth-token-padding' into 'develop'lambda
oauth: never use base64 padding when returning tokens to applications See merge request pleroma/pleroma!825
2019-02-15Merge branch 'hellthread-filter-fix' into 'develop'rinpatch
Hellthread filter fix Closes #634 See merge request pleroma/pleroma!831
2019-02-15Readd threshold is not 0 check, optmization?Karen Konou
2019-02-15Rename test, add check for follower collection when delistingKaren Konou
2019-02-15Merge branch 'bugfix/actor-containment' into 'develop'rinpatch
activitypub: correctly handle bare URIs in user lookup Closes #645 See merge request pleroma/pleroma!829
2019-02-15Add tests, change default config values, fix a bugKaren Konou
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-14test: user: add a test for whether user search returns a user or notWilliam Pitcock
2019-02-14user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()William Pitcock
get_or_fetch() handles the nickname verses URI differences transparently.