a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
a050f3e015
fix for logger configuration through admin-fe
2020-04-13 08:56:28 +03:00
c5c09fc61b
fix mediaType of object
2020-04-13 07:02:57 +03:00
9a3c74b244
Always accept deletions through SimplePolicy
2020-04-12 20:26:35 -05:00
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00
c077ad0b33
Remove User.upgrade_changeset in favor of remote_user_creation
...
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
2020-04-11 22:31:46 +03:00
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
2020-04-10 14:18:57 +04:00
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
2020-04-10 04:31:13 +00:00
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
3420dec494
Remove User.fields/1
2020-04-10 06:20:02 +02:00
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
2020-04-09 17:08:43 +04:00
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
2020-04-09 10:42:43 +00:00
9795ff5b01
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
2020-04-09 10:17:50 +00:00
365c34a7a9
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
2020-04-09 10:17:44 +00:00
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
2020-04-09 09:48:56 +00:00
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
2020-04-08 22:58:31 +03:00
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
2020-04-07 11:41:10 +00:00
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
06471940e0
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
2020-04-07 08:44:53 +00:00
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00
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
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
2020-04-06 10:20:44 +03:00
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02 19:38:39 +03:00
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
2d64500a9d
error improvement for email_invite endpoint
2020-04-01 20:26:33 +03:00
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
2020-04-01 12:55:52 +00:00
94ddbe4098
restrict remote users from indexing
2020-04-01 09:57:12 +03:00
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
b30fb1f3bb
User: Fix use of source_data in profile_url/1
2020-03-31 23:54:20 +02:00
2553400a66
Initial failing test statement against funkwhale channels
2020-03-31 23:54:20 +02:00
dbf9d719f9
split test for update profile fields
2020-04-01 02:52:30 +09:00
aebec1bac9
Validator Test: Small refactor.
2020-03-31 17:47:34 +02:00
df5f89c0d6
test for default features and changelog entry
2020-03-31 18:22:25 +03:00
643f15e77b
Validators: ObjectID is an http uri.
2020-03-31 16:11:38 +02:00
b607ae1a1c
removing grouped reports admin api endpoint
2020-03-30 13:51:45 +03:00
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
dfbc05d496
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
2020-03-27 08:01:03 +03:00
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
ff1baae7e9
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-25 20:41:17 +03:00
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
9081a071ee
Add a test for accounts/update_credentials
2020-03-25 18:46:17 +04:00
03a18cf037
node_info_test: Bump default features list
2020-03-24 20:39:19 +01:00
212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
2020-03-24 20:32:49 +01:00
64165d1df9
node_info_test.exs: Add test on the default feature list
2020-03-24 20:21:27 +01:00
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-24 22:15:37 +03:00
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-24 22:14:26 +03:00
8eebc75c15
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-24 19:10:32 +00:00
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
2020-03-24 17:34:13 +00:00
4a2538967c
Support pagination in conversations
2020-03-24 20:18:27 +04:00
d1a9716a98
Fix activity deletion
2020-03-24 17:38:18 +04:00
eec1fcaf55
Home timeline tests: Add failing test for relationships
2020-03-23 15:58:55 +01:00
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22 16:41:01 +01:00
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
d74405fc1a
Merge branch 'fix-feed-pagination' into 'develop'
...
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
2020-03-20 16:57:51 +00:00
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
2020-03-20 18:33:00 +03:00
0e27c274f4
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
...
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
2020-03-20 18:08:23 +03:00
6c1232b486
NotificationController: Fix test.
2020-03-20 15:00:28 +01:00
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-20 14:52:58 +01:00
fe15f0ba15
restrict_unauthenticated setting
2020-03-20 16:36:20 +03:00
98a60df41f
include_types parameter in /api/v1/notifications
2020-03-20 13:18:12 +03:00
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
2020-03-19 19:25:50 +01:00
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
2020-03-19 19:10:03 +01:00
3c2c32b460
Merge branch 'remake-remodel' into develop
2020-03-19 18:00:55 +01:00
f9d622d25a
WIP
2020-03-19 15:39:11 +01:00
ec3719f539
Improved in-test config management functions.
2020-03-18 20:30:31 +03:00
f9ecb513fa
Merge branch 'develop' into gun
2020-03-18 14:08:21 +03:00
d3cf7e19fb
activity_pub_controller_test.exs: test posting with AP C2S uploaded media
2020-03-17 14:00:19 +01:00
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
2020-03-16 20:42:37 +03:00
d198e7fa2a
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
2020-03-16 20:32:07 +03:00
f3791add99
removing with_move parameter
2020-03-16 20:07:45 +03:00
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
89e4b3ebbd
fix for content-type header for tag feed
2020-03-16 12:59:18 +03:00
91870c8995
adding rss for user feed
2020-03-16 12:45:31 +03:00
26e2076659
fix for feed page pagination
2020-03-16 12:33:55 +03:00
0ac6e29654
static_fe: Sanitize HTML in posts
...
Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\">
2020-03-15 20:44:04 +01:00
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
2020-03-15 19:15:20 +00:00
d84670b9e1
Merge branch 'f' into 'develop'
...
rip out fetch_initial_posts
Closes #1422 and #1595
See merge request pleroma/pleroma!2297
2020-03-15 16:14:54 +00:00
67a27825b1
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
...
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
Closes #1620
See merge request pleroma/pleroma!2296
2020-03-15 14:22:10 +00:00
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-15 15:59:17 +03:00
ecb7809e92
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
2020-03-14 15:37:02 +03:00
fc4496d4fa
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
2020-03-13 21:41:17 +03:00
d1379c4de8
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-13 16:07:17 +01:00
802b991814
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
...
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
2020-03-12 20:29:51 +00:00
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
2020-03-12 12:07:07 +03:00
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-11 16:53:05 +00:00
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
2020-03-11 15:10:09 +00:00
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11 13:46:42 +01:00
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
2020-03-11 14:05:56 +03:00
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-11 09:15:55 +03:00
5af798f246
Fix enforcement of character limits
2020-03-10 13:08:00 -05:00
426f5ee48a
tesla adapter can't be changed in adminFE
2020-03-10 15:31:44 +03:00
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
2020-03-09 20:51:44 +03:00
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
b2eb1124d1
Merge branch 'develop' into gun
2020-03-07 12:41:37 +03:00
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-06 11:48:30 +03:00
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
2020-03-05 21:19:21 +03:00
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05 17:31:06 +03:00
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
2020-03-05 15:15:27 +03:00
f1750b4658
Admin API tests: Fix wrong test.
2020-03-05 12:42:02 +01:00
4bce13fa2f
MastodonController: Return 404 errors correctly.
2020-03-04 18:09:06 +01:00
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
2020-03-04 12:43:06 +00:00
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
4427161ca3
Merge branch 'develop' into gun
2020-03-03 17:15:49 -06:00
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
2020-03-03 22:22:02 +03:00
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
bd8624d649
[ #1560 ] Added tests for non-federating instance bahaviour to OStatusControllerTest.
2020-03-02 22:02:21 +03:00
b4367125e9
[ #1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
2020-03-02 21:43:18 +03:00
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-02 18:41:12 +03:00
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
2020-03-02 15:35:49 +04:00
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
cc98d010ed
relay list shows hosts without accepted follow
2020-03-02 09:27:20 +03:00
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
6c0d869d9d
Bump copyright years of files changed after 2019-01-01
...
Done via the following command:
git diff 1e6c102b
2020-03-02 05:54:56 +01:00
d9e4b77f8b
Merge branch 'develop' into gun
2020-03-01 12:48:49 +03:00
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
2020-02-29 21:52:33 +00:00
814b275af7
Merge branch 'develop' into gun
2020-02-29 11:34:50 +03:00
f2216287a7
Merge branch 'admin-status-list' into 'develop'
...
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192
2020-02-27 18:11:04 +00:00
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
2020-02-27 18:46:05 +03:00
cb60a9c42f
Do not fail when user has no email
2020-02-27 17:27:49 +04:00
4ab07cf0d5
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
2020-02-26 22:35:57 +03:00
e2a6a40367
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
2020-02-26 20:21:38 +03:00
f446744a6a
Allow account registration without an email
2020-02-26 20:13:53 +04:00
c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions
2020-02-25 18:04:28 +04:00
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +03:00
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
2020-02-24 21:46:37 +03:00
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
2020-02-22 19:48:41 +03:00
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
2020-02-22 09:31:43 +03:00
13918cb545
Merge branch 'develop' into gun
2020-02-21 10:02:37 +03:00
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
2020-02-20 23:50:40 +00:00
c69b04c490
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
...
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
2020-02-20 12:04:29 +00:00
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
2020-02-20 15:00:48 +03:00
cf4ecffcea
Merge branch 'tests-clear-config-tweaks' into 'develop'
...
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
2020-02-20 11:36:48 +00:00
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
2020-02-19 17:16:45 +01:00
cf94349287
Merge branch 'develop' into gun
2020-02-18 09:06:27 -06:00
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
2020-02-18 14:56:59 +00:00
226f4d5ef9
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
...
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
2020-02-18 17:52:31 +03:00
Ivan Tashkinov
Alexander Strizhakov
Maksim Pechnikov
Alex Gleason
rinpatch
Egor Kislitsyn
Haelwenn
Haelwenn (lanodan) Monnier
lain
kPherox
feld
eugenijm
Mark Felder