aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Add migrationRoman Chvanikov
2019-10-26Merge branch 'conversation-read-status-for-blocking-user' into 'develop'kaniini
Count only visible conversations in the user's unread_conversation_count See merge request pleroma/pleroma!1886
2019-10-26User info migration improvementsrinpatch
- Move column additions into a separate migration, so postgres doesn't need an exclusive lock on the table for the main part - Fill in columns by using one big update statement instead of a bunch of small ones because it's much faster (the migration took 140s on patch.cx database)
2019-10-26Mark the conversations with the blocked user as read and update the blocking ↵eugenijm
user's `unread_conversation_count`. Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.
2019-10-25Merge branch 'release/1.1.3' into 'stable'v1.1.3lain
1.1.3 release See merge request pleroma/pleroma!1884
2019-10-25mixfile: bump version to 1.1.3rinpatch
2019-10-25Changelog: Add 1.1.3 entryrinpatch
2019-10-25Do not include notifications from blocked users when with_muted is setrinpatch
This is not what with_muted is for per documentation and it was agreed on irc that this behavior doesn't make sense.
2019-10-25pleroma_ctl: fix crashes due to different shift(1) behavior on dashrinpatch
2019-10-25Merge branch 'remove-unsed-info-fields-fn' into 'develop'rinpatch
Remove unused Pleroma.User.info_fields/0 See merge request pleroma/pleroma!1882
2019-10-25Add `also_known_as` field to Pleroma.UserEgor Kislitsyn
2019-10-25Remove unused Pleroma.User.info_fields/0Egor Kislitsyn
2019-10-25Merge branch 'fix/pleroma-ctl-fix-shift-dash' into 'develop'kaniini
pleroma_ctl: fix crashes due to different shift(1) behavior on dash See merge request pleroma/pleroma!1880
2019-10-25Merge branch 'object-fetch-errors' into 'develop'kaniini
Object fetch errors See merge request pleroma/pleroma!1881
2019-10-24pleroma_ctl: fix crashes due to different shift(1) behavior on dashrinpatch
2019-10-24fix teststwf
2019-10-24object fetcher error handlingstwf
2019-10-24add testMaksim Pechnikov
2019-10-24Merge branch 'fix/readme' into 'develop'kaniini
fix link on docs-develop.pleroma.social See merge request pleroma/pleroma!1876
2019-10-24Merge remote-tracking branch 'upstream/develop' into ↵Egor Kislitsyn
refactor/following-relationships
2019-10-24fix link on docs-develop.pleroma.socialMaksim Pechnikov
2019-10-24Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-10-23add testsMaksim Pechnikov
2019-10-23Store status data inside Flag activityMaxim Filippov
2019-10-23fix migrateMaksim Pechnikov
2019-10-23Merge branch '1304-user-info-deprecation' into 'develop'feld
[#1304] User.Info deprecation Closes #1304 See merge request pleroma/pleroma!1851
2019-10-23[#1304] Extra bullet-proofing.Ivan Tashkinov
2019-10-23[#1304] Adjusted User.Info references from Notification.Ivan Tashkinov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex
2019-10-23[#1304] Fixed null::jsonb handling in User.Info migration.Ivan Tashkinov
2019-10-23SideEffectsTest: Fix test.lain
2019-10-23Credo fixes.lain
2019-10-23Add Pipeline module, test for federation.lain
2019-10-23added update unread_count for notificationsMaksim Pechnikov
2019-10-23Merge branch 'bugfix/announce-with-bare-to-cc' into 'develop'kaniini
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors Closes #1326 See merge request pleroma/pleroma!1874
2019-10-22activitypub: visibility: refactor is_public?() to use JSON-LD safe accessorsAriadne Conill
2019-10-23Merge branch 'chore/add-single-value-deserialization-tests' into 'develop'kaniini
tests: transmogrifier: add explicit regression tests for JSON-LD strings as single-element array fuckery See merge request pleroma/pleroma!1873
2019-10-22tests: transmogrifier: add explicit regression tests for JSON-LD string to ↵Ariadne Conill
single-element array deserialization There appears to be confusion on whether or not Pleroma can handle this particular sin of JSON-LD. It can, and we will add regression tests to prove that it can handle this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD, but whatever.
2019-10-22Relocate to configuration subdirMark Felder
2019-10-22Remove proxy_cache_lock suggestionMark Felder