aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2019-12-10Merge branch 'develop' into feature/custom-runtime-modulesEgor Kislitsyn
2019-12-09Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-09Merge branch 'fix/otp-parsers' into 'develop'lain
OTP: Fix runtime upload limit config being ignored Closes #1109 See merge request pleroma/pleroma!2045
2019-12-09Merge branch 'issue/1342' into 'develop'lain
[#1342] Added privacy option to push notifications See merge request pleroma/pleroma!1920
2019-12-09Set Plug.Logger to log at `:debug` levelEgor Kislitsyn
2019-12-08Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-08OTP: Fix runtime upload limit config being ignoredrinpatch
Closes #1109
2019-12-08OAuth token cleanup: Get rid of compile-time configurationrinpatch
2019-12-08Merge branch 'develop' into issue/1383Maksim Pechnikov
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-08Implement report notes destructionMaxim Filippov
2019-12-06[#1427] Fixes / improvements of admin scopes support. Added tests.Ivan Tashkinov
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-06Fix incorrect report countMaxim Filippov
2019-12-06init tag feedMaksim Pechnikov
2019-12-06Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1427-oauth-admin-scopes
2019-12-06[#1427] Reworked admin scopes support.Ivan Tashkinov
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
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-05Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-12-05Merge branch 'develop' into issue/1411Maksim Pechnikov
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-04Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-04updated ScheduledActivityMaksim Pechnikov
2019-12-04Add report notesMaxim Filippov
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-01Merge branch 'develop' into issue/1411Maksim Pechnikov
2019-11-30hide follower/following for friendicakPherox
2019-11-29[#1427] Initial support for OAuth admin scopes.Ivan Tashkinov
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
2019-11-28added privacy option to push notificationsMaksim Pechnikov
2019-11-28Merge branch 'develop' into issue/1383Maksim Pechnikov
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-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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 00:04:41 +0000