0c56f9de0d
Merge branch 'tests/openapi-everywhere' into 'develop'
...
Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324
2021-06-04 18:53:09 +00:00
eb7313b0d3
Pipeline Ingestion: Page
2021-06-04 20:06:33 +02:00
feld
a07310888f
Merge branch 'fix/missing-deprecation' into 'develop'
...
Add missing deprecation warning left out of !2842
See merge request pleroma/pleroma!3444
2021-06-04 17:37:30 +00:00
Mark Felder
f58928cf1c
Add missing deprecation warning left out of !2842
2021-06-04 12:30:10 -05:00
2c401dafa1
Improve opengraph embeds
...
This brings them more in line with Mastodon.
- Deduplicates display name from the title and content
- Removes arbitrary limits on the size of the embedded image
- Removes angled double quotes from embed descriptions. These would normally just indicate that the content is a quote, but that is already implied by the content being in an embed.
2021-06-04 05:33:35 +00:00
24d66b60a0
request_builder_test: mode :read got removed
2021-06-03 19:11:17 +02:00
5c3a0dd26e
factory: Fix article_factory
2021-06-03 19:11:16 +02:00
Mark Felder
d9513b11d3
Forgot to move migration test when rebasing
2021-06-01 11:49:47 -05:00
Mark Felder
9ce2c017c0
We want clear_config/2 in all tests now
2021-06-01 11:49:47 -05:00
d7dfa6d27c
Update test for RenameInstanceChat migration
2021-06-01 11:49:47 -05:00
01f796f8bb
Add a test for the migration
2021-06-01 11:49:47 -05:00
d6432a65da
Move shout configuration from :instance, update docs and changelog
2021-06-01 11:49:46 -05:00
ff00b354fa
Rename the non-federating Chat feature to Shout
2021-06-01 11:49:14 -05:00
c435de426d
Merge remote-tracking branch 'pleroma/develop' into cycles-constants
2021-06-01 11:33:11 -05:00
feld
0ddf492c5d
Merge branch 'cycles-base-url' into 'develop'
...
Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432
2021-06-01 16:15:27 +00:00
c4b4258374
Merge branch 'features/validators-note' into 'develop'
...
Pipeline Ingestion: Note
Closes #290
See merge request pleroma/pleroma!2984
2021-06-01 01:51:38 +00:00
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
2021-05-31 16:49:46 -05:00
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
2021-05-31 16:48:03 -05:00
10dfe81479
Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0
...
Move as_local_public/0 to stop making modules depend on Web at compile-time
2021-05-31 13:39:15 -05:00
feld
8871ca5aa3
Merge branch 'cycles-router-api-routes' into 'develop'
...
Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
See merge request pleroma/pleroma!3419
2021-05-28 19:06:49 +00:00
feld
359ded086c
Merge branch 'simplepolicy-announce-leak' into 'develop'
...
SimplePolicy: filter nested objects, fixes #2582
Closes #2582
See merge request pleroma/pleroma!3376
2021-05-28 19:05:13 +00:00
39127f15eb
Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes
2021-05-28 13:51:21 -05:00
c23b81e399
Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
...
Reduce recompilation time by breaking compile-time cycles
2021-05-28 13:51:01 -05:00
Mark Felder
4694853766
Provide totalItems field for featured collections
2021-05-27 12:17:31 -05:00
f34e22bba2
Merge branch 'feat/expose_email_to_self' into 'develop'
...
Expose user email address to user/owner; not publicly.
See merge request pleroma/pleroma!3412
2021-05-26 18:04:23 +00:00
Mark Felder
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
2021-05-20 14:02:58 -05:00
Mark Felder
05d678c070
Expose user email address to user/owner; not publicly.
2021-05-20 12:50:43 -05:00
Mark Felder
9b6b5ac196
Rename upload filter to AnalyzeMetadata
2021-05-18 15:33:33 -05:00
ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
2021-05-12 20:10:52 -05:00
4c060ae733
Ingest remote attachment width/height
2021-05-12 15:38:49 -05:00
ab9eabdf20
Add SetMeta filter to store uploaded image sizes
2021-05-12 15:07:31 -05:00
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-05-07 12:40:45 -05:00
1a45aa1278
Merge remote-tracking branch 'pleroma/develop' into notice-routes
2021-05-05 14:50:54 -05:00
50e3750758
Add notice compatibility routes for other frontends
...
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785
2021-05-05 14:50:10 -05:00
feld
745375bdcf
Merge branch 'dont-crash-email-settings' into 'develop'
...
Don't crash so hard when email settings are invalid
Closes #2606
See merge request pleroma/pleroma!3400
2021-05-04 13:30:00 +00:00
c186b059a7
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
2021-05-03 14:43:28 -05:00
c80b1aaf51
Don't crash when email settings are invalid
...
Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4
2021-05-03 14:43:14 -05:00
926a233cc4
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
2021-04-30 14:21:17 -05:00
c16c7fdb87
SimplePolicy: filter string Objects
2021-04-30 14:20:54 -05:00
3d742c3c1a
SimplePolicy: filter nested objects
2021-04-30 14:20:37 -05:00
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
2021-04-30 13:17:03 -05:00
a8fa00ef66
Fix failing remote mentions test, valid TLDs
2021-04-30 12:55:43 -05:00
53760d2cda
Delete obsolete EarmarkRendereTests (moved to UtilsTest)
2021-04-30 12:51:18 -05:00
6727a3659f
Remove Pleroma.Formatter.minify/2
2021-04-30 12:27:06 -05:00
e7ac15905e
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
2021-04-29 12:19:10 -05:00
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-04-29 11:14:32 -05:00
15f87cf658
Merge branch 'features/ingestion-ecto-tag' into 'develop'
...
TagValidator: New
See merge request pleroma/pleroma!3244
2021-04-16 09:55:55 +00:00
79376b4afb
Merge branch 'feature/521-pinned-post-federation' into 'develop'
...
Pinned posts federation
Closes #521
See merge request pleroma/pleroma!3312
2021-04-16 09:53:47 +00:00
0ababdc068
Merge branch 'fix/2593-reading-exported-config-file' into 'develop'
...
Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes #2593
See merge request pleroma/pleroma!3381
2021-04-16 09:50:26 +00:00
fa2e62078c
Remove MastoFE configuration stuff
2021-04-15 23:51:04 -06:00
ca79aab0bf
Remove MastoFE settings from users table
2021-04-15 23:33:24 -06:00
8afa3f2d1b
Remove no longer necessary unit tests for MastoFE
2021-04-15 23:12:42 -06:00
Mark Felder
f95b52255b
Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test
2021-04-14 09:39:57 -05:00
Mark Felder
905efc57e9
Initial test validating the AdminAPI issue
2021-04-13 14:39:28 -05:00
Mark Felder
cdd271b065
Fix assignment / assertion
2021-04-13 10:55:54 -05:00
Mark Felder
9fbcdc15b1
Validate custom instance thumbnail set via AdminAPI produces correct URL
2021-04-13 10:52:53 -05:00
681a42c359
release runtime provider fix for paths
2021-04-08 15:45:31 +03:00
5ef4659b37
test/pleroma/web/common_api_test.exs: Strip : around emoji key-name
2021-04-05 19:25:55 +02:00
6d6bef64bf
fetcher_test: Remove assert on fake Create having an ap_id
2021-04-05 19:19:12 +02:00
53193b84b1
utils: Fix maybe_splice_recipient when "object" isn’t a map
2021-04-05 19:19:12 +02:00
0b88accae6
fetcher_test: Fix missing mock function
2021-04-05 19:19:12 +02:00
b0c778fde7
NoteHandlingTest: remove fix_explicit_addressing-related test
2021-04-05 19:19:12 +02:00
d1205406d9
ActivityPubControllerTest: Apply same addr changes to object
2021-04-05 19:19:12 +02:00
641184fc7a
recipients fixes/hardening for CreateGenericValidator
2021-04-05 19:19:11 +02:00
c944932674
Pipeline Ingestion: Note
2021-04-05 19:19:11 +02:00
e2a3365b5c
ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults
2021-04-05 19:19:11 +02:00
e56779dd8d
Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing
2021-04-05 19:19:11 +02:00
5ae27c8451
pipeline_test: Fix usage of %Activity{}
2021-04-01 14:18:40 +02:00
Mark Felder
16a7ffb1ea
Fix function calls due to module name change
2021-03-30 11:10:44 -05:00
Mark Felder
bfcdcd4f69
Temp file leaked, oops
2021-03-30 11:10:44 -05:00
Mark Felder
03f38ac4eb
Prefer FollowBot naming convention vs Followbot
2021-03-30 11:10:44 -05:00
Mark Felder
fef4f3772c
More tests to validate Followbot is behaving
2021-03-30 11:10:44 -05:00
Mark Felder
f73d166785
Only need to validate a follow request is generated for now
2021-03-30 11:10:44 -05:00
4d046afd27
tests for release config provider
2021-03-27 09:05:33 +03:00
8857242c95
removeing corresponding add activity
2021-03-25 13:03:41 +03:00
5ae9b05600
separate test file for featured collection
2021-03-25 13:03:41 +03:00
8f0778166c
moving fixture into mastodon folder
2021-03-25 13:03:41 +03:00
16c96966e9
not needed
2021-03-25 13:03:41 +03:00
3adb43cc20
refetch user on incoming add/remove activity
...
if featured_address is nil
2021-03-25 13:03:41 +03:00
d1d2744ee3
featured_address valition in AddRemoveValidator
2021-03-25 13:03:40 +03:00
ff612750b1
validator renaming & add validation for target
2021-03-25 13:03:40 +03:00
17f28c0507
mastodon pins
2021-03-25 13:03:40 +03:00
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
2021-03-25 13:03:40 +03:00
b6a69b5efd
Return token's primary key with POST /oauth/token
2021-03-24 12:50:05 -05:00
feld
caadde3b04
Merge branch 'fix/2585-config-migration-dir' into 'develop'
...
migrating config to tmp folder
Closes #2585
See merge request pleroma/pleroma!3379
2021-03-23 17:46:52 +00:00
03843a5386
migrating config to tmp folder
2021-03-23 14:29:02 +03:00
d3660b24d3
Copy emoji in the subject from parent post
...
Sometimes people put emoji in the subject, which results in the subject
looking broken if someone replies to it from a server that does not
have the said emoji under the same shortcode. This patch solves the problem
by extending the emoji set available in the summary to that of the parent
post.
2021-03-22 21:20:47 +03:00
d7e51206a2
respect content-type header in finger request
2021-03-19 18:53:55 +03:00
a9bc652ab9
Merge branch 'mediaproxy-decode' into 'develop'
...
Simple way to decode mediaproxy URLs
See merge request pleroma/pleroma!3364
2021-03-19 08:52:12 +00:00
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00
67bde35e71
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
...
Add support for actor icon being a list (Bridgy)
See merge request pleroma/pleroma!3372
2021-03-19 08:36:26 +00:00
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
2021-03-16 01:54:43 +00:00
55bdfb075c
OpenAPI: TwitterAPI Util Controller
2021-03-15 06:47:07 +01:00
a22c53810b
Remove deprecated /api/qvitter/statuses/notifications/read
2021-03-15 06:47:07 +01:00
e4743847a1
OpenAPI: PleromaAPI UserImport Controller
2021-03-15 06:47:07 +01:00
ef5de5eb39
OpenAPI: MastodonAPI Status Controller
2021-03-15 06:47:07 +01:00
0c7c6463d1
OpenAPI: MastodonAPI Account Controller, excluding OAuth
2021-03-15 06:47:06 +01:00
3a8404820d
Verify MastoFE Controller put_settings response
2021-03-15 06:47:06 +01:00
e47f83cfc8
OpenAPI: MastodonAPI Conversation Controller
2021-03-15 06:47:06 +01:00
3123ecdd6e
OpenAPI: MastodonAPI Media Controller
2021-03-15 06:47:06 +01:00
7eecc3b61d
OpenAPI: MastodonAPI Timeline Controller
2021-03-15 06:47:06 +01:00
b1d4b2b81e
Add support for actor icon being a list (Bridgy)
2021-03-15 06:44:05 +01:00
946e0aab49
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-10 07:48:50 +03:00
7f413139fb
Merge branch 'openapi/admin/user' into 'develop'
...
Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355
2021-03-10 03:24:40 +00:00
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
Mark Felder
eaaa20e0f1
Make tests use it
2021-03-05 13:21:22 -06:00
92ab72dbbb
Update OpenApiSpex dependency
2021-03-05 15:51:29 +04:00
5856f51717
[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.
2021-03-03 23:09:30 +03:00
13aa98d689
Merge branch 'mergeback/2.3.0' into 'develop'
...
Mergeback/2.3.0
See merge request pleroma/pleroma!3360
2021-03-03 15:07:50 +00:00
2e296c079f
Revert "StatusController: Deactivate application support for now."
...
This reverts commit 024c11c18d
2021-03-03 15:33:06 +01:00
Mark Felder
913d53b7d7
Remove useless header on the get request
2021-03-02 14:04:50 -06:00
Mark Felder
ccbf162088
Actually test viewing status after ingestion
2021-03-02 12:33:32 -06:00
Mark Felder
f0208980e4
Test both ingestion of post in the status controller and the correct response during the view
2021-03-02 12:29:16 -06:00
3aae5231b2
Add OpenAPI spec for AdminAPI.UserController
2021-03-02 20:49:17 +04:00
024c11c18d
StatusController: Deactivate application support for now.
...
Some more things to discuss about, so we'll remove it from 2.3.0
2021-03-02 14:40:47 +01:00
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-02 08:26:30 +03:00
7ebbe11e75
user_agent_mock --> request_mock
2021-03-01 21:05:52 +01:00
1dc5794e29
Never forward the client's user-agent through the media proxy
2021-03-01 21:05:46 +01:00
Mark Felder
b1e1db82bc
Store application details in the object under the generator key, not application key
2021-03-01 11:29:10 -06:00
e8d88a72cf
Merge branch 'fix/warning-in-test' into 'develop'
...
warning fix
See merge request pleroma/pleroma!3350
2021-02-28 16:53:05 +00:00
4a9d3a1f28
Merge branch 'features/reports-enhancements' into 'develop'
...
Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280
2021-02-28 16:45:15 +00:00
f85ed1c521
warning fix
2021-02-28 19:41:25 +03:00
050c4b1f14
Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'
...
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes #2372 and #2535
See merge request pleroma/pleroma!3336
2021-02-28 16:18:23 +00:00
e6a14e1cd1
Merge branch 'feat/client_app_details' into 'develop'
...
Support application field
See merge request pleroma/pleroma!3311
2021-02-28 16:17:34 +00:00
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
2021-02-27 21:26:17 +01:00
d0823d7f1e
Merge branch 'frontendstatic-ignore-api-calls' into 'develop'
...
Filter out API calls from FrontendStatic plug
Closes #2261
See merge request pleroma/pleroma!3346
2021-02-27 19:40:38 +00:00
Mark Felder
d35b6254b4
Store the client application data in ActivityStreams format
2021-02-26 18:14:57 -06:00
feld
840686ecd5
Merge branch 'fix/2498-expires_in-scheduled-posts' into 'develop'
...
expires_in in scheduled status params
Closes #2498
See merge request pleroma/pleroma!3315
2021-02-26 16:49:11 +00:00
feld
2217b35bd4
Merge branch 'ecto-rollback-in-test-env' into 'develop'
...
Possibility to run rollback in test env
See merge request pleroma/pleroma!3212
2021-02-26 16:47:53 +00:00
Mark Felder
902d4e4a4a
Leave a note for future explorers
2021-02-25 13:06:43 -06:00
Mark Felder
2da71a526f
No need to filter out Mix.env() from the API routes.
2021-02-25 13:04:08 -06:00
Mark Felder
6b87dfad5d
Filter out MIX_ENV from route list and add a test
2021-02-25 09:23:10 -06:00
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
2021-02-23 13:58:35 +03:00
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
2021-02-23 13:52:28 +03:00
7fc9cd0974
Video: Handle peertube videos only stashing attachments in x-mpegURL
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
2021-02-21 23:41:28 +01:00
Mark Felder
63739c5a58
Tests to validate client disclosure obeys user setting
2021-02-18 17:23:17 -06:00
Mark Felder
d5ef02c7a7
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
2021-02-18 16:35:03 -06:00
1e6c27181e
expires_in in scheduled status params
2021-02-18 14:59:22 +03:00
6d66fadea7
Remove `:auth, :enforce_oauth_admin_scope_usage`
...
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
2021-02-17 20:47:38 +03:00
ff72ce31ca
Enhance reports in Pleroma API: index, show
2021-02-17 18:46:53 +01:00
e7b1f0f5f4
Merge branch 'feat/chat-list-pagination' into 'develop'
...
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Closes #2140
See merge request pleroma/pleroma!3325
2021-02-17 15:36:59 +00:00
158f9f18ee
Merge branch 'remove-conversation-api' into 'develop'
...
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
2021-02-17 15:14:27 +00:00
264cb2c77f
Merge branch '2510-oauth-app-tokens-further-support' into 'develop'
...
[#2510 ] Improved support for app-bound OAuth tokens
Closes #2510
See merge request pleroma/pleroma!3316
2021-02-17 13:08:51 +00:00
d7ad288c84
Chats: Introduce /api/v2/pleroma/chats which implements pagination
...
Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes #2140
2021-02-17 16:03:24 +03:00
111bfdd3a0
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-02-16 23:23:49 +03:00
1dac7d1462
[ #3213 ] Fixed `hashtags.name` lookup (must use `citext` type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
2021-02-15 21:13:14 +03:00
cf6d3db58f
Add API endpoint to remove a conversation
2021-02-15 21:48:13 +04:00
Mark Felder
fb2a8e7ccd
Additional validation so we don't get caught off guard with a nil response
...
if CommonAPI ever prevents us from injecting this data
2021-02-12 13:15:33 -06:00
Mark Felder
3554a65f45
Inject fake application metadata and validate it is stripped by transmogrifier
2021-02-12 13:05:12 -06:00
db716f860a
Merge branch 'not-used-mock' into 'develop'
...
Not used mock
See merge request pleroma/pleroma!3313
2021-02-12 08:52:04 +00:00
76414ad277
Merge branch 'bugfix/answer-outbox' into 'develop'
...
Add test for Answer presence into an authenticated /outbox
See merge request pleroma/pleroma!3269
2021-02-12 08:48:51 +00:00
Mark Felder
bd3d0e8b57
Use a custom oauth token so we can predict and validate the client_name and website
2021-02-11 15:53:10 -06:00
Mark Felder
333ff527fd
Validate client application metadata is retained in the object
2021-02-11 15:07:21 -06:00
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
2021-02-11 19:31:57 +03:00
df89b5019b
[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.
2021-02-11 15:02:50 +03:00
b5d001fc8c
not used mock
2021-02-10 18:44:49 +03:00
a853218701
Merge branch 'features/ap_id-c2s-authentication' into 'develop'
...
activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295
2021-02-09 19:29:43 +00:00
feld
593c0851d9
Merge branch 'develop' into 'new-user-emails'
2021-02-08 16:01:50 -06:00
a5bee1bf35
Merge branch 'feat/mrf-noemptypolicy' into 'develop'
...
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
See merge request pleroma/pleroma!3309
2021-02-08 21:49:20 +00:00
Mark Felder
55a13fc360
MRF NoEmptyPolicy: Deny posts from local users if there is no content or only mentions.
...
Helps prevent accidental button mashes from submitting incomplete posts
2021-02-08 15:32:47 -06:00
8c7b3b20d8
activity_pub_controller: Add authentication to object & activity endpoints
2021-02-08 20:00:47 +01:00
d1c6dd97aa
[ #3213 ] Partially addressed code review points.
...
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
2021-02-07 22:24:12 +03:00
Mark Felder
6a3e75c8e6
Lint
2021-02-05 09:00:17 -06:00
Mark Felder
c361440396
Add basic test to validate the registration email is dispatched when the others are disabled
...
Also only check for subject as the body is a mess of html and we don't really need to prove its contents if the subject matches.
2021-02-04 17:56:46 -06:00
Mark Felder
d047372291
Merge branch 'develop' into fix/reports-from-admins
2021-02-04 12:37:20 -06:00
feld
7b67bf4e97
Merge branch 'fix/configdb-error' into 'develop'
...
Improve error message for ConfigDB
See merge request pleroma/pleroma!3289
2021-02-04 14:33:59 +00:00
ea5469961a
Merge branch 'bugfix/notice-external-redirect' into 'develop'
...
Redirect non-local activities when /notice/:id is used
See merge request pleroma/pleroma!3300
2021-02-04 14:26:03 +00:00
ecff027418
Redirect non-local activities when /notice/:id is used
...
Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
2021-02-04 15:17:40 +01:00
Mark Felder
887db076b5
Load an emoji.txt specific to the test env
2021-02-03 16:40:59 -06:00
Mark Felder
5bb5949048
Validate admin making report doesn't get their own report notification, but other admins do
2021-02-03 12:54:53 -06:00
feld
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
2021-02-03 14:23:23 +00:00
feld
c3dd860a02
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'
...
Fix for scheduled post with poll
Closes #2449
See merge request pleroma/pleroma!3294
2021-02-03 14:22:23 +00:00
feld
8d2ea95402
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
...
Feature/2438 users/instances posts total count
Closes #2438
See merge request pleroma/pleroma!3270
2021-02-03 14:21:57 +00:00
fb25231fbe
Add test for Answer presence into an authenticated /outbox
2021-02-03 12:07:18 +01:00
4e14945670
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/activity_pub/activity_pub.ex
2021-02-03 09:31:38 +03:00
feld
f1f773f2c7
Merge branch 'email-stub-in-verify-credentials' into 'develop'
...
Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)
See merge request pleroma/pleroma!3286
2021-02-02 18:35:08 +00:00
feld
d37d4106c6
Merge branch 'fix/majic-nits' into 'develop'
...
Majic: don't fix extensions
See merge request pleroma/pleroma!3287
2021-02-02 18:15:00 +00:00
Mark Felder
28d2917c3a
Merge branch 'develop' into fix/majic-nits
2021-02-02 12:01:48 -06:00
feld
d289ad8579
Merge branch 'develop' into 'fix/2411-mutes-api'
...
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
2021-02-02 17:57:58 +00:00
feld
cd5ff7a943
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
...
# Conflicts:
# CHANGELOG.md
2021-02-02 17:11:38 +00:00
aacd1c90b7
fix for test warnings
2021-02-01 19:33:40 +03:00
0dc68c157f
fix for scheduled post with poll
2021-02-01 18:22:26 +03:00
fdf1dfed56
only_remote -> remote renaming
2021-02-01 14:11:12 +03:00
77f0a0af7d
more tests and update for docs and changelog
2021-02-01 14:11:12 +03:00
2cb6dc5a3a
list timeline filtration by params
2021-02-01 14:11:12 +03:00
b6a72680e2
added only_media flag to home timeline
2021-02-01 14:11:11 +03:00
c3110c46f3
expanding filtration for home timeline
...
added local & remote statuses filtration for home timeline
2021-02-01 14:11:11 +03:00
cf4765af40
[ #3213 ] ActivityPub: fixed subquery-based hashtags filtering implementation (addressed empty list options issue). Added regression test.
2021-01-31 23:06:38 +03:00
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-31 20:38:58 +03:00
6fd4163ab6
[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
2021-01-31 20:37:33 +03:00
c369d2b930
support for with_relationships parameter
...
in /api/v1/mutes and /api/v1/accounts/:id endpoints
2021-01-29 08:41:21 +03:00
380d0cce6b
[ #3213 ] Reinstated DISTINCT clause for hashtag "any" filtering with 2+ terms. Added test.
2021-01-29 00:17:33 +03:00
Mark Felder
5fcab23aa3
Improve error message for ConfigDB
2021-01-28 14:59:23 -06:00
Mark Felder
9272cef500
Switch to a build of Majic that does not try to fix extensions by default
2021-01-28 14:03:29 -06:00
a51d903e0c
Make sure active_user_count/1 counts only local users
2021-01-28 22:23:10 +04:00
60b4654038
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
...
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56 .
2021-01-28 19:49:43 +03:00
bddb01bded
Add tests
2021-01-27 18:20:07 +04:00
793fc77b16
Add active user count
2021-01-27 18:20:06 +04:00
7f07871639
Merge branch 'chore/tests-use-clear_config' into 'develop'
...
Convert tests to all use clear_config instead of Pleroma.Config.put
See merge request pleroma/pleroma!3282
2021-01-27 11:33:27 +00:00
d4158e8bf0
added total
...
to the instance adminAPI endpoint
2021-01-27 07:45:06 +03:00
6806c03e85
added total
...
to the user statuses adminAPI endpoint
2021-01-27 07:45:02 +03:00
feld
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
2021-01-26 18:14:01 +00:00
Mark Felder
e854c35e65
Convert tests to all use clear_config instead of Pleroma.Config.put
2021-01-26 11:58:43 -06:00
229acae6c3
Merge branch 'develop' into '2435-list-multiple-users'
...
# Conflicts:
# CHANGELOG.md
2021-01-26 14:24:32 +00:00
875fbaae35
support for expires_in/expires_at in filters
2021-01-26 08:27:45 +03:00
250e202098
Merge branch 'fix/missing-own_votes' into 'develop'
...
Include own_votes in the poll data
See merge request pleroma/pleroma!3274
2021-01-26 00:55:05 +00:00
Mark Felder
0b19534475
Merge branch 'develop' into docs/apache-config
2021-01-25 17:00:26 -06:00
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-25 21:24:07 +03:00
Mark Felder
f868dcf3ac
Ensure consistent behavior between pleroma.user activate/deactivate mix tasks
2021-01-25 10:48:28 -06:00
3f3d64acbf
little refactor and tests
...
for voted & own_votes fields in polls
2021-01-25 19:46:36 +03:00
Mark Felder
5e8da27e14
Provide pleroma.user mix task for both activate and deactivate
2021-01-25 10:36:51 -06:00
Mark Felder
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-25 09:45:06 -06:00
Mark Felder
6bfd497f4a
Include own_votes in the poll data
2021-01-22 09:47:59 -06:00
218c519606
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
2021-01-22 10:05:28 +03:00
Mark Felder
80ccdb56f6
Make tag urls absolute
2021-01-21 16:49:19 -06:00
Mark Felder
42e49529c2
Test URL formatting
2021-01-21 14:42:16 -06:00
Mark Felder
0c485d5555
Improve description
2021-01-21 14:42:08 -06:00
7fcaa188a0
Allow to define custom HTTP headers per each frontend
2021-01-21 21:55:23 +03:00
133644dfa2
Ability to set the Service-Worker-Allowed header
2021-01-21 21:55:11 +03:00
ca7f240643
[ #3213 ] Ignoring of blank elements from objects.data->tag.
2021-01-21 20:50:06 +03:00
c041e9c630
[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.
...
Changed default hashtags filtering strategy to non-aggregate approach.
2021-01-21 20:23:08 +03:00
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-21 20:20:35 +03:00
ba40af054c
Merge branch 'test-cases-mox-setup' into 'develop'
...
Mox mode setup tweak; refactoring
See merge request pleroma/pleroma!3263
2021-01-21 09:03:26 +00:00
feld
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
2021-01-20 22:48:48 +00:00
Mark Felder
9988d9261c
Add bucket_namespace to be extra certain truncated_namespace works
2021-01-20 16:33:00 -06:00
Mark Felder
dfc4cb6ebd
Special handling for unconfirmed users based on instance config no longer needed.
2021-01-20 11:30:29 -06:00
Mark Felder
5d344e5c79
Only need to test if unconfirmed users are successfully deleted
...
It's no longer possible to have an active user account with User.is_confirmed == false
2021-01-20 11:26:14 -06:00
Mark Felder
3cb4d40ebf
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.
2021-01-20 11:17:13 -06:00
318d6dde1c
Mox mode setup tweak; refactoring.
2021-01-19 00:23:39 +03:00
feld
958a7f6ed0
Merge branch 'fix/reblog-api' into 'develop'
...
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
2021-01-18 21:19:14 +00:00
Mark Felder
28581e03ad
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-18 14:58:21 -06:00
Mark Felder
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
2021-01-18 12:05:05 -06:00
51d5951c02
Test that only author can reblog a private status
2021-01-18 21:01:00 +04:00
1b79dce7bc
Fix Reblog API
...
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
2021-01-18 20:15:57 +04:00
bdfd72630f
ListController: Fix being unable to add / remove users.
2021-01-18 16:28:36 +01:00
3f88e33a71
[ #3251 ] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to `clear_config/_` to minimize such issues in future.
2021-01-16 23:05:31 +03:00
48b399cedb
[ #3213 ] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
2021-01-16 20:22:14 +03:00
2c0fe2ea9e
Remove toggle_confirmation; require explicit state change
...
Also cosmetic changes to make the code clearer
2021-01-15 13:11:51 -06:00
d36182c088
Change user.confirmation_pending field to user.is_confirmed
2021-01-15 12:44:41 -06:00
ebd7d1365b
Make setting user activation status explicit
2021-01-15 11:37:17 -06:00
7516660753
Remove toggle_activation
2021-01-15 11:25:32 -06:00
860b5c7804
Change user.deactivated field to user.is_active
2021-01-15 11:24:46 -06:00
Mark Felder
f7e59c28ed
Change user.approval_pending field to user.is_approved
2021-01-15 10:42:02 -06:00
Mark Felder
d0e0396528
Hack to fix tests not passing. Unclear why the filters are being set to nil.
...
Both of these changes are needed or it doesn't work.
2021-01-14 17:49:37 -06:00
Mark Felder
0b725f5d21
Lint
2021-01-14 16:00:32 -06:00
Mark Felder
12c8ce481c
Bump Copyright year
2021-01-14 13:58:52 -06:00
Mark Felder
fb47e83adc
Add ConfigDB migration
2021-01-14 13:53:55 -06:00
fd9a0ac329
BackupTest: Fix s3 test.
2021-01-14 20:18:45 +01:00
c4b74c9c3f
Linting.
2021-01-14 16:01:14 +01:00
39f3683a06
Pbkdf2: Use it everywhere.
2021-01-14 15:06:16 +01:00
87a31c5c9b
Password -> Password.Pbkdf2
2021-01-14 14:49:39 +01:00
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-13 22:11:16 +03:00
Mark Felder
ba234d3c73
Unnecessary duplication here
2021-01-13 12:01:01 -06:00
Mark Felder
94e5180846
Consistent style
2021-01-13 12:00:48 -06:00
aff83eb7c1
Linting
2021-01-13 16:00:12 +01:00
9106048c61
Password: Replace Pbkdf2 with Password.
2021-01-13 15:11:11 +01:00
c7cd9bd591
Password: Add password module
...
Replaces Pbkdf2.
2021-01-13 15:09:01 +01:00
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
Mark Felder
67e888498c
Switch another test to Upload.base_url/0
2021-01-12 16:42:43 -06:00
Mark Felder
e87cca97e6
Fix tests relying on old behavior. Use the Upload.base_url, Luke.
2021-01-12 16:35:10 -06:00
Mark Felder
8b28dce82a
Deprecate Pleroma.Uploaders.S3, :public_endpoint
2021-01-12 16:31:35 -06:00
feld
5453038ce9
Merge branch 'fix/backup-url-on-s3' into 'develop'
...
Standardize base url for uploads
See merge request pleroma/pleroma!3246
2021-01-12 20:54:30 +00:00
e1a547d7d3
ChatMessages: Fix pagination headers.
...
They used to contain the path parameter `id` as query param,
which would break the link.
2021-01-11 15:30:40 +01:00
Mark Felder
3c936061d5
Apply Upload.base_url for S3
2021-01-08 17:32:42 -06:00
5822338f3a
Merge branch 'guppe-example' into 'develop'
...
ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243
2021-01-08 15:55:48 +00:00
e73c7fa7e5
Merge remote-tracking branch 'upstream/develop' into confirm-users
2021-01-08 07:48:19 -06:00
1b98cd8610
Remove ConfirmUserPlug
2021-01-08 07:47:55 -06:00
80167e62dd
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
...
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
2021-01-08 13:10:49 +00:00
3342f6a7ef
Backups: render ID in API
2021-01-07 13:06:22 -06:00
bd788c0939
ActivtityPub Test: Add example for guppe actor
2021-01-07 16:20:30 +01:00
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
2021-01-07 11:09:18 +00:00
4d56aca904
Merge branch 'adminapi-user-email' into 'develop'
...
AdminAPI: return user email
See merge request pleroma/pleroma!3240
2021-01-07 10:08:02 +00:00
cc09079aea
Exclude blockers from notifications when `blockers_visible: false`
2021-01-06 15:39:14 -06:00
1438fd9583
Merge remote-tracking branch 'upstream/develop' into block-behavior
2021-01-06 15:22:35 -06:00
9f6fa5877f
Add AdminAPI.AccountViewTest
2021-01-06 11:43:07 -06:00
20af025c65
AdminAPI: return user email
2021-01-06 11:30:32 -06:00
48cd336a72
allow external emoji
2021-01-06 10:13:01 -06:00
07bf36142b
Resilience Test: Add notification check for killing likes.
2021-01-06 12:49:18 +01:00
a24b2bc38a
Resilience Test: Add tests for killing likes.
2021-01-06 12:33:09 +01:00
Mark Felder
f9090e00e6
Add test to validate URLs to custom emojis are properly encoded
2021-01-05 13:58:49 -06:00
20a269ed69
Merge branch 'fix/pagination-regression' into 'develop'
...
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
2021-01-05 12:40:45 +00:00
fee0c6a2cb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
2021-01-05 13:33:57 +01:00
e802b48d55
User: Use ObjectID type to validate also-known-as field
2021-01-05 13:10:14 +01:00
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
2021-01-05 12:42:30 +01:00
bea69853a2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
2021-01-05 12:19:39 +01:00
95a0ae8a35
AccountControllerTest: Fix test logic
2021-01-05 11:48:40 +01:00
d44850d7a5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
2021-01-05 10:48:32 +01:00
8e5904daa5
SideEffects.DeleteTest: asyncify.
...
Replace Mock with Mox, mock out Logger.
2021-01-04 18:40:59 +01:00
Mark Felder
0e93775ed0
Add test to validate profile pagination works with keyset
2021-01-04 11:04:58 -06:00
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
0ec7e9b8e9
AdminAPI: return id for moderation log entries
2021-01-01 11:59:48 -06:00
7b44605cb8
Migration to confirm previously-logged-in users
2020-12-31 14:04:51 -06:00
feld
afe9c152ab
Merge branch 'fix/reports-ordering' into 'develop'
...
Do not reverse order of reports. We want newest ones sorted to the top.
Closes #2364
See merge request pleroma/pleroma!3225
2020-12-31 19:24:49 +00:00
Mark Felder
e4791258d4
Ensure newest report is returned first in the list
2020-12-31 12:40:42 -06:00
64f0e96ff6
Automatically confirm logged-in users
2020-12-31 12:13:08 -06:00
11d40e92b7
Render AKAs in Actor endpoints
2020-12-30 18:53:27 -06:00
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
2020-12-30 17:10:02 -06:00
Mark Felder
4c5f75f4e9
Support pagination in AdminAPI for user statuses
2020-12-30 15:18:54 -06:00
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
2020-12-28 10:14:58 +00:00
14fae94c0e
[ #3213 ] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.
2020-12-28 00:08:09 +03:00
7bfb041658
insreasing test coverage for StealEmojiPolicy
2020-12-27 21:53:30 +03:00
4134abef63
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2020-12-26 22:23:05 +03:00
cbb19d0e18
[ #3213 ] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to `hashtags` table.
2020-12-26 22:20:55 +03:00
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
2020-12-26 10:26:35 +00:00
590a10af33
Adds tests for breaking tag and mention links after text is converted from markdown to html
2020-12-24 16:40:08 -06:00
e369b1306b
Added Hashtag entity and objects-hashtags association with auto-sync with `data.tag` on Object update.
2020-12-22 22:04:33 +03:00
538af14d52
possibility to run rollback in test env
2020-12-22 17:55:30 +03:00
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
2020-12-21 22:54:26 +03:00
ab633e51ab
Linting
2020-12-21 16:48:35 +01:00
1a3da01a65
Tests: Stub the pipeline in all tests.
...
Restores the old un-moxed behavior.
2020-12-21 16:38:34 +01:00
5db1e6c8d3
Pipeline test: Switch from Mock to Mox.
...
Speeds up the test and makes it possible to run async.
2020-12-21 16:35:12 +01:00
0ef0aed205
Tests: Add a helper method to reduce sleeping times in test.
...
This will 'time travel', i.e. change the inserted_at and update_at
fields of the object in question. This is used to backdate things
were we used sleeping before to ensure time differences.
2020-12-21 16:31:23 +01:00
ba19975838
Linting
2020-12-21 16:22:36 +01:00
9d5ce82221
Test: More async/sync tweaks.
2020-12-21 15:05:56 +01:00
b17c36c45a
Tests: More test fixes.
2020-12-21 12:59:11 +01:00
2f8ec8a9cc
XMLBuidlder test: Make async.
2020-12-21 12:35:04 +01:00
9ba60f70d2
Tests: Make as many tests as possible async.
...
In general, tests that match these criteria can be made async:
- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer.
2020-12-21 12:21:40 +01:00
ee81a94ab2
Caching: Add caching behavior, add null implementation.
2020-12-21 11:42:53 +01:00
509f82e4d6
Add test for subscribe_address in JSON WebFinger response
2020-12-19 22:11:47 +11:00
95a9bdfc37
Tests: Use NullCache for async tests.
...
Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test.
2020-12-18 19:53:19 +01:00
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
2020-12-18 17:44:46 +01:00
b4b68b71fc
Tests: Remove unneeded explicit cachex use.
...
Only use cachex when we're actually testing it.
2020-12-18 13:18:17 +01:00
c1129ff674
Tests: Reset all cachex caches between synchronous tests
...
Don't bother in the async case, it doesn't make sense there.
2020-12-18 11:53:43 +01:00
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-12-17 09:05:36 -06:00
8b8c317c0f
Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
...
Fix mastoapi ws posts dropping
Closes #2336
See merge request pleroma/pleroma!3198
2020-12-16 11:35:45 +00:00
6bb4f4e172
Merge branch 'support/2255_posix_errors' into 'develop'
...
[#2255 ] added error messages for posix error code
See merge request pleroma/pleroma!3138
2020-12-15 15:16:03 +00:00
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
2020-12-14 11:02:32 -06:00
f318d8e56d
Use Pleroma.Formatter.markdown_to_html/1 in the tests
2020-12-11 17:28:00 -06:00
f1c67115d8
Upgrade linkify, test URL issues, fixes #2026 #1942
2020-12-11 17:22:48 -06:00
f8c93246d6
Refactor Earmark code, fix tests
2020-12-11 17:22:42 -06:00
c4f4e48e57
Remove some N/A tests
2020-12-11 17:22:30 -06:00
e9e17e5df3
Upgrade Earmark to v1.4.10
2020-12-11 17:22:17 -06:00
7fff9c1bee
Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
2020-12-09 21:14:39 +03:00
477c6c8e55
Merge branch 'auth-improvements' into 'develop'
...
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
2020-12-09 15:55:45 +00:00
1436a2fa2d
Merge branch 'stream-follow-updates' into 'develop'
...
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
2020-12-09 15:52:31 +00:00
e73d878b38
Merge branch 'feat/warn-large-pool-size' into 'develop'
...
Add a startup error for modified Repo pool_size
See merge request pleroma/pleroma!3190
2020-12-08 16:36:51 +00:00
50d16a9e27
ApplicationRequirements: Add test, more text for pool size.
2020-12-08 17:30:10 +01:00
1403798820
instance.reachable?: Limit to binary input
2020-12-07 21:20:44 +01:00
e1a2e8b17c
instance: Do not fetch unreachable instances
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346
2020-12-07 20:11:47 +01:00
c8e7ace812
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
...
# Conflicts:
# CHANGELOG.md
2020-12-07 21:45:04 +03:00
ed76323776
Merge branch 'feature/configdb-mix-tasks' into 'develop'
...
Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174
2020-12-07 18:06:06 +00:00
e3dd0d45b7
Slip in a test to ensure we can use the atom syntax in mix task arguments
2020-12-07 11:21:06 -06:00
e00c667145
[ #3174 ] Refactoring: ConfigDB fetching functions, ConfigDB tests.
...
Minor fixes.
2020-12-06 18:02:30 +03:00
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-12-06 13:59:35 +03:00
e9859b68fc
[ #3112 ] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
2020-12-06 13:59:10 +03:00
657002e738
Answer new prompt interactively
2020-12-04 12:07:23 -06:00
feld
6adad96c79
Merge branch 'issue/2256' into 'develop'
...
[#2256 ] added subject actor to moderation log
See merge request pleroma/pleroma!3164
2020-12-04 17:49:05 +00:00
1d04bd0894
Merge branch 'supported-emojos' into 'develop'
...
Update Emoji support to unicode 13.1, support all RGI emoji.
See merge request pleroma/pleroma!3186
2020-12-03 18:29:42 +00:00
fa0d0b602f
Emoji: Also accept regional indicators
2020-12-03 16:17:39 +01:00
05879a3b3e
Merge branch '2339-local-remote-mixup' into 'develop'
...
User: Don't allow local users in remote changesets
Closes #2339
See merge request pleroma/pleroma!3185
2020-12-03 01:28:54 +00:00
e379ab8277
Add --force flag for delete and reset commands
...
Bunch of reorganization and consolidation
2020-12-02 16:24:32 -06:00
13947999ad
Use a callback strategy to short circuit the functions and print a nice error
2020-12-02 12:33:34 -06:00
3e6d9187a7
Add tests for config dumping
2020-12-02 10:43:22 -06:00
126d236455
We no longer expect mentions to link if they are prefixed with too many @'s
2020-12-02 10:27:55 -06:00
8fb259e739
Emoji: Only accept RGI emoji.
...
"recommended for general interchange"
2020-12-02 16:46:19 +01:00
3b3cf63118
Emoji: Add test for ZWJ sequence emoji
2020-12-02 16:18:08 +01:00
c9afb350e7
Document follow relationship updates and cleanup
2020-12-02 19:16:36 +04:00
1adee08321
Emoji: Update to Unicode 13.1, switch base file, allow multichar.
2020-12-02 16:15:03 +01:00
5d15486098
SideEffects: fix test
2020-12-02 14:48:11 +01:00
222312900e
User: Don't allow local users in remote changesets
2020-12-02 12:18:43 +01:00
35ba48494f
Stream follow updates
2020-12-02 00:18:58 +04:00
fc9ebe5073
Search tests: Use on_exit for restoring `persistent_term` state
...
Otherwise if the assertion failed, the code below which resets the
state would never be reached
2020-12-01 19:45:25 +03:00
d50a3345ae
[ #3112 ] Allowed revoking same-user token from any apps. Added tests.
2020-11-30 21:55:48 +03:00
50e47a215f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-28 21:51:27 +03:00
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
2020-11-28 21:51:06 +03:00
6aadb1cb40
digest algorithm is taken from header
2020-11-27 08:10:52 +03:00
fb72f2034a
fix spec
2020-11-25 22:44:27 +03:00
62993db499
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-25 21:48:18 +03:00
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
2020-11-25 21:47:23 +03:00
54df44d380
Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters
2020-11-23 14:48:14 -06:00
3283d0805f
Use Jason instead of Poison in tests
2020-11-23 13:28:55 -06:00
67b15cc033
Search: Save detected pg version in a persistent term.
2020-11-23 15:29:55 +01:00
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-23 15:18:19 +01:00
489b12cde4
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-21 19:47:46 +03:00
ccc2cf0e87
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
2020-11-21 19:47:25 +03:00
30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-21 10:23:53 -06:00
feld
ecd1ef8cb5
Merge branch 'fix/2302-report-duplicates' into 'develop'
...
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
2020-11-20 18:40:15 +00:00
8532325d65
SearchController Test: Fix test.
2020-11-20 16:29:11 +01:00
9a1e5f5d48
Search: Change search method based on detected pg version
2020-11-20 16:26:43 +01:00
feld
79a509ee61
Merge branch '2301-users-search-discoverability-fix' into 'develop'
...
[#2301 ] Proper handling of User.is_discoverable
Closes #2301
See merge request pleroma/pleroma!3162
2020-11-19 20:33:52 +00:00
feld
cd1b4155d5
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
...
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
2020-11-19 20:32:32 +00:00
66f411fba0
added subject actor to moderation log
2020-11-19 22:13:45 +03:00
b27d8f7437
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
...
# Conflicts:
# CHANGELOG.md
2020-11-19 19:35:44 +03:00
5e04f4156c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-19 17:32:57 +01:00
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
2020-11-19 19:30:02 +03:00
c8d11c3064
Merge branch '2317-old-reset-tokens' into 'develop'
...
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
2020-11-19 16:22:14 +00:00
783fa797bb
SearchController Test: Fix test
2020-11-19 16:53:26 +01:00
81b6f02a5e
Search Test: linting
2020-11-19 16:48:51 +01:00
a60242464e
Search: Add option to search with the websearch function
2020-11-19 16:12:01 +01:00
fcad3e716a
[ #2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results.
2020-11-19 18:08:22 +03:00
46dab37351
little fix
2020-11-19 15:29:26 +03:00
11e0d5f9ac
Password Resets: Don't accept tokens above a certain age.
...
By default, one day
2020-11-19 12:27:06 +01:00
4aaffe3a10
log capture
2020-11-19 09:58:32 +03:00
be0b874e1d
fix for mastodon forwarded reports
2020-11-19 09:53:14 +03:00
a840aefda8
formatting
2020-11-19 09:53:13 +03:00
e2bf6b1f7e
fix for forwarded reports
2020-11-19 09:53:13 +03:00
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
2020-11-18 20:22:40 +00:00
aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
2020-11-18 18:33:48 +00:00
6b32e1de23
Merge branch 'frontend-admin-api' into 'develop'
...
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
2020-11-18 17:51:57 +00:00
9c5d1cb9ed
fix tests
2020-11-18 09:58:51 +03:00
415481a4d9
Add test for POST when push is disabled
...
Also group together the tests verifiying failure when disabled
2020-11-17 22:18:22 +00:00
3eaa5335c9
Revert adding extra alert types here
2020-11-17 21:37:17 +00:00
d9732fb7d3
Fix incorrect test description
2020-11-17 21:34:18 +00:00
ff7a4b6aa2
Test that we ignore invalid subscription alert types separately.
2020-11-17 20:22:25 +00:00
30f140e570
Ensure all supported push notification subscription alert types are tested
2020-11-17 20:22:25 +00:00
499faa82f6
Synchronize reaction notification text with PleromaFE's style
2020-11-17 20:22:24 +00:00
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
2020-11-17 20:20:00 +00:00
3ce11b830e
Add capability for emoji reaction push notifications
2020-11-17 20:20:00 +00:00
bb9650f3c2
FrontendController: Return error on installation error.
2020-11-17 16:43:07 +01:00
feld
d33b9e7b33
Merge branch 'remove/fedsockets' into 'develop'
...
Remove FedSockets
See merge request pleroma/pleroma!3155
2020-11-17 14:58:33 +00:00
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
2020-11-17 18:34:04 +04:00
d48dbfab2b
Merge remote-tracking branch 'origin/develop' into hide-muted-reactions
2020-11-17 18:30:10 +04:00
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
2020-11-17 18:29:52 +04:00
2c55f7d7cb
Remove FedSockets
...
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
2020-11-17 17:28:30 +03:00
61f86774d1
Merge branch 'chores/note-handling-move' into 'develop'
...
Chores/note handling move
See merge request pleroma/pleroma!3122
2020-11-17 14:16:53 +00:00
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-17 15:01:38 +01:00
81293e5aad
ActivityPubController: Don't return local only objects
2020-11-17 13:11:39 +01:00
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
2020-11-16 21:29:15 +00:00
e4b202d905
added test
2020-11-16 22:23:28 +03:00
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
e1d25bad0c
fix tests
2020-11-16 21:45:37 +03:00
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-14 19:48:47 -06:00
28da36975d
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
...
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
2020-11-14 21:43:07 +00:00
e2f573d68b
pleroma.instance: Fix Exiftool module name
2020-11-14 22:31:01 +01:00
36ec604521
added test
2020-11-14 08:30:22 +03:00
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
2020-11-13 13:35:47 +00:00
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13 13:35:46 +00:00
6ca709816f
Fix object spoofing vulnerability in attachments
...
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects .
content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
possibility I missed something.
Closes pleroma#1948
2020-11-12 15:25:33 +03:00
99bc175f02
Merge branch 'title-injection-change' into 'develop'
...
Title injection change
See merge request pleroma/pleroma!3132
2020-11-12 08:50:26 +00:00
966663c3f8
Fix tests for other attachment types
2020-11-11 16:17:35 -06:00
2254e5e595
Render blurhashes in Mastodon API
2020-11-11 12:51:13 -06:00
6fd72e9e85
Ingest blurhash for attachments if they were federated
2020-11-11 12:27:51 -06:00
d26a449396
Change endpoint path
2020-11-11 20:39:57 +04:00
435bf1f945
Remove FrontendInstallerWorker
2020-11-11 20:12:35 +04:00
631def2df2
RedirectController: Don't replace title, but inject into the meta
2020-11-11 17:10:59 +01:00
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
0118ccb53c
Add `local` visibility
2020-11-11 18:54:01 +04:00
feld
3cd7ea693f
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
...
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
2020-11-11 13:48:03 +00:00
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
2020-11-11 13:39:49 +03:00
f97f24b067
making credo happy and test fix
2020-11-11 10:48:03 +03:00
485697d96c
config descriptions for custom MRF policies
2020-11-10 19:20:14 +03:00
88f6b61a5e
Merge branch '2260-wrong-report-link' into 'develop'
...
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
2020-11-10 11:04:19 +00:00
0c68b9ac13
escaping summary and other fields in xml templates
2020-11-10 10:46:57 +03:00
cc45c69fff
Remove release_env
...
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
2020-11-08 11:56:09 +03:00
e010bb292b
NoteHandlingTest: Poison → Jason
2020-11-06 14:04:03 +01:00
fa1f5d4442
Move TransmogrifierTest for Note to NoteHandlingTest
2020-11-06 08:57:16 +01:00
6d850c46dc
AdminEmail: Use AP id as user url.
2020-11-04 17:12:47 +01:00
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
bae48c98e3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
2020-11-04 16:18:11 +01:00
4800ee656b
Merge branch 'features/federation-status' into 'develop'
...
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
2020-11-04 15:00:52 +00:00
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
2020-11-04 14:54:53 +00:00
73e66fd31f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-04 17:48:10 +03:00
9c09ea01aa
Merge branch '2284-voters-count' into 'develop'
...
Always return voters_count in polls
See merge request pleroma/pleroma!3120
2020-11-04 14:44:45 +00:00
504a829edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
2020-11-04 15:38:10 +01:00
cb3cd3a761
TopicsTest: Small addition.
2020-11-04 15:24:10 +01:00
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
bc4d9c4ffc
Merge branch 'hide-muted-chats' into 'develop'
...
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
2020-11-04 13:48:15 +00:00
ca95cbe0b4
Add `with_muted` param to ChatController.index/2
2020-11-04 16:40:12 +04:00
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
2020-11-04 13:23:18 +01:00
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
1cfc3278c0
Poll View: Always return `voters_count`.
2020-11-04 10:14:00 +01:00
c37118e6f2
Conversations: A few refactors
2020-11-03 13:56:12 +01:00
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
2020-11-03 13:45:09 +01:00
53dd048590
Test the note is returned when fetching a single report
2020-11-02 15:49:07 -06:00
be52819a11
Hide chats from muted users
2020-11-02 17:51:54 +04:00
24ce324973
Merge branch 'bugfix/poll_replies_count' into 'develop'
...
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
2020-11-02 12:08:20 +00:00
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +00:00
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
2020-11-02 05:56:17 +01:00
feld
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
2020-10-31 17:03:40 +00:00
04f6b48ac1
Auth subsystem refactoring and tweaks.
...
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
2020-10-31 13:38:35 +03:00
8e41baff40
Add idempotency_key to the chat_message entity.
2020-10-31 05:50:59 +03:00
a2a7a1f2ff
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-31 00:17:33 +04:00
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
1a98476f48
Remove unused aliases
2020-10-30 18:42:43 +04:00
1042c30fa5
ConversationViewTest: fix test
2020-10-30 13:59:53 +01:00
0552a08dfd
ConversationControllerTest: fix test, fix formatting
2020-10-30 13:59:53 +01:00
9b93eef715
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
2020-10-30 13:59:53 +01:00
630eb0f939
ConversationViewTest: fix test #2
2020-10-30 12:58:51 +01:00
149589c842
ConversationViewTest: fix test
2020-10-30 12:58:51 +01:00
390a12d4c8
ConversationControllerTest: fix test
2020-10-30 12:58:51 +01:00
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-30 11:18:55 +00:00
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
2020-10-29 23:39:15 +00:00
feld
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
2020-10-29 21:06:15 +00:00
d83c2bd330
Add support for install via `file` and `build_url` params
2020-10-29 16:37:50 +04:00
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
2020-10-29 15:35:42 +04:00
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
2020-10-29 14:51:23 +04:00
ba50dc05a8
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# CHANGELOG.md
2020-10-28 19:03:40 +03:00
d2b140a525
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
2020-10-28 08:48:26 -05:00
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-28 15:33:36 +04:00
4f90077767
Fix warning
2020-10-28 15:32:44 +04:00
feld
1204aaa2e3
Merge branch 'feature/autofollowing' into 'develop'
...
autofollowing_nicknames
See merge request pleroma/pleroma!3087
2020-10-27 22:55:31 +00:00
d8d4bd15d0
Merge branch '2236-no-name' into 'develop'
...
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
2020-10-27 22:44:31 +00:00
feld
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 22:13:50 +00:00
f2b74f60f0
Merge branch 'develop' into feature/account-export
2020-10-27 15:16:22 -05:00
d28f72a55a
FrontStatic plug: excluded invalid url
2020-10-27 22:59:27 +03:00
cbe41408e4
phoenix_controller_render_duration is no longer available in telemetry of Phoenix 1.5+
2020-10-27 14:37:48 -05:00
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
291189357b
Merge branch 'develop' into feature/account-export
2020-10-27 12:54:33 -05:00
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
feld
5aff479951
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
2020-10-27 17:47:56 +00:00
feld
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 17:42:24 +00:00
03e306785b
Add an API endpoint to install a new frontend
2020-10-27 19:20:21 +04:00
04b7505c75
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
2020-10-26 17:50:34 +01:00
9542c5d0f4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
2020-10-26 16:30:48 +01:00
df61071422
Merge branch '2242-nsfw-case' into 'develop'
...
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
2020-10-23 19:39:42 +00:00
60e379ce0b
User: Correctly handle whitespace names.
2020-10-23 13:53:01 +02:00
feld
d6907e6e0c
Merge branch 'chore/elixir-1.11' into 'develop'
...
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
2020-10-22 20:33:52 +00:00
8d251096fe
SideEffects: Correctly handle chat messages sent to yourself
2020-10-22 12:22:08 +02:00
ef627b9391
fix module name
2020-10-22 12:04:23 +03:00
add26817e3
update changelog
2020-10-22 11:54:32 +03:00
44e5a57d1a
admin api: added user filters by `actor_types`
2020-10-22 11:53:28 +03:00
60663150b5
admin user search: added filter by `actor_type`
2020-10-22 11:53:28 +03:00
46b420aa60
need_confirmed -> unconfirmed
2020-10-22 11:50:49 +03:00
cf4f393794
added AdminApi.UserController
2020-10-22 11:50:49 +03:00
9ef46ce410
added 'unconfirmed' filter to admin/users
2020-10-22 11:50:49 +03:00
034ac43f3a
Fix credo warnings
2020-10-20 17:47:04 +04:00
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
2020-10-20 17:16:58 +04:00
c1976d5b19
Fix credo warnings
2020-10-19 18:14:49 +04:00
39fd4d7639
Transmogrifier: Downcase incoming Hashtags
...
Also, set sensitive to true if we have an nsfw hashtag present.
2020-10-19 15:40:50 +02:00
98f32cf820
Fix tests
2020-10-19 17:19:45 +04:00
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
2020-10-19 15:40:03 +04:00
18a91d85e5
Merge branch 'develop' into feature/local-only-scope
2020-10-19 15:31:56 +04:00
0495a07dc7
Merge branch '2239-mute-fixes' into 'develop'
...
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
2020-10-19 04:26:35 +00:00
524fb0e4c2
[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
...
Added tests and documentation.
2020-10-18 21:22:21 +03:00
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
049ece1ef3
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-17 13:12:39 +03:00
Mark Felder
1b8fd7e65a
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
2020-10-16 17:36:02 +00:00
aafdc975bd
federation_status: Add ApiSpec
2020-10-16 01:14:15 +02:00
3b5a7a6b14
federation_status: New endpoint showing unreachable instances
2020-10-16 01:14:04 +02:00
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-15 16:39:01 -05:00
2030ffd490
fix test
2020-10-15 22:31:52 +03:00
20e68b30f0
added generated `pleroma.env`
2020-10-15 22:28:26 +03:00
2a475622ee
Add Pleroma.Constants.as_local_public/0
2020-10-15 19:07:00 +04:00
4f79bbbc31
Add local-only statuses
2020-10-15 18:37:44 +04:00
3985c1b450
Fix warnings
2020-10-15 16:54:59 +04:00
7a2f100061
ActivityPub: Show own replies to muted users.
...
Aligns mute with block behavior.
2020-10-15 12:28:25 +02:00
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-14 12:33:24 -05:00
feld
2013705690
Merge branch 'feature/gen-magic' into 'develop'
...
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
2020-10-14 17:31:45 +00:00
9a85ec0da0
Merge branch 'refactor/locked_user_field' into 'develop'
...
Change user.locked field to user.is_locked
See merge request pleroma/pleroma!3077
2020-10-14 16:17:32 +00:00
ed61002815
Undo API breaking changes
2020-10-14 11:03:17 -05:00
b001237b79
Finish undoing API breakage
2020-10-14 10:44:18 -05:00
3242cfef20
Undo API breaking changes
2020-10-14 09:54:07 -05:00
dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
2020-10-13 22:01:27 -05:00
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-13 19:25:18 -05:00
b3d6cf9022
Merge remote-tracking branch 'upstream/develop' into block-behavior
2020-10-13 19:22:32 -05:00
c3112fd13a
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-10-13 19:20:00 -05:00
8b20c4d275
Missed tests
2020-10-13 16:15:28 -05:00
6734abcbd4
Add pagination for Mutes
2020-10-13 21:58:18 +04:00
f5d8af1db1
Move Consistency.FileLocation to ./test
...
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
2020-10-13 19:57:45 +02:00
09be8cb336
Credo
2020-10-13 12:49:43 -05:00
33f4f39b1c
Add pagination for Blocks
2020-10-13 21:39:41 +04:00
40f3cdc030
JPEG content_type must be image/jpeg
2020-10-13 10:37:24 -05:00
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
2020-10-13 09:54:53 -05:00
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
8bacdc3680
Change user.discoverable field to user.is_discoverable
2020-10-13 09:45:08 -05:00
9968b7efed
Change user.locked field to user.is_locked
2020-10-13 09:31:13 -05:00
4c4ea9a348
changes after rebase
2020-10-13 17:10:34 +03:00
5f2071c458
changes after rebase
2020-10-13 16:44:03 +03:00
bb111465a1
credo fix after rebase
2020-10-13 16:44:03 +03:00
7f5dbb0201
changes after rebase
2020-10-13 16:44:03 +03:00
b081080dd9
fixes after rebase
2020-10-13 16:44:02 +03:00
f679486540
rebase
2020-10-13 16:44:02 +03:00
c4c5caedd8
changes after rebase
2020-10-13 16:44:02 +03:00
c8418e2d1f
fix after rebase
2020-10-13 16:44:01 +03:00
b720ad2264
files consistency after rebase
2020-10-13 16:44:01 +03:00
c5efded5fd
files consistency for new files
2020-10-13 16:44:00 +03:00
207211a2b3
update files consistency after rebase
2020-10-13 16:44:00 +03:00
e33782455d
updates after rebase
2020-10-13 16:43:59 +03:00
9f4fe5485b
alias alphabetically order
2020-10-13 16:43:59 +03:00
3ef4e9d170
AdminSecretAuthenticationPlug module name
2020-10-13 16:43:58 +03:00
c497558d43
AuthenticationPlug module name
2020-10-13 16:43:58 +03:00
c1777e7479
BasicAuthDecoderPlug module name
2020-10-13 16:43:58 +03:00
66e0b0065b
Cache plug module name
2020-10-13 16:43:57 +03:00
c6baa811d6
EnsureAuthenticatedPlug module name
2020-10-13 16:43:57 +03:00
011525a3d1
EnsurePublicOrAuthenticatedPlug module name
2020-10-13 16:43:57 +03:00
8e301a4c37
EnsureUserKeyPlug module name
2020-10-13 16:43:56 +03:00
d6cb1a3b46
ExpectAuthenticatedCheckPlug module name
2020-10-13 16:43:56 +03:00
99e4ed21b1
ExpectPublicOrAuthenticatedCheckPlug module name
2020-10-13 16:43:56 +03:00
8c993c5f63
FederatingPlug module name
2020-10-13 16:43:55 +03:00
5cd7030076
IdempotencyPlug module name
2020-10-13 16:43:55 +03:00
e2332d92ce
LegacyAuthenticationPlug module name
2020-10-13 16:43:54 +03:00
96d320bdfe
OAuthPlug module name
2020-10-13 16:43:54 +03:00
a6d8cef33e
OAuthScopesPlug module name
2020-10-13 16:43:54 +03:00
15772fda57
PlugHelper module name
2020-10-13 16:43:53 +03:00
4b1863ca4e
RateLimiter module name
2020-10-13 16:43:53 +03:00
3be8ab5103
RemoteIp module name
2020-10-13 16:43:50 +03:00
4b4c0eef36
SessionAuthenticationPlug module name
2020-10-13 16:42:53 +03:00
8249b75761
SetFormatPlug module name
2020-10-13 16:42:53 +03:00
c97c7d982f
SetLocalePlug module name
2020-10-13 16:42:52 +03:00
f7614d4718
SetUserSessionIdPlug module name
2020-10-13 16:42:52 +03:00
ebd6dd7c53
UserEnabledPlug module name
2020-10-13 16:42:51 +03:00
61c609884c
UserFetcherPlug module name
2020-10-13 16:42:51 +03:00
1d16cd0c3d
UserIsAdminPlug module name
2020-10-13 16:42:50 +03:00
0374df1d12
other files consistency
2020-10-13 16:38:19 +03:00
7acf09beb8
more tests
2020-10-13 16:38:18 +03:00
103f3dcb9e
rich media parser ttl files consistency
2020-10-13 16:38:15 +03:00
7dffaef479
tests consistency
2020-10-13 16:35:09 +03:00
6bf85440b3
mix tasks consistency
2020-10-13 16:33:24 +03:00
83ae45b000
Preload `/api/pleroma/frontend_configurations`, fixes #1932
2020-10-12 18:49:37 -05:00
cb29769a22
Make User.confirm/1 and User.approve/1 idempotent
2020-10-12 16:42:59 -05:00
6ebec50df6
Refactor User.confirm/1, add more tests
2020-10-12 16:32:34 -05:00
9ddc292ca8
TwitterAPI: test pending approval user email
2020-10-12 15:25:14 -05:00
feld
03855f9789
Merge branch 'improve/instance-gen' into 'develop'
...
#2159 Support enabling upload filters during instance gen
See merge request pleroma/pleroma!3070
2020-10-12 17:24:24 +00:00
8539e386c3
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
6c61ef14c3
Support enabling upload filters during instance gen
2020-10-12 11:19:48 -05:00
521e965884
Registration tests
2020-10-11 21:38:01 -05:00
28005563f0
Send approval pending email during registration
2020-10-11 20:50:09 -05:00
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-11 22:34:48 +03:00
89c595b772
[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
2020-10-11 22:34:28 +03:00
7c2d0e378c
Blocks: make blockers_visible config work
2020-10-10 03:41:35 -05:00
d2364276a1
Blocks: always see your own posts
2020-10-10 01:58:48 -05:00
3ca98878d2
Deep link to the user account in AdminFE in account confirmation emails
2020-10-09 17:08:05 -05:00
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
9c672ecbb5
Remote Timeline: add Streaming support
2020-10-08 20:07:03 -05:00
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
2020-10-08 17:24:09 -05:00
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-08 15:44:48 -05:00
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
a702f9fb5b
Lint
2020-10-07 15:07:03 -05:00
6ee20eb328
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 19:32:42 +00:00
8bfc5d9a0c
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 19:32:09 +00:00
feld
d0eca5b125
Apply 2 suggestion(s) to 2 file(s)
2020-10-07 19:16:53 +00:00
8156940a49
Compatibility with phoenix_pubsub 2.0.0
2020-10-07 13:28:39 -05:00
570a406b7a
use Phoenix.ConnTest is deprecated
2020-10-07 10:31:08 -05:00
bc3db72403
Use ModerationLog instead of Logger
2020-10-07 18:35:29 +04:00
f1e4333dd7
Fix test
2020-10-07 18:35:28 +04:00
e4792ce76a
Do not limit admins
2020-10-07 18:35:27 +04:00
17562bf414
Move API endpoints to `/api/v1/pleroma/backups`
2020-10-07 18:35:27 +04:00
7c22c9afb4
Allow admins request user backups
2020-10-07 18:34:31 +04:00
7fdd81d000
Add "Your backup is ready" email
2020-10-07 18:34:30 +04:00
27bc121ec0
Require email
2020-10-07 18:34:30 +04:00
86ce4afd93
Improve backup urls
2020-10-07 18:34:29 +04:00
2c73bfe122
Add API endpoints for Backups
2020-10-07 18:34:29 +04:00
abdffc6b8c
Fix Credo warning
2020-10-07 18:34:29 +04:00
739cb1463b
Add backups deletion
2020-10-07 18:34:29 +04:00
3ad7492f9d
Add config for Pleroma.Backup
2020-10-07 18:34:29 +04:00
a0ad9bd734
Add BackupWorker
2020-10-07 18:34:28 +04:00
4f3a633745
Add `backups` table
2020-10-07 18:34:28 +04:00
75e07ba206
Fix tests
2020-10-07 18:34:28 +04:00
be42ab70dc
Add backup upload
2020-10-07 18:34:28 +04:00
c82f912959
Fix credo warning
2020-10-07 18:34:27 +04:00
c01a818048
Add tests
2020-10-07 18:34:27 +04:00
9783e9cd80
Add test for an entry without CIDR format
2020-10-06 17:08:26 -05:00
d43d05005a
Move hardcoded default configuration into config.exs
2020-10-06 17:02:46 -05:00
cddca85c84
Merge branch 'develop' into revert/rich-media-censorship
2020-10-06 14:25:20 -05:00
2698bbc9f6
Merge branch 'filtering-following' into 'develop'
...
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
2020-10-06 18:11:34 +00:00
6c2264af24
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-05 23:50:08 +03:00
094edde7c4
[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
2020-10-05 23:48:00 +03:00
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
f6024252ae
[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
2020-10-02 22:18:02 +03:00
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
aa170caa76
Merge branch 'issue/2170' into 'develop'
...
[#2170 ] Can't remove dead relay
See merge request pleroma/pleroma!3041
2020-09-29 14:37:49 +00:00
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
2020-09-28 18:22:59 -05:00
7bc561127d
Revert citext user URI migration
...
URI paths are not actually case-insesitive, which caused migration issues
on a number of databases.
Closes #2188
2020-09-28 18:34:03 +03:00
de993b856b
added `force` option to the unfollow operation
2020-09-28 09:16:42 +03:00
4e4f771082
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
...
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
2020-09-26 19:32:16 +03:00
d1c724ef34
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 13:08:33 -05:00
93b674b66d
Fix test failures for NoOpPolicy describe/0
2020-09-25 12:46:49 -05:00
4a30598b9e
Config settings leak and break configdb migration tests when async
2020-09-25 12:20:52 -05:00
dcdf75fbac
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 11:45:51 -05:00
feld
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
2020-09-25 16:15:01 +00:00
2bf2c68dee
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 10:48:01 -05:00
5cd71208d9
Merge branch 'search-even-more' into 'develop'
...
More user search improvements
See merge request pleroma/pleroma!3032
2020-09-25 12:56:21 +00:00
f67c967c4a
Merge branch 'features/incoming-create-exists' into 'develop'
...
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
2020-09-25 12:44:33 +00:00
1e0f3f8514
User search: Make uri matches case insensitive.
2020-09-25 08:56:58 +02:00
a8c17ea25a
User Search: Also find user by uri
2020-09-25 08:46:14 +02:00
3bf3db39f5
Validate emails are sent to the appropriate unconfirmed actors
2020-09-24 18:24:44 -05:00
d0078bc404
User Search: Boost resolved results and exact ap_id matches.
2020-09-24 15:54:55 +02:00
151df9fc17
Merge branch 'fix/test-fix' into 'develop'
...
Fix for test on mac
See merge request pleroma/pleroma!3027
2020-09-24 09:50:39 +00:00
47cd59342f
Merge branch 'smol-test' into 'develop'
...
CommonAPI test: Add test for polls
See merge request pleroma/pleroma!3028
2020-09-24 09:41:28 +00:00
35d62a4a56
CommonAPI test: Add test for polls
2020-09-24 11:12:03 +02:00
165961f56d
don't run in async mode
2020-09-24 12:00:39 +03:00
aa1f97a5b6
fix for test on mac
2020-09-24 10:46:09 +03:00
727a0556a9
fix
2020-09-24 09:47:23 +03:00
5d7ec00bed
fixes after rebase
2020-09-24 09:42:30 +03:00
8c6ec4c111
pack routes change
2020-09-24 09:16:14 +03:00
dbbc801667
pagination for remote emoji packs
2020-09-24 09:12:39 +03:00
9b6d89ff8c
support for special chars in pack name
2020-09-24 09:12:37 +03:00
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
e02101e15c
Merge branch 'issue/2115' into 'develop'
...
[#2115 ] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
2020-09-23 12:09:38 +00:00
4dadb7c433
Merge branch 'user-query/filter-out-internal' into 'develop'
...
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
2020-09-23 11:51:04 +00:00
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 11:49:19 +00:00
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
2020-09-23 13:40:45 +02:00
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 09:16:00 +00:00
8e4f043ac7
finland-emojis.zip -> emojis.zip
2020-09-22 21:58:30 +03:00
72d2b34d3b
Merge branch 'develop' into issue/1975
2020-09-22 21:42:10 +03:00
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
2020-09-22 13:37:02 -05:00
88653c01c9
Add test for check_activity_expiration_config/0
2020-09-22 11:34:51 -05:00
7775b1540f
Add deprecation warning test for check_hellthread_threshold/0
2020-09-22 11:22:15 -05:00
25bdf0d0d9
Add test for welcome message format
2020-09-22 11:19:29 -05:00
e2dcf039d2
Fix gun_pool_options deprecation warning message
2020-09-22 11:15:40 -05:00
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
2020-09-22 17:13:46 +02:00
0e0ece251a
Filter out internal users by default
2020-09-22 16:56:11 +04:00
ee3052a2d8
ActivityPub: Return Announces when filtering by `following`.
2020-09-22 14:20:19 +02:00
bf181ca968
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()
2020-09-21 16:03:22 -05:00
0b728ccc44
Pass hackney tls config into email tests, #2101
2020-09-21 15:26:10 -05:00
9108e27c2f
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
...
[#2074 ] OAuth scope checking in Streaming API
Closes #2074
See merge request pleroma/pleroma!3013
2020-09-21 17:15:54 +00:00
b36b6259d8
Merge branch 'issue/2099' into 'develop'
...
[#2099 ] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
2020-09-21 16:25:17 +00:00
f2f0a0260f
ActivityPub: Don't block-filter your own posts
...
We are filtering out replies to people you block, but that should
not include your own posts.
2020-09-21 16:08:38 +02:00
28d0986f83
Refactor mutes removing in CommonAPI and User
2020-09-20 20:58:17 +03:00
4987ee6256
Merge branch 'develop' into feature/expire-mutes
2020-09-20 19:27:27 +03:00
60b025b782
[ #2074 ] OAuth scope checking in Streaming API.
2020-09-19 19:16:55 +03:00
ed3bc53fa1
Merge branch 'develop' into issue/2099
2020-09-18 22:13:05 +03:00
feld
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
7e02f4ed3b
Merge branch 'feature/2118-web-push-encryption-http' into 'develop'
...
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
Closes #2118
See merge request pleroma/pleroma!3008
2020-09-18 12:25:10 +00:00
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
2ec0dcf001
Merge branch 'develop' into issue/2099
2020-09-18 07:08:37 +03:00
226fa3e486
Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter
2020-09-17 22:10:55 +02:00
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
2020-09-17 22:22:59 +03:00
7bf269fe83
Fix MRF reject for ChatMessage
2020-09-17 22:07:54 +03:00
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
2020-09-17 22:07:54 +03:00
beefc022dd
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
...
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
2020-09-17 17:59:38 +00:00
feld
608824b97e
Merge branch 'instance-docs' into 'develop'
...
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
2020-09-17 16:54:53 +00:00
608017b7df
Merge branch 'fix/streaming-termination-errors' into 'develop'
...
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
2020-09-17 19:50:51 +03:00
0465bdbd49
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
2020-09-17 19:50:23 +03:00
bb70b231d0
Merge branch 'reply-visibility-user-guard' into 'develop'
...
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999
2020-09-17 19:49:08 +03:00
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
2020-09-17 19:48:33 +03:00
9d77f4abf8
adapt to new user factory behavior
2020-09-17 12:32:40 -04:00
dfc621a529
add test and changelog entry
2020-09-17 12:18:07 -04:00
41939e3175
User search respect discoverable flag
2020-09-17 12:15:50 -04:00
dee4639dbb
Merge branch 'feat/rich-media-head' into 'develop'
...
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
2020-09-17 19:04:50 +03:00
f7e40f7ef1
Deny ConfigDB migration when deprecated settings found
2020-09-17 09:32:50 -05:00
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-17 17:14:20 +03:00
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
...
# Conflicts:
# CHANGELOG.md
2020-09-17 14:09:01 +00:00
c711a2b157
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
2020-09-17 16:55:53 +03:00
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
2020-09-17 16:48:07 +03:00
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
2020-09-17 14:54:00 +03:00
5e3c70afa5
AdminAPI Chat tests: Remove factory.
...
The factory system doesn't work too well with how the chats are
done. Instead of tempting people to use it, let's rather use the
CommonAPI system for now.
2020-09-17 13:37:25 +02:00
e39ff2616b
Admin chat api tests: Small additions.
2020-09-17 13:29:26 +02:00
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
2020-09-17 13:26:04 +02:00
b867f9d7ae
Merge branch 'develop' into issue/2099
2020-09-17 08:41:35 +03:00
73e0e6a8a2
Remove unused import
2020-09-16 10:56:42 -05:00
7a88b726bf
User: Remote users don't need to be confirmed or approved
2020-09-16 17:29:16 +02:00
eca8d26784
Merge branch 'chores/mrf-loglevel' into 'develop'
...
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
2020-09-16 13:37:04 +00:00
adbd0032fa
Merge branch 'features/validators-video' into 'develop'
...
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
2020-09-16 13:36:27 +00:00
6b088ed76a
Merge branch 'issue/2089' into 'develop'
...
[#2089 ] fix notifications
See merge request pleroma/pleroma!3000
2020-09-16 12:22:48 +00:00
599f8bb152
RepoStreamer.chunk_stream -> Repo.chunk_stream
2020-09-16 09:47:18 +03:00
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-15 20:29:39 +03:00
f879d07fa1
fixed tests
2020-09-15 15:32:49 +03:00
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
2020-09-15 13:00:56 +03:00
5c4ff5c73c
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
2020-09-15 08:25:10 +00:00
f900a40d5d
fix credo warning
2020-09-14 13:55:49 -04:00
38b2db297b
search indexing metadata respects discoverable flag
2020-09-14 13:18:11 -04:00
d31f0393bf
Validate Welcome Chat message works with Simple policy applied to local instance
2020-09-14 12:06:08 -05:00
738685a629
Apply 1 suggestion(s) to 1 file(s)
2020-09-14 11:56:00 +00:00
f70335002d
RichMedia: Do a HEAD request to check content type/length
...
This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).
2020-09-14 14:45:58 +03:00
c5830ac037
Merge develop
2020-09-13 12:24:57 +03:00
c4061f06ba
Merge branch 'chat-moderation-stable' into chat-moderation
2020-09-11 14:30:28 -05:00
bc86d0a906
Chat moderation: fix formatting
2020-09-11 14:29:56 -05:00
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
dfb831ca39
Chat moderation: add tests for unauthorized access
2020-09-11 14:11:07 -05:00
e229536e5c
Chat Moderation: use explicit `sender` and `recipient` fields
2020-09-11 14:11:00 -05:00
67726453f8
Credo fix
2020-09-11 14:10:52 -05:00
02d70228b5
AdminAPI: fix delete chat message
2020-09-11 14:10:35 -05:00
9dd0b23da4
AdminAPI: show chat
2020-09-11 14:10:28 -05:00
f13b52a703
AdminAPI: list messages in a chat
2020-09-11 14:10:19 -05:00
fb0de07343
AdminAPI: list chats for a user
2020-09-11 14:10:05 -05:00
b40a627ab0
AdminAPI: delete a chat message
2020-09-11 14:09:58 -05:00
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
2020-09-11 14:09:50 -05:00
f1f44069ae
Fetcher: Correctly return MRF reject reason
2020-09-11 20:00:41 +02:00
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
2020-09-11 17:19:58 +03:00
dbc013f24c
instance: Handle not getting a favicon
2020-09-11 11:37:46 +02:00
1b3d5956b1
Pipeline Ingestion: Article
2020-09-11 01:40:20 +02:00
846b59ccb0
Pipeline Ingestion: Video
2020-09-11 01:39:39 +02:00
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
15aece7238
remove validate_expires_at from enqueue method
2020-09-10 21:52:31 +03:00
2c2094d4b2
configurable lifetime for ephemeral activities
2020-09-10 21:51:59 +03:00
eb5ff715f7
pin/unpin for activities with expires_at option
2020-09-10 21:50:41 +03:00
93e1c8df9d
reject activity creation
...
if passed expires_at option and expiring activities are not configured
2020-09-10 21:50:41 +03:00
de4c935071
don't expire pinned posts
2020-09-10 21:50:41 +03:00
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
0254696e30
Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'
...
Feature/1790 removing expired tokens through Oban scheduled jobs
See merge request pleroma/pleroma!2957
2020-09-10 18:45:04 +00:00
541a3eede2
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
...
Remove OStatus in testsuite
See merge request pleroma/pleroma!2968
2020-09-10 18:41:00 +00:00
275602daa7
Streaming integration tests: remove unexpected error assumption
...
For some reason instead of fixing unexpected errors, we made tests
assert they indeed trigger... Now that the errors are fixed these were
failing
2020-09-10 21:28:47 +03:00
7dd986a563
expire mfa tokens through Oban
2020-09-10 16:01:19 +03:00
3ce658b930
schedule expired oauth tokens deletion with Oban
2020-09-10 16:01:19 +03:00
9853c90abb
added paginate links to headers for /chats/:id/messages
2020-09-10 12:39:29 +03:00
68a74d6659
[ #2497 ] Added missing alias, removed legacy `:adapter` option specification for HTTP.get/_.
2020-09-09 19:30:42 +03:00
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
2020-09-09 11:11:36 -05:00
b900c06d4e
Add tests for the bulk confirm/unconfirm tasks
2020-09-09 09:02:07 -05:00
6c79a60649
Add test for pleroma.user set --confirmed
...
Order now matters because of testing shell_info
2020-09-09 08:44:01 -05:00
0d2814ec8e
Metadata: Move restriction check from Feed provider to activated_providers
2020-09-08 20:21:34 +03:00
a85ed6defb
Do not serve RSS/Atom feeds when instance is private
2020-09-08 20:21:34 +03:00
44ced17634
Fix test so setting doesn't leak
2020-09-08 20:21:34 +03:00
ff07014b26
Disable providers of user and status metadata when instance is private
2020-09-08 20:21:34 +03:00
10ef532c63
AP C2S: Restrict character limit on Note
2020-09-08 20:21:34 +03:00
073f5490ec
Merge branch 'bugfix/mock' into 'develop'
...
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
2020-09-08 19:46:23 +03:00
7490b76bbf
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
2020-09-08 19:45:44 +03:00
921f926e96
Remove OStatus in testsuite
2020-09-08 18:43:57 +02:00
ee0e05f930
Drop unused "inReplyToAtomUri" in objects
2020-09-08 18:43:57 +02:00
fd7e9bdd25
don't run async tests, which use Mock
2020-09-08 17:40:23 +02:00
feld
bf048ab72f
Merge branch 'develop' into 'develop'
...
ForceBotUnlistedPolicy
See merge request pleroma/pleroma!2967
2020-09-08 14:52:51 +00:00
f6723dc9bd
account_view_test: Remove empty test
2020-09-08 16:33:22 +02:00
788dececff
test: remove extraneous :instances_favicons config bits
2020-09-08 16:32:54 +02:00
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
2020-09-08 09:31:26 -05:00
0a05670b44
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
2020-09-08 12:21:33 +00:00
880a92ccc7
Merge branch 'develop' into feature/expire-mutes
2020-09-08 15:16:43 +03:00
e3f845b243
Add expiring mutes for activities
2020-09-08 15:13:50 +03:00
ce3474f4d3
Disable favicon scraping in tests
2020-09-08 15:09:10 +03:00
f6b250fb8d
Add test for expiring mutes
2020-09-08 14:11:00 +03:00
9b85592b8b
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-08 13:56:42 +03:00
964bc8e2e8
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
2020-09-08 13:55:52 +03:00
feld
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-08 13:53:47 +03:00
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-08 13:53:16 +03:00
c56e3d4f3b
Add expires_in param for account mutes
2020-09-08 13:26:44 +03:00
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-08 13:00:49 +03:00
8c3241df44
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-08 13:00:15 +03:00
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
2020-09-08 12:55:30 +03:00
84acfab156
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
2020-09-08 12:53:02 +03:00
718c7cc847
Merge branch 'fix/apc2s-limits' into 'develop'
...
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
2020-09-08 12:51:38 +03:00
4ea07f74e9
Revert/simplify.
...
We only need to check the content-type. There's no chance a webp file
will get mismatched as another image type.
2020-09-08 12:29:38 +03:00
216c84a8f4
Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.
2020-09-08 12:29:38 +03:00
3a98960c26
Verify webp files are not processed with exiftool
2020-09-08 12:29:38 +03:00
2165a24974
Improve upload filter return values so we can identify when filters make no changes to the input
2020-09-08 12:29:38 +03:00
d074e54013
ForceBotUnlistedPolicy: try to fix test 2
2020-09-07 23:28:29 +02:00
0a25c92cfa
ForceBotUnlistedPolicy: try to fix test
2020-09-07 23:18:36 +02:00
d2fd1d3481
ForceBotUnlistedPolicy: fix test extension
2020-09-07 23:04:07 +02:00
8b695c3eeb
ForceBotUnlistedPolicy: format
2020-09-07 22:53:45 +02:00
57cf0cc3b3
ForceBotUnlistedPolicy: add test
2020-09-07 22:50:57 +02:00
18d21aed00
deprecation warnings
2020-09-07 19:59:17 +03:00
696bf09433
passing adapter options directly without adapter key
2020-09-07 19:59:17 +03:00
ee67c98e55
removing Stats worker from Oban cron jobs
2020-09-07 19:16:14 +03:00
d5c286b802
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
2020-09-07 11:12:30 +00:00
fdab01ab56
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-07 10:19:19 +00:00
08aef7dd4e
instance: Log catch favicon errors as warnings
2020-09-07 08:40:52 +02:00
917d325972
added api spec
2020-09-07 07:17:30 +03:00
5ae56aafb2
added import mutes
2020-09-06 21:42:51 +03:00
759f8bc3ae
[ #2497 ] Fixed MediaProxyWarmingPolicyTest.
2020-09-06 15:30:11 +03:00
170599c390
RichMedia: do not log webpages missing metadata as errors
...
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
2020-09-05 22:05:35 +03:00
e198ba492e
Rich Media: Do not cache URLs for preview statuses
...
Closes #1987
2020-09-05 20:53:46 +03:00
c3b02341bf
[ #2497 ] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
2020-09-05 16:16:35 +03:00
85446cc30c
Merge branch 'develop' into media-preview-proxy
2020-09-03 10:34:06 -05:00
9433311923
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
...
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
2020-09-03 11:50:30 +00:00
5da3677607
Frontend mix task: Add tests.
2020-09-03 11:40:17 +02:00
feld
d1a6f67b1d
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-02 17:11:24 +00:00
119e11f455
Merge branch 'bugfix/mastoapi-lists' into 'develop'
...
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
2020-09-02 17:03:45 +00:00
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
2020-09-02 09:09:13 -05:00
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-02 09:38:43 +00:00
b2d776d77d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-02 09:36:56 +00:00
79f65b4374
correct pool and uniform headers format
2020-09-02 09:16:51 +03:00
868057871a
search: fix 'following' query parameter
...
The parameter included the accounts that are following you (followers)
instead of those you are actually following.
Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
2020-09-02 02:08:43 +02:00
03d06062ab
don't fail on url fetch
2020-09-01 19:39:07 +03:00
d872858046
Fix removing an account from a list
...
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
2020-09-01 12:49:32 +02:00
126461942b
User table: ensure bio is always a string
...
Gets rid of '|| ""' in multiple places and fixes #2067
2020-09-01 10:45:42 +03:00
0d5088c2b8
remove `unread_conversation_count` from User
2020-09-01 09:37:08 +03:00
a142da3e4f
Add new Emoji Ecto.Type and fix emoji in Question
2020-09-01 08:34:57 +02:00
9d63b2c9db
Merge branch 'chat-relation-constraints' into 'develop'
...
Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934
2020-08-31 20:55:05 +00:00
0b621a834a
Chats: Add cascading delete on both referenced users.
...
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
2020-08-31 16:48:17 +02:00
3737f38432
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-30 11:28:45 -05:00
f0fefc4f5c
marks notifications as read after mute
2020-08-28 18:17:44 +03:00
6b01a09a08
Merge branch '2078-list-fixes' into 'develop'
...
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
2020-08-27 17:05:53 +00:00
78939c1d16
ChatController: Don't die if the recipient is gone.
2020-08-27 12:13:18 +02:00
2cfe2dc81b
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-26 16:37:57 -05:00
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
2020-08-26 15:37:30 +02:00
feld
fb33321fa2
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
...
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
2020-08-25 21:32:32 +00:00
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
112bec5225
Webfinger: Handle bogus ids better.
2020-08-25 17:35:59 +02:00
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
feld
d39abd02ac
Merge branch 'relay-fix-admin-fe' into 'develop'
...
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
2020-08-24 17:03:18 +00:00
14ec12ac95
added tests
2020-08-24 15:01:45 +03:00
f5845ff033
upload emoji zip file
2020-08-22 10:42:02 +03:00
e1c8c599ff
Merge branch 'features/validators-event' into 'develop'
...
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
2020-08-21 16:10:30 +00:00
1f8c32b773
adding actor type in user show
2020-08-21 10:38:56 +03:00
36c125a071
Pipeline Ingestion: Event
2020-08-20 21:49:26 +02:00
c1277be041
AudioHandlingTest: Make mock explicit
2020-08-19 14:36:42 +02:00
9aae342e7a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2
2020-08-19 14:10:11 +02:00
c68bcae362
fix for sometimes failing tests
2020-08-19 12:57:29 +03:00
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
7794d7c694
added Pleroma.Web.PleromaAPI.EmojiFileController
2020-08-19 06:50:20 +03:00
5316e231b0
Pipeline Ingestion: Audio (Part 2)
2020-08-19 00:06:31 +02:00
3d5d8c05c9
Merge branch '2064-image-blanking' into 'develop'
...
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
2020-08-18 19:02:33 +00:00
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
2020-08-18 18:23:27 +03:00
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-08-18 18:02:09 +03:00
f0a8d723bb
Transmogrifier Test: Extract audio tests.
2020-08-18 13:37:28 +02:00
aabc26a573
Pleroma.Upload: Set default upload name / description based on config.
2020-08-18 13:21:30 +02:00
a0f5eb1a55
Test that `POST /api/pleroma/delete_account` purges the user
2020-08-18 00:24:28 -05:00
dcc8926ff1
Test purging a user with User.delete/1
2020-08-18 00:10:09 -05:00
c12c576ee2
Also purge bio and display name
2020-08-17 22:11:45 -05:00
d55faa2f8f
Purge a local user upon deletion, fixes #2062
2020-08-17 21:52:28 -05:00
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
2020-08-17 13:05:20 +00:00
25c69e271a
Make notifications about new statuses from muted threads read
2020-08-17 00:11:33 +02:00
f6da12f45d
fix search media proxy urls
2020-08-16 06:54:48 +03:00
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
2020-08-15 18:30:20 +03:00
0865f36965
Mark notifications about statuses from muted users as read automatically
2020-08-15 15:27:41 +02:00
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
2020-08-14 20:55:45 +03:00
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
f99b8a25eb
Merge branch 'reject' into 'develop'
...
Move Accepts and Rejects to the Pipeline
See merge request pleroma/pleroma!2878
2020-08-13 16:04:43 +00:00
5be25b3e38
Merge branch '1152-deletion' into 'develop'
...
User deletion issue exploration
See merge request pleroma/pleroma!2879
2020-08-13 09:06:33 +00:00
56470647de
Merge branch 'develop' into issue/1936
2020-08-13 09:00:25 +03:00
Haelwenn
feld