aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2019-07-16Fix typoEgor Kislitsyn
2019-07-16Merge branch 'bugfix/poll-id-as-string' into 'develop'rinpatch
Status View: Poll ids are strings. See merge request pleroma/pleroma!1430
2019-07-16Status View: Poll ids are strings.lain
All ids in mastodon are strings, in general.
2019-07-15Merge branch 'develop' into feature/matstodon-statuses-by-nameMark Felder
2019-07-15Merge branch 'match-file-name' into 'develop'feld
try to always match the filename for proxy url See merge request pleroma/pleroma!1405
2019-07-15Add more tests for MastodonAPIController and CommonAPISergey Suprunenko
2019-07-15query fixAlex S
2019-07-15Merge branch 'sha512-crypt' into 'develop'kaniini
detect and use sha512-crypt for stored password hash. See merge request pleroma/pleroma!1422
2019-07-15Merge branch 'develop' into match-file-nameSachin Joshi
# Conflicts: # lib/pleroma/web/media_proxy/media_proxy_controller.ex
2019-07-15formattingMoonman
2019-07-15Merge branch 'admin-configure-atom-keys' into 'develop'kaniini
admin configure - atom keys with leading : See merge request pleroma/pleroma!1424
2019-07-15tests for Pleroma.SignatureMaksim
2019-07-15atom keys with leading :Alex S
2019-07-15List messages must be visible for mentioned usersEgor Kislitsyn
2019-07-15Add an explanation comment to Publisher.publish/2Egor Kislitsyn
2019-07-15Merge remote-tracking branch 'pleroma/develop' into feature/addressable-listsEgor Kislitsyn
2019-07-15Support `list` visibility in StatusViewEgor Kislitsyn
2019-07-14added tests for Web.MediaProxyMaksim
2019-07-14Update DigestEmailWorker to compile and send emails via queueRoman Chvanikov
2019-07-14Unfollow should also unsubscribeSergey Suprunenko
2019-07-14Make opts optional in Pleroma.Notification.for_user_query/2Roman Chvanikov
2019-07-14Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-07-14security: detect object containment violations at the IR levelAriadne Conill
It is more efficient to check for object containment violations at the IR level instead of in the protocol handlers. OStatus containment is especially a tricky situation, as the containment rules don't match those of IR and ActivityPub. Accordingly, we just always do a final containment check at the IR level before the object is added to the IR object graph.
2019-07-14detect and use sha512-crypt for stored password hash.Moonman
2019-07-14Merge branch 'bugfix/llal-object-containment' into 'develop'kaniini
Object.Fetcher: Handle error on Containment.contain_origin/2 See merge request pleroma/pleroma!1414
2019-07-14Object.Fetcher: Keep the with-do block as per kaniini propositionHaelwenn (lanodan) Monnier
2019-07-14Object.Fetcher: Fallback to OStatus only if AP actually failsHaelwenn (lanodan) Monnier
2019-07-14Feature/1072 muting notificationsAlexander Strizhakov
2019-07-14Object.Fetcher: Handle error on Containment.contain_origin/2Haelwenn (lanodan) Monnier
2019-07-14parsers configurableAlex S
2019-07-14Add follow information refetching after following/unfollowingrinpatch
2019-07-14Add tests for fetch_follow_information_for_user and check object typerinpatch
when fetching the page
2019-07-14Merge branch 'develop' into feature/admin-api-user-statusesMaxim Filippov
2019-07-14Admin API: Endpoint for fetching latest user's statusesMaxim Filippov
2019-07-14Use atoms when updating user inforinpatch
2019-07-13Refactor fetching follow information to a separate functionrinpatch
2019-07-13nodeinfo: implement MRF transparency exclusionsAriadne Conill
2019-07-13Refactor Follows/Followers counter syncronizationrinpatch
- Actually sync counters in the database instead of info cache (which got overriden after user update was finished anyway) - Add following count field to user info - Set hide_followers/hide_follows for remote users based on http status codes for the first collection page
2019-07-13Merge branch '1041-status-actions-rate-limit' into 'develop'kaniini
Rate-limited status actions (per user and per user+status). Closes #1041 See merge request pleroma/pleroma!1410
2019-07-13[#1041] Minor refactoring.Ivan Tashkinov
2019-07-13Merge branch 'fix/hackney-global-options' into 'develop'Haelwenn
Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues See merge request pleroma/pleroma!1409
2019-07-13[#1041] Rate-limited status actions (per user and per user+status).Ivan Tashkinov
2019-07-12Merge the default options with custom ones in ReverseProxy andrinpatch
Pleroma.HTTP
2019-07-12Merge branch 'develop' into fix/ap-hide-followsrinpatch
2019-07-12ActivityPub Controller: Actually pass for_user to following/followersrinpatch
views and give 403 errors when trying to request hidden follower pages when unauthenticated
2019-07-12try to always match the filename for proxy urlSachin Joshi
2019-07-12Pleroma.Web.Metadata - testsMaksim
2019-07-12ActivityPub User view: Following/Followers refactoringrinpatch
- Render the collection items if the user requesting == the user rendered - Do not render the first page if hide_{followers,follows} is set, just give the URI to it
2019-07-12Move these to pleroma namespace in Mastodon APIMark Felder
2019-07-12preserve the original path/filename (no encoding/decoding) for proxySachin Joshi