|
|
1afeaf82fa
|
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
|
2019-11-14 13:35:41 +00:00 |
|
Maxim Filippov
|
46787b9fe1
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-11 19:18:12 +09:00 |
|
lain
|
a88e834dba
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-11-10 11:32:50 +00:00 |
|
Maksim Pechnikov
|
9d0b989521
|
add subject to atom feed
|
2019-11-10 11:10:20 +03:00 |
|
lain
|
b22ee9d966
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-11-08 13:27:11 +01:00 |
|
Maxim Filippov
|
7258db023e
|
Support old flag format
|
2019-11-08 18:21:29 +09:00 |
|
Maxim Filippov
|
f171095960
|
Grouped reports with status data baked in
|
2019-11-06 21:25:46 +10:00 |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-05 02:12:48 +03:00 |
|
lain
|
556da92902
|
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity
See merge request pleroma/pleroma!1849
|
2019-11-04 14:11:44 +00:00 |
|
Maxim Filippov
|
6f9d3d30fa
|
AdminAPI: Omit relay user from users list
|
2019-10-31 02:26:02 +03:00 |
|
kPherox
|
0c361eeb25
|
Add pending to handle incoming for Follow activity
|
2019-10-29 17:12:49 +09:00 |
|
Maxim Filippov
|
791bcfd90f
|
Merge branch 'develop' into feature/store-statuses-data-inside-flag
|
2019-10-27 16:11:25 +03:00 |
|
Maxim Filippov
|
8eff05d4c6
|
Strip status data from Flag (when federating or closing/resolving report)
|
2019-10-27 16:05:32 +03:00 |
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
2019-10-24 14:55:36 +07:00 |
|
Maxim Filippov
|
b08b1d5d91
|
Store status data inside Flag activity
|
2019-10-23 21:27:22 +02:00 |
|
Ivan Tashkinov
|
c0246309a5
|
[#1304] Extra bullet-proofing.
|
2019-10-23 19:30:02 +03:00 |
|
Ivan Tashkinov
|
8cc809e44e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/notification.ex
|
2019-10-23 17:22:42 +03:00 |
|
Ariadne Conill
|
3f6a596922
|
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
|
2019-10-22 20:50:46 -05:00 |
|
Ivan Tashkinov
|
7c7f90bc4f
|
[#1304] Merged develop, handled User.Info.invisible.
|
2019-10-21 11:58:22 +03:00 |
|
Ivan Tashkinov
|
a11a7176d5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
|
2019-10-21 11:05:09 +03:00 |
|
Egor Kislitsyn
|
c6fba62666
|
Fix Relay
|
2019-10-21 14:47:07 +07:00 |
|
Egor Kislitsyn
|
4ea1a61b00
|
Merge branch 'develop' into refactor/following-relationships
|
2019-10-21 14:19:15 +07:00 |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
2019-10-20 20:43:18 +03:00 |
|
Ivan Tashkinov
|
e8843974cb
|
[#1304] Moved remaining fields from User.Info to User.
Misc. fixes / improvements.
|
2019-10-20 13:42:42 +03:00 |
|
Ariadne Conill
|
c9280b9730
|
rework to use properties instead of compound typing, per SocialCG
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
ef659331b0
|
implement invisible support for remote users
|
2019-10-19 23:21:37 +00:00 |
|
Ariadne Conill
|
1469a084d4
|
relay: set invisible to true
|
2019-10-19 23:21:37 +00:00 |
|
Maxim Filippov
|
019147f115
|
Merge branch 'develop' into feature/relay-list
|
2019-10-18 18:35:58 +02:00 |
|
Ariadne Conill
|
bae96de273
|
activitypub: tag containment checks for better error tracing
|
2019-10-18 14:50:10 +00:00 |
|
Ariadne Conill
|
48059c03c9
|
fix up some tests
|
2019-10-18 14:50:09 +00:00 |
|
Ariadne Conill
|
adb639db56
|
publisher: move remote_users() from Salmon module
|
2019-10-18 14:50:09 +00:00 |
|
Ariadne Conill
|
4f82e42e4e
|
websub: remove entirely
|
2019-10-18 14:50:09 +00:00 |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
2019-10-18 10:24:29 +02:00 |
|
eugenijm
|
359dd1890e
|
Mastodon API: Mark the conversation as read for the author when they send a new direct message
|
2019-10-17 16:49:39 +03:00 |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
2019-10-16 21:59:21 +03:00 |
|
lain
|
6977cddff9
|
Merge branch 'benchmark-finishing' into 'develop'
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
|
2019-10-16 11:54:49 +00:00 |
|
Maxim Filippov
|
90d516d42b
|
Store status data inside flag activity
|
2019-10-15 16:52:41 +02:00 |
|
eugenijm
|
a97b642289
|
Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
|
2019-10-14 02:57:21 +03:00 |
|
Maxim Filippov
|
cc6875b582
|
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
|
2019-10-11 19:12:29 +03:00 |
|
lain
|
37812740c4
|
Transmogrifier: Correctly save incoming ids for Accept/Reject.
|
2019-10-11 11:48:58 +02:00 |
|
lain
|
9b963064eb
|
Transmogrifier: Actually store who deleted a note.
|
2019-10-11 11:25:45 +02:00 |
|
Egor Kislitsyn
|
059005ff82
|
Replace user.following with Pleroma.FollowingRelationship
|
2019-10-11 02:35:32 +07:00 |
|
lain
|
29647dfd09
|
Transmogrifier: Save correct ids for incoming deletes.
|
2019-10-10 17:17:33 +02:00 |
|
lain
|
c54ae662dc
|
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
|
2019-10-10 14:40:59 +02:00 |
|
lain
|
d7f9679ff2
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-10 12:38:51 +00:00 |
|
Maxim Filippov
|
24eecc3cb4
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-10-10 03:33:55 +03:00 |
|
Maxim Filippov
|
35068baf65
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-10-07 15:41:41 +03:00 |
|
Maxim Filippov
|
7aceaa517b
|
Admin API: Reports, grouped by status
|
2019-10-07 15:39:07 +03:00 |
|
Ariadne Conill
|
9a2f71f4d5
|
mastodon api: fix exclude_replies (closes #1287)
|
2019-10-07 12:29:33 +00:00 |
|
lain
|
73b6512907
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-07 12:30:59 +02:00 |
|
