summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-09docs: use tabs and improve grammar in OTP install guiderinpatch
2019-12-09docs: remove overoptimistic OTP benefits and use tabs in migration from sourcerinpatch
2019-12-09docs: fix incorrect display in digest task docsrinpatch
2019-12-09Merge branch 'feat/docs-otp-source-picker' into 'develop'rinpatch
docs: add OTP/From source tabs to CLI tasks See merge request pleroma/pleroma!2046
2019-12-09Merge branch 'move-api-docs' into 'develop'rinpatch
Document `with_move` parameter of the notification API See merge request pleroma/pleroma!2047
2019-12-09Document `with_move` parameter of the notification APIEgor Kislitsyn
2019-12-09docs: add OTP/From source tabs to CLI tasksrinpatch
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-06Merge branch 'fix/mrf-delete' into 'develop'lain
ActivityPub: Fix deletes being exempt from MRF Closes #1461 See merge request pleroma/pleroma!2037
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-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 ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
2019-12-04Merge branch 'fix_test' into 'develop'lain
[#1457] fix test See merge request pleroma/pleroma!2035
2019-12-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/1455-chat-character-limit
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
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-12-02Merge branch 'update-floki' into 'develop'rinpatch
Update Floki dependency See merge request pleroma/pleroma!2028
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-30Merge branch 'hide-relation-for-friendica' into 'develop'rinpatch
Hide relation for friendica users See merge request pleroma/pleroma!2026
2019-11-30Merge branch 'benchmarks/favourites_timeline' into 'develop'rinpatch
Benchmarks: favourites timeline See merge request pleroma/pleroma!2027
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
Fix Pleroma.HTML.extract_first_external_url/2 Closes #1451 See merge request pleroma/pleroma!2024
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-28Merge branch 'bugfix/1447-set-following' into 'develop'rinpatch
Migrations: Set users.following_count to NOT NULL Closes #1447 See merge request pleroma/pleroma!2021
2019-11-28Merge branch 'chore/manual-benchmark' into 'develop'rinpatch
CI: Make benchmarks manually triggered. See merge request pleroma/pleroma!2020
2019-11-28Merge branch 'use-pg12-in-ci' into 'develop'lain
Use PosgreSQL v12 in the federated tests See merge request pleroma/pleroma!2022
2019-11-28Use PosgreSQL v12 in the federated testsEgor Kislitsyn
2019-11-28Migrations: Set users.following_count to NOT NULLlain
Also set following_count for local users to the correct value and for remote users to 0.
2019-11-28Merge branch 'fed-testing-updates' into 'develop'lain
Add federated test infrastructure See merge request pleroma/pleroma!2014
2019-11-28CI: Make benchmarks manually triggered.lain
2019-11-28Merge branch 'cleanup-tests-output' into 'develop'lain
Cleanup tests output See merge request pleroma/pleroma!2018
2019-11-28Cleanup tests outputEgor Kislitsyn
2019-11-27Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'kaniini
User: Never return nil for user follower counts. Closes #1442 See merge request pleroma/pleroma!2017
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-29 19:43:19 +0000