Egor Kislitsyn
|
a7627bdc7a
|
Merge remote-tracking branch 'origin/develop' into global-status-expiration
|
2020-06-01 15:48:51 +04:00 |
|
lain
|
23e248694d
|
Announcements: Fix all tests.
|
2020-05-21 13:16:21 +02:00 |
|
Egor Kislitsyn
|
6802dc28ba
|
Add OpenAPI spec for PleromaAPI.AccountController
|
2020-05-13 19:06:46 +04:00 |
|
Egor Kislitsyn
|
7803a85d2c
|
Add OpenAPI spec for StatusController
|
2020-05-13 00:25:21 +04:00 |
|
lain
|
d0ba1844b0
|
ActivityPub: Fix non-federating blocks.
|
2020-05-12 10:52:46 +02:00 |
|
lain
|
ef55d24054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
2020-05-07 18:53:34 +02:00 |
|
lain
|
7ac0cffb34
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
2020-05-07 15:03:12 +02:00 |
|
lain
|
f0c22df226
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
|
2020-05-07 14:45:20 +02:00 |
|
rinpatch
|
473b0d9f3d
|
Merge branch 'feature/delete-validator' into 'develop'
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
|
2020-05-06 14:32:58 +00:00 |
|
lain
|
92caae5923
|
Undoing: Move undoing blocks to the pipeline everywhere.
|
2020-05-05 18:02:24 +02:00 |
|
lain
|
a3bb2e5474
|
Undoing: Move undoing announcements to the pipeline everywhere.
|
2020-05-05 16:42:34 +02:00 |
|
lain
|
b34debe615
|
Undoing: Move undoing reactions to the pipeline everywhere.
|
2020-05-05 16:17:09 +02:00 |
|
lain
|
a3071f0231
|
Undoing: Move undoing likes to the pipeline everywhere.
|
2020-05-05 15:08:41 +02:00 |
|
Egor Kislitsyn
|
decaa64f75
|
Merge branch 'develop' into global-status-expiration
|
2020-05-05 14:28:54 +04:00 |
|
lain
|
db55dc9445
|
ActivityPub: Remove react_with_emoji .
|
2020-05-05 12:28:28 +02:00 |
|
lain
|
ec24c70db8
|
ActivityPub: Don't fetch Application follower counts.
|
2020-05-04 14:22:54 +02:00 |
|
lain
|
999d639873
|
ActivityPub: Remove delete function.
This is handled by the common pipeline now.
|
2020-04-30 20:13:47 +02:00 |
|
Egor Kislitsyn
|
764b4f95a8
|
Merge branch 'develop' into global-status-expiration
|
2020-04-28 14:13:53 +04:00 |
|
lain
|
d89cd0a197
|
Reply Filtering: Refactor.
|
2020-04-24 18:25:26 +02:00 |
|
Egor Kislitsyn
|
c56c0a3d23
|
Merge branch 'develop' into global-status-expiration
|
2020-04-24 18:37:58 +04:00 |
|
Alexander
|
6e625a427c
|
reply filtering
|
2020-04-24 15:43:49 +03:00 |
|
lain
|
bbf8554c97
|
ActivitPub: Remove like function.
We don't need another way to build likes.
|
2020-04-24 13:48:13 +02:00 |
|
Egor Kislitsyn
|
364eecc49f
|
Merge branch 'develop' into global-status-expiration
|
2020-04-20 20:37:56 +04:00 |
|
Egor Kislitsyn
|
7f692343c8
|
Merge branch 'develop' into global-status-expiration
|
2020-04-10 14:20:48 +04:00 |
|
Haelwenn (lanodan) Monnier
|
e89078ac2a
|
User: remove source_data
|
2020-04-10 06:20:03 +02:00 |
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
2020-04-06 11:59:01 +00:00 |
|
Egor Kislitsyn
|
d1a9716a98
|
Fix activity deletion
|
2020-03-24 17:38:18 +04:00 |
|
Egor Kislitsyn
|
80e1571610
|
Merge branch 'develop' into global-status-expiration
|
2020-03-20 22:08:34 +04:00 |
|
Ivan Tashkinov
|
1c05f539aa
|
Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).
|
2020-03-20 18:33:00 +03:00 |
|
lain
|
1aa8aa7d7f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
|
2020-03-20 14:52:58 +01:00 |
|
lain
|
3c2c32b460
|
Merge branch 'remake-remodel' into develop
|
2020-03-19 18:00:55 +01:00 |
|
Alexander Strizhakov
|
f3791add99
|
removing with_move parameter
|
2020-03-16 20:07:45 +03:00 |
|
Egor Kislitsyn
|
0f386110c6
|
Merge remote-tracking branch 'origin/develop' into global-status-expiration
|
2020-03-03 00:32:34 +04:00 |
|
Haelwenn
|
764a50f8a6
|
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
|
2020-03-02 07:58:01 +00:00 |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
2020-03-02 06:08:45 +01:00 |
|
Alexander Strizhakov
|
32d1e04817
|
ActivityPub actions & side-effects in transaction
|
2020-03-01 12:01:39 +03:00 |
|
Egor Kislitsyn
|
819cd46717
|
Auto-expire Create activities only
|
2020-02-20 22:04:02 +04:00 |
|
Ivan Tashkinov
|
4f8c3462a8
|
Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.
|
2020-02-13 21:55:47 +03:00 |
|
Haelwenn
|
1262357ddb
|
Merge branch 'cancel-follow-request' into 'develop'
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
|
2020-02-07 16:10:43 +00:00 |
|
Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
2020-02-06 18:09:57 +01:00 |
|
Egor Kislitsyn
|
8c71f7e11a
|
Add support for cancellation of a follow request
|
2020-02-05 20:22:15 +04:00 |
|
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
2020-01-22 13:57:42 +01:00 |
|
Egor Kislitsyn
|
432b3067d4
|
Do not crash when remote user follower and following counters are hidden
|
2019-12-19 19:26:46 +07:00 |
|
rinpatch
|
814a99c80f
|
tests: remove a useless 3 second sleep
the ids favs use are accurate down to a microsecond, there is no need
for it
|
2019-12-16 00:50:39 +03:00 |
|
Mark Felder
|
9ef912aecf
|
Merge branch 'develop' into issue/1411
|
2019-12-11 15:02:53 -06:00 |
|
Sadposter
|
8cfaab8f04
|
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
# lib/pleroma/user.ex
|
2019-12-10 16:54:25 +00:00 |
|
Sadposter
|
5abee19b63
|
make analysis happy
|
2019-12-10 16:50:58 +00:00 |
|
Sadposter
|
19d228cc58
|
modify SQL to include followed-but-domain-blocked activities
|
2019-12-10 16:40:12 +00:00 |
|
rinpatch
|
8404f8c8fb
|
Merge branch 'improve-move-notificaions-api' into 'develop'
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
|
2019-12-08 13:07:05 +00:00 |
|
rinpatch
|
cdff5b8267
|
Merge branch 'develop' into fix/mrf-delete
|
2019-12-06 00:12:21 +03:00 |
|