lain
c0ea5c60e4
ChatController: Don't return chats for user you've blocked.
2020-05-12 16:43:04 +02:00
lain
be5d0a9bde
Merge branch '1020-honk-announces' into 'develop'
...
Transmogrifier: Add tests for certain announces
Closes #1020
See merge request pleroma/pleroma!2516
2020-05-12 14:35:51 +00:00
rinpatch
8308611279
Startup: suggest updating OTP when the version is too low for gun
...
I've seen quite a few people wonder what to do when presented with
this error message.
2020-05-12 17:30:39 +03:00
rinpatch
d17040e997
Merge branch 'giving-up' into 'develop'
...
Give up for now and make gitlab retry failed jobs.
See merge request pleroma/pleroma!2517
2020-05-12 13:23:40 +00:00
lain
2f2e5fea34
Give up for now and make gitlab retry failed jobs.
2020-05-12 15:02:37 +02:00
lain
e44166b510
Credo fixes.
2020-05-12 14:44:11 +02:00
lain
a61120f497
Documention: Add chat message deletion docs
2020-05-12 13:25:25 +02:00
lain
ec72cba43e
Chat Controller: Add basic error handling.
2020-05-12 13:23:09 +02:00
lain
dcb5cda324
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-12 13:13:43 +02:00
lain
b5aa204eb8
ChatController: Support deletion of chat messages.
2020-05-12 13:13:03 +02:00
lain
dfb90a1fd6
Transmogrifier: Add tests for certain announces
2020-05-12 12:50:48 +02:00
lain
ca31af473c
Transmogrifier: On incoming follow accept, update follow counts.
2020-05-12 12:29:37 +02:00
lain
d0ba1844b0
ActivityPub: Fix non-federating blocks.
2020-05-12 10:52:46 +02:00
Maksim Pechnikov
63477d07ad
unsubscribes of friends when user deactivated
2020-05-12 08:14:42 +03:00
rinpatch
f8190aea5e
Merge branch 'fix/issue-1676' into 'develop'
...
[#1676 ] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492
2020-05-11 22:30:36 +00:00
rinpatch
2ead4e108a
Merge branch 'migration-fix-markers' into 'develop'
...
Markers migration: Fix migration for very large list of markers
See merge request pleroma/pleroma!2511
2020-05-11 22:13:08 +00:00
rinpatch
9b33cab06e
Merge branch 'chore/gettext-update' into 'develop'
...
Gettext: remove english messages and update the pot file
See merge request pleroma/pleroma!2512
2020-05-11 21:52:57 +00:00
rinpatch
952c6b29a1
Gettext: remove english messages and update the pot file
...
Having an English file doesn't make any sense, since English
is the source language for error messages. Also Weblate complains about it
2020-05-12 00:40:13 +03:00
Ivan Tashkinov
1b23acf164
[ #2497 ] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
2020-05-11 23:21:53 +03:00
lain
f6aa0b4a07
Migration: Fix typo
2020-05-11 22:03:29 +02:00
lain
f71376e30e
Migration: Enum.chunk is deprecated.
2020-05-11 22:00:01 +02:00
lain
d8dd945a03
Markers migration: Fix migration for very large list of markers
2020-05-11 21:52:47 +02:00
rinpatch
768c18facb
Merge branch 'fix/streamer-timeout' into 'develop'
...
Fix streamer timeout
Closes #1735 and #1753
See merge request pleroma/pleroma!2509
2020-05-11 17:07:55 +00:00
lain
f28ed36b4d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-11 17:14:58 +02:00
href
e2b15e8ad3
Fix streamer timeout ( closes #1753 ).
...
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
2020-05-11 16:51:34 +02:00
lain
e432314105
Merge branch '1439-favorite-deletion' into 'develop'
...
SideEffects test: Add test for favorite deletion.
Closes #1439
See merge request pleroma/pleroma!2508
2020-05-11 13:58:18 +00:00
lain
679afb2de4
SideEffects test: Add test for favorite deletion.
2020-05-11 15:38:19 +02:00
rinpatch
79cd723a1e
Merge branch '1204-object-pruning-deletion' into 'develop'
...
Deletion: Handle the case of pruned objects.
Closes #1204
See merge request pleroma/pleroma!2507
2020-05-11 13:31:11 +00:00
lain
5367a00257
Deletion: Handle the case of pruned objects.
2020-05-11 15:06:23 +02:00
Egor Kislitsyn
3bde0fa3f6
Add OpenAPI spec for TimelineController
2020-05-11 15:43:03 +04:00
lain
fdb98715b8
Chat: Fix wrong query.
2020-05-11 10:58:14 +02:00
lain
84bb116ae3
Merge branch 'descriptions-fix' into 'develop'
...
copy/paste fix for descriptions
See merge request pleroma/pleroma!2504
2020-05-11 08:03:09 +00:00
Alexander Strizhakov
da6a38d205
copy/paste fix for descriptions
2020-05-11 09:35:20 +03:00
lain
1b1dfb54eb
Credo fixes.
2020-05-10 13:28:05 +02:00
lain
8cc8d960af
Documentation: Add GET /chats/:id
2020-05-10 13:27:40 +02:00
lain
8d5597ff68
ChatController: Add GET /chats/:id
2020-05-10 13:26:14 +02:00
lain
172d9b1193
Chat: Add last_message to schema.
2020-05-10 13:08:01 +02:00
lain
17be3ff669
Documentation: Add last_message to chat docs.
2020-05-10 13:01:20 +02:00
lain
f335e1404a
ChatView: Add the last message to the view.
2020-05-10 13:00:01 +02:00
lain
e297d8c649
Documentation: Add attachment docs
2020-05-10 12:34:12 +02:00
lain
c272669909
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-10 12:32:57 +02:00
lain
1054e89762
ChatOperation: Add media id to example
2020-05-10 12:30:24 +02:00
lain
7ca83e71a9
Merge branch 'shortening-modules-name' into 'develop'
...
Descriptions that module names are shortened
See merge request pleroma/pleroma!2428
2020-05-10 09:05:22 +00:00
Ivan Tashkinov
b960a9430d
[ #2456 ] credo fix.
2020-05-10 09:35:12 +03:00
Ivan Tashkinov
b0d0d8f91b
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
2020-05-10 09:17:16 +03:00
Ivan Tashkinov
aee88d11be
[ #2456 ] Removed support for embedded relationships in account view.
2020-05-10 09:16:48 +03:00
Roman Chvanikov
f3f8ed9e19
Set sum types in query
2020-05-10 09:13:24 +03:00
rinpatch
b3e6953d23
Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'
...
insert skeletons migration: fix for non-local locals
Closes #1746
See merge request pleroma/pleroma!2502
2020-05-09 21:52:00 +00:00
rinpatch
0ad89762a1
insert skeletons migration: fix for non-local locals
...
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes #1746
2020-05-09 22:07:35 +03:00
Ivan Tashkinov
ac4250a18c
[ #2456 ] Clarified skip_relationships option (and its default of false) for MastodonAPI.AccountView.
2020-05-09 19:03:07 +03:00
