sadposter
|
a7ec08d853
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-01 19:03:08 +00:00 |
|
kPherox
|
0326683932
|
hide follower/following for friendica
|
2019-11-30 15:43:05 +09:00 |
|
lain
|
dc9090810d
|
Merge branch 'fix/ap-disable-remote-render' into 'develop'
Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010
|
2019-11-25 15:23:45 +00:00 |
|
rinpatch
|
02f7383891
|
ActivityPub controller: do not render remote users
|
2019-11-25 17:19:33 +03:00 |
|
feld
|
5f981178d0
|
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
|
2019-11-25 13:29:53 +00:00 |
|
feld
|
9374b52756
|
Merge branch 'fix/update-reports-old-format' into 'develop'
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
|
2019-11-25 13:29:22 +00:00 |
|
sadposter
|
acac6e3540
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-11-25 11:37:49 +00:00 |
|
Maxim Filippov
|
82f4e4760e
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:46:18 +09:00 |
|
Maxim Filippov
|
fd24467b92
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:43:11 +09:00 |
|
lain
|
8feb5dcb42
|
Merge branch 'issue/1348' into 'develop'
[#1348] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
|
2019-11-21 13:13:14 +00:00 |
|
sadposter
|
9d29a5063c
|
fe
|
2019-11-20 09:48:05 +00:00 |
|
Maxim Filippov
|
c506cc48ef
|
Admin API: Error when trying to update reports in the "old" format
|
2019-11-16 18:44:48 +09:00 |
|
Ariadne Conill
|
eecd64cc07
|
object age policy: remove debug logging
|
2019-11-14 19:56:14 -06:00 |
|
Ariadne Conill
|
5705cf0e3e
|
MRF: add ObjectAgePolicy which deals with old posts being imported
|
2019-11-14 19:48:10 -06:00 |
|
Maxim Filippov
|
114930b5fd
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-14 23:45:29 +09:00 |
|
Maxim Filippov
|
30af5da330
|
Admin API: list all statuses from a given instance
|
2019-11-14 23:44:07 +09:00 |
|
feld
|
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 |
|
sadposter
|
2de30812ea
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-11-13 00:10:01 +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 |
|
sadposter
|
9bc70ca0c1
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-11-04 18:20:19 +00:00 |
|
Maksim Pechnikov
|
4b7c11e3f9
|
excluded invisible actors from gets /api/v1/accounts/:id
|
2019-11-04 20:44:24 +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 |
|
sadposter
|
bea4a82d1e
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-29 13:12:38 +00:00 |
|
sadposter
|
55ce1daeaf
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-29 10:47:37 +00: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 |
|
sadposter
|
1d85dc62aa
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-25 12:08:37 +01: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 |
|
sadposter
|
85b9992f86
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-22 09:12:39 +01: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 |
|