aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2019-12-08Config: add compile_get!feature/compile_getrinpatch
It utilizes [`Application.compile_env!`](https://github.com/elixir-lang/elixir/pull/9628) to crash the application when compile-time configuration is attempted to be set at runtime. If `Application.compile_env!` is not available it just falls back to regular `Pleroma.Config.get``
2019-12-08OAuth token cleanup: Get rid of compile-time configurationrinpatch
2019-12-08Merge branch 'fix/clause-never-matches' into 'develop'rinpatch
Fix never matching clause See merge request pleroma/pleroma!2042
2019-12-08Fix never matching clauserinpatch
`length/1` is only used with lists.
2019-12-08Merge branch 'improve-move-notificaions-api' into 'develop'rinpatch
Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032
2019-12-08Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'rinpatch
ActivityPub: For user timelines, respects blocks. Closes #1463 See merge request pleroma/pleroma!2041
2019-12-06Merge branch 'feature/1455-chat-character-limit' into 'develop'rinpatch
Feature/1455 chat character limit Closes #1455 See merge request pleroma/pleroma!2034
2019-12-06ActivityPub: For user timelines, respects blocks.lain
Unless the timeline belongs to a blocked user.
2019-12-06Merge branch 'develop' into fix/mrf-deleterinpatch
2019-12-05ActivityPub: Fix deletes being exempt from MRFrinpatch
Closes #1461
2019-12-05Merge branch '1335-user-api-id-fields-relations' into 'develop'lain
[#1335] User: refactoring of AP ID fields into relations Closes #1335 See merge request pleroma/pleroma!1963
2019-12-05Merge branch 'feature/admin-api-render-whole-status' into 'develop'feld
Miscellaneous grouped reports fixes Closes admin-fe#48 and admin-fe#51 See merge request pleroma/pleroma!2007
2019-12-04[#1335] Merge issue fix.Ivan Tashkinov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
2019-12-04ChatChannel: Ignore messages that are too long.lain
2019-12-03Fix Pleroma.FollowingRelationship.move_following/2Egor Kislitsyn
2019-12-03Add `with_move` query param to the notifications APIEgor Kislitsyn
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-12-02Update Floki dependencyEgor Kislitsyn
2019-11-30Merge branch 'remove-info-from-users' into 'develop'rinpatch
Removed users.info field See merge request pleroma/pleroma!2006
2019-11-30hide follower/following for friendicakPherox
2019-11-29Fix Pleroma.HTML.extract_first_external_url/2Egor Kislitsyn
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
2019-11-28Fetch account from report, not from status (it might be deleted)Maxim Filippov
2019-11-27Handle reopened reports with deleted statusesMaxim Filippov
2019-11-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
bugfix/1442-dont-return-nil-for-following-count
2019-11-27User: Never return nil for user follower counts.lain
2019-11-27Remove User.user_info/2Egor Kislitsyn
2019-11-27Add a view for the move notificationEgor Kislitsyn
2019-11-27Remove `account` field from web push payloadEgor Kislitsyn
2019-11-26Add `direct_conversation_id` to web push payloadEgor Kislitsyn
2019-11-26Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26Merge branch 'develop' into feature/admin-api-render-whole-statusMaxim Filippov
2019-11-25Merge branch 'fix/ap-disable-remote-render' into 'develop'lain
Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010
2019-11-26AdminAPI: Grouped reports old/new fixMaxim Filippov
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
2019-11-26AdminAPI: Fix grouped reports for closed/resolved reportsMaxim Filippov
2019-11-25OStatus controller: don't serve json at /notice/, redirect insteadrinpatch
2019-11-25ActivityPub controller: do not render remote usersrinpatch
2019-11-25Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into ↵feld
'develop' Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981
2019-11-25Merge branch 'fix/update-reports-old-format' into 'develop'feld
Admin API: Fix error when trying to update reports in the "old" format See merge request pleroma/pleroma!1986
2019-11-25add ability to set a custom user-agent stringSadposter
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25TypoMaxim Filippov
2019-11-25Admin API: Render whole status in grouped reportsMaxim Filippov
2019-11-23fetcher: move local object checking into a reusable functionrinpatch
2019-11-23Removed users.info and remaining usages.Ivan Tashkinov
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994
2019-11-22Swap map with eachMaxim Filippov
2019-11-21Merge branch 'fix/mix-task-logging' into 'develop'lain
Allow mix tasks to always run with debug logging See merge request pleroma/pleroma!1997
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 23:22:24 +0000