summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-12-08Config: add compile_get!feature/compile_getrinpatch
2019-12-08OAuth token cleanup: Get rid of compile-time configurationrinpatch
2019-12-08Merge branch 'fix/clause-never-matches' into 'develop'rinpatch
2019-12-08Fix never matching clauserinpatch
2019-12-08Merge branch 'improve-move-notificaions-api' into 'develop'rinpatch
2019-12-08Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'rinpatch
2019-12-06Merge branch 'feature/1455-chat-character-limit' into 'develop'rinpatch
2019-12-06Merge branch 'fix/mrf-delete' into 'develop'lain
2019-12-06ActivityPub: For user timelines, respects blocks.lain
2019-12-06Merge branch 'develop' into fix/mrf-deleterinpatch
2019-12-05ActivityPub: Fix deletes being exempt from MRFrinpatch
2019-12-05Merge branch '1335-user-api-id-fields-relations' into 'develop'lain
2019-12-05Merge branch 'feature/admin-api-render-whole-status' into 'develop'feld
2019-12-05Merge branch 'develop' into improve-move-notificaions-apiEgor Kislitsyn
2019-12-04[#1335] Merge issue fix.Ivan Tashkinov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-12-04Merge branch 'fix_test' into 'develop'lain
2019-12-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/145...lain
2019-12-04fix testMaksim Pechnikov
2019-12-04Cheat Sheet: Addg chat_limit information.lain
2019-12-04Changelog: Add information about chat limit.lain
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
2019-12-02Merge branch 'update-floki' into 'develop'rinpatch
2019-12-02Update Floki dependencyEgor Kislitsyn
2019-11-30Merge branch 'remove-info-from-users' into 'develop'rinpatch
2019-11-30Merge branch 'hide-relation-for-friendica' into 'develop'rinpatch
2019-11-30Merge branch 'benchmarks/favourites_timeline' into 'develop'rinpatch
2019-11-30test missing first fieldkPherox
2019-11-30hide follower/following for friendicakPherox
2019-11-29Merge branch 'fix/extract_first_external_url' into 'develop'lain
2019-11-29Fix Pleroma.HTML.extract_first_external_url/2Egor Kislitsyn
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-28Merge branch 'bugfix/1447-set-following' into 'develop'rinpatch
2019-11-28Merge branch 'chore/manual-benchmark' into 'develop'rinpatch
2019-11-28Merge branch 'use-pg12-in-ci' into 'develop'lain
2019-11-28Use PosgreSQL v12 in the federated testsEgor Kislitsyn
2019-11-28Migrations: Set users.following_count to NOT NULLlain
2019-11-28Merge branch 'fed-testing-updates' into 'develop'lain
2019-11-28CI: Make benchmarks manually triggered.lain
2019-11-28Merge branch 'cleanup-tests-output' into 'develop'lain
2019-11-28Cleanup tests outputEgor Kislitsyn
2019-11-27Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'kaniini
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 bugfix/1442...lain
2019-11-27Merge branch 'remove-user-info' into 'develop'lain
2019-11-27User: Never return nil for user follower counts.lain