6b793d3f83
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
5 years ago
29ab1d9f8d
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
69fc1dd69f
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
0c60c0a76a
Validators: Use correct type for IDs.
5 years ago
0adaab8e75
Bump copyright dates.
5 years ago
eaacc64839
Refactors.
5 years ago
ee979dd6d7
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
d7aa0b645b
Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
5 years ago
4cf1007a7d
ActivityPub: Small refactor.
5 years ago
112101ca52
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
...
# Conflicts:
# lib/pleroma/thread_mute.ex
5 years ago
af820f8cf1
Merge branch 'benchmark_timeline' into 'develop'
...
Benchmarks: Add timeline benchmark
See merge request pleroma/pleroma!2325
5 years ago
460e41585c
Further preloading (more endpoints), refactoring, tests.
5 years ago
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
5 years ago
3fa3d45dbe
[ #1364 ] Minor improvements / comments.
...
Further fixes of incorrect usage of "relations" as a short form of "relationships".
5 years ago
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
5 years ago
212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
5 years ago
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
5 years ago
8eebc75c15
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
5 years ago
f316882464
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
aaf00f1ff5
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
5 years ago
74560e888e
Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
5 years ago
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
5 years ago
4a2538967c
Support pagination in conversations
5 years ago
d1a9716a98
Fix activity deletion
5 years ago
fbf02a3722
Merge branch 'bugfix/profile-bio-newline' into 'develop'
...
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
5 years ago
3bd2829e5c
Benchmarks: Add timeline benchmark
5 years ago
86f2fbc81e
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
5 years ago
5a34dca8ed
Add emoji support in statuses in staticfe
5 years ago
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
5 years ago
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
5 years ago
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
5 years ago
981e015f1b
Mastodon API Account view: Remove an outdated hack
...
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
5 years ago
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
d74405fc1a
Merge branch 'fix-feed-pagination' into 'develop'
...
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
5 years ago
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
5 years ago
fe15f0ba15
restrict_unauthenticated setting
5 years ago
98a60df41f
include_types parameter in /api/v1/notifications
5 years ago
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
5 years ago
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
5 years ago
9b9d67bbec
Fix linting.
5 years ago
3c2c32b460
Merge branch 'remake-remodel' into develop
5 years ago
7d275970ab
Add emoji reactions to features in nodeinfo
5 years ago
f9d622d25a
WIP
5 years ago
f9ecb513fa
Merge branch 'develop' into gun
5 years ago
7438833685
[ #1364 ] Improved notification-related tests.
5 years ago
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
5 years ago
d198e7fa2a
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
5 years ago
f3791add99
removing with_move parameter
5 years ago
0e07c5ef57
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
5 years ago
bf474ca3c1
fix
5 years ago
35471205f8
temp fix for `:gun.info` MatchError
5 years ago
f0651730bd
Merge branch 'develop' into gun
5 years ago
89e4b3ebbd
fix for content-type header for tag feed
5 years ago
91870c8995
adding rss for user feed
5 years ago
26e2076659
fix for feed page pagination
5 years ago
8176ca9e40
static_fe: Sanitize HTML in users
5 years ago
0ac6e29654
static_fe: Sanitize HTML in posts
...
Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\">
5 years ago
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
5 years ago
7c8003c3fc
[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
5 years ago
d84670b9e1
Merge branch 'f' into 'develop'
...
rip out fetch_initial_posts
Closes #1422 and #1595
See merge request pleroma/pleroma!2297
5 years ago
67a27825b1
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
...
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
Closes #1620
See merge request pleroma/pleroma!2296
5 years ago
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
5 years ago
8f7bc07ebc
pleroma_api_controller.ex: Improve conversations error reporting
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
5 years ago
ecb7809e92
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
5 years ago
d88c8a9614
Merge branch 'fix/cache-control-headers' into 'develop'
...
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
5 years ago
6a28c198af
uploaded media plug: do not inject compile-time params on every request
5 years ago
38f796a5c6
Merge branch 'feature/mastofe-admin-scope' into 'develop'
...
auth_controller.ex: Add admin scope to MastoFE
See merge request pleroma/pleroma!2256
5 years ago
994ac4357c
Merge branch 'fix/hashtags-streaming' into 'develop'
...
Fix hashtags WebSocket streaming
Closes #1593
See merge request pleroma/pleroma!2294
5 years ago
658f30c0b3
Merge branch 'static-accept-missing' into 'develop'
...
Fix static FE plug to handle missing Accept header.
See merge request pleroma/pleroma!2260
5 years ago
fc4496d4fa
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
5 years ago
3e0f05f08e
Merge branch 'bugfix/br-vs-newline' into 'develop'
...
Formatting: Do not use \n and prefer <br> instead
Closes #1374 and #1375
See merge request pleroma/pleroma!2204
5 years ago
c6eb1c1b92
Merge branch 'develop' into fix/cache-control-headers
5 years ago
7321429a2e
Lint
5 years ago
3b1b183b42
Synchronize cache-control header for local media with the mediaproxy
5 years ago
413177c8f0
Set correct Cache-Control header for local media
5 years ago
c62195127d
Update comment to reflect what the code is actually doing
5 years ago
ad31d0726a
Do not trust remote Cache-Control headers for mediaproxy
5 years ago
096c5c52e0
Merge branch 'revert/cache-control' into 'develop'
...
Revert "Set better Cache-Control header for static content"
Closes #1613
See merge request pleroma/pleroma!2290
5 years ago
fffc382f13
Fix hashtags WebSocket streaming
5 years ago
d1379c4de8
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
5 years ago
98ed0d1c4b
more clean up
5 years ago
802b991814
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
...
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
5 years ago
39ed608b13
Merge branch 'develop' into gun
5 years ago
1306b92997
clean up
5 years ago
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
5 years ago
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
5 years ago
7cdabdc0df
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
...
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
5 years ago
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
5 years ago
c3b9fbd3a7
Revert "Set better Cache-Control header for static content"
...
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.
Closes #1613
5 years ago
fce090c1de
using Pleroma.Config instead of ets
5 years ago
193d67cde5
compile fix
5 years ago
282a93554f
merging release default config on app start
5 years ago
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
5 years ago
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
5 years ago
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
5af798f246
Fix enforcement of character limits
5 years ago
f39e1b9eff
add verify tls_opts only when we open connection
...
for other requests tesla will add tls_opts
5 years ago
426f5ee48a
tesla adapter can't be changed in adminFE
5 years ago
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
d9f8941dac
Merge branch 'develop' into gun
5 years ago
edb659dc57
Merge branch 'develop' into issue/1276
5 years ago
6cf1958b02
moderation log: fix improperly migrated data
...
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
5 years ago
474ef512df
wait in mix task while pleroma is rebooted
5 years ago
b2eb1124d1
Merge branch 'develop' into gun
5 years ago
6d797b9928
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
...
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
5 years ago
5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
5 years ago
78282dc983
little polishing
5 years ago
c93c3096d5
little refactor
5 years ago
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
5 years ago
058c9b01ac
returning, not needed
5 years ago
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
5 years ago
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
5 years ago
47604907c9
Merge branch 'proper_error_messages' into 'develop'
...
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
5 years ago
927079e2ff
Merge branch 'fix/stats-on-startup' into 'develop'
...
Generate instance stats on startup
Closes #1598
See merge request pleroma/pleroma!2271
5 years ago
eb324467d9
removing try block in getting gun info
5 years ago
cdb05633a6
Generate instance stats on startup
5 years ago
9b740cfb23
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
...
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
5 years ago
4bce13fa2f
MastodonController: Return 404 errors correctly.
5 years ago
d6bebd4f9c
moving some logic to tesla adapter
...
- checking original inside gun adapter
- flushing streams on max_body error
5 years ago
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
5 years ago
22d52f5691
same copyright date format
5 years ago
6b2fb9160c
otp version
5 years ago
d9c5ae7c09
Update Copyrights for gun related files
5 years ago
4427161ca3
Merge branch 'develop' into gun
5 years ago
05da5f5cca
Update Copyrights
5 years ago
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
5 years ago
884d9710b2
refactoring for gun api modules
5 years ago
f98ee730f0
adapter renaming to adapter_helper
5 years ago
8854770fc4
retry and retry_timeout settings default change
5 years ago
1ad34bfdba
no try block in checkout connection
5 years ago
24bf5c4e89
remove try block from pool request
5 years ago
aaa879ce75
proxy parsing errors
5 years ago
6ebf389d6e
poolboy timeout fix
5 years ago
8fc00b7cbf
return error if connection failed to open
5 years ago
7d68924e4f
naming
5 years ago
e605e79df9
simplification of formatting host method
...
case for format_proxy method
5 years ago
ee8071f0d5
removing unused method
5 years ago
05429730e4
unnecessary with
5 years ago
d0e4d3ca3b
removing unnecessary with
...
comment in tesla client impovement
5 years ago
24d1ac125c
hiding raise error logic to otp_version module
5 years ago
28ed4b41d0
naming for checkin from pool timeout
5 years ago
151dc4e387
Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
5 years ago
7eb6592992
Apply suggestion to lib/pleroma/pool/connections.ex
5 years ago
a21a66972f
Apply suggestion to lib/pleroma/http/http.ex
5 years ago
614e3934f9
Apply suggestion to lib/pleroma/http/http.ex
5 years ago
d30ff35d94
Apply suggestion to lib/pleroma/http/request_builder.ex
5 years ago
a3ad028973
Apply suggestion to lib/pleroma/http/adapter.ex
5 years ago
2c8d80dc0a
Apply suggestion to lib/pleroma/pool/connections.ex
5 years ago
097ad10d02
Apply suggestion to lib/pleroma/pool/connections.ex
5 years ago
4c8569d403
otp_version refactor
5 years ago
509c81e4b1
Merge branch 'develop' into gun
5 years ago
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
5 years ago
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
5 years ago
cc98d010ed
relay list shows hosts without accepted follow
5 years ago
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
5 years ago
d9e4b77f8b
Merge branch 'develop' into gun
5 years ago
400fbc7629
wait in mix task while pleroma is rebooted
5 years ago
34f1d09f3a
spec fix
5 years ago
ba87ed7335
fix for compiling
5 years ago
32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
523f73dccd
Fix static FE plug to handle missing Accept header.
5 years ago
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
5 years ago
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
4d416343fa
rate limiter: Fix a race condition
...
When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.
5 years ago
df2173343a
pagination: limit the number of elements returned at one time to 40
5 years ago
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
5 years ago
c747260989
[ #2250 ] Tiny refactoring per merge request review.
5 years ago
814b275af7
Merge branch 'develop' into gun
5 years ago
3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
5 years ago
3759b146c4
Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex
5 years ago
f2216287a7
Merge branch 'admin-status-list' into 'develop'
...
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192
5 years ago
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
5 years ago
cb60a9c42f
Do not fail when user has no email
5 years ago
4ab07cf0d5
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
5 years ago
e2a6a40367
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
5 years ago
f446744a6a
Allow account registration without an email
5 years ago
fda6f35a46
Merge branch 'feat/instance-gen-improvements' into 'develop'
...
small instance.gen task improvements
See merge request pleroma/pleroma!2245
5 years ago
3bbfebd1c2
instance.gen task: make example instance name less confusing
...
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
5 years ago
359faa8645
instance.gen task: remind to transfer the config to the database after
...
migrations
5 years ago
cfa28dee32
instance.gen task: make instance name default to the domain
5 years ago
22018adae6
Fix Dialyzer warnings
5 years ago
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
035c2c1415
Merge branch 'fix/instance-gen-custom-static' into 'develop'
...
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
5 years ago
5e4fe0e8f7
instance.gen task: fix crash when using custom static directory
...
Closes #1082
5 years ago
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
8efae966b1
open conn in separate task
5 years ago
81f29e7c6a
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
...
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
5 years ago
f9fe6a9e30
Captcha: return invalid when answer_data is nil
5 years ago
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
5 years ago
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
5 years ago
d44f9e3b6c
fix for timeout clause
5 years ago
f604f9e470
hackney pool timeout
5 years ago
6806df80dd
don't log info ssl messages
5 years ago
ad8f26c0a4
more info in Connections.checkin timout errors
5 years ago
a03c420b84
by default don't use gun retries
...
remove conn depends on retry setting from config
5 years ago
13918cb545
Merge branch 'develop' into gun
5 years ago
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
5 years ago
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
5 years ago
c69b04c490
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
...
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
5 years ago
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
5 years ago
3432294657
[ #1505 ] Fixed @spec for Queries.by_object_in_reply_to_id/3
5 years ago
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
c9db0507f8
removing retry option and changing some logger messages levels
5 years ago
7d73e7a09a
Spelling
5 years ago
cf94349287
Merge branch 'develop' into gun
5 years ago
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
5 years ago
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
5 years ago
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
5 years ago
2ef70b55f5
Fix `status.expires_at` type
5 years ago
514c899275
adding gun adapter
5 years ago
28701c08ad
Merge branch 'develop' into issue/1276
5 years ago
472132215e
Use floki's new APIs for parsing fragments
5 years ago
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
5 years ago
478619782b
Standardize @behaviour usage in MRFs
5 years ago
9906c6fb6f
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
...
NodeInfo: Fix federating status not being reported when MRF transparency is disabled
Closes #1568
See merge request pleroma/pleroma!2206
5 years ago
6f9839c73c
Merge branch 'develop' into issue/1276
5 years ago
23049a077e
NodeInfo: Fix federating status not being reported when MRF
...
transparency is disabled
Closes #1568
5 years ago
b312c36b8e
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
...
# Conflicts:
# config/description.exs
5 years ago
da44ee5b0f
Merge branch 'develop' into issue/1276
5 years ago
19516af74e
Fix `status.expires_in` validation
5 years ago
ff9fd4ca89
Fix the confusingly named and inverted logic of "no_attachment_links"
...
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
5 years ago
50d9fcbe29
Hotlink logo instead of attachment
5 years ago
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
5 years ago
ea1631d7e6
Make Floki use fast_html
5 years ago
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
58574ef156
Merge branch 'develop' into issue/1276
5 years ago
94e5ca1105
Merge branch 'issue/1383' into 'develop'
...
[#1383 ] Switch periodic jobs from quantum to oban
See merge request pleroma/pleroma!2015
5 years ago
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
c55301e760
Fix a compilation error under certain circumstances
...
I've noticed that sometimes when switching from develop to stable and back,
develop fails to compile and rm -r ing the _build and deps dirs doesn't
help at all.
This is due to Admin API controller needing to generate JSON description
of the config at compile time. Evaluating `config/description.exs`
calls `Generator.list_modules_in_dir/2`, which in turn predicts the
module names of files in the directory and tries to convert the
predicted name to *existing* atoms. Sometimes the compiler will
call that function before compiling the modules in the said directory,
so the conversion will of course fail.
This fixes it by removing the requirement of the atoms being existent.
The function is not subjected to any untrusted user input so this should
be safe. An ideal fix would be to block the compilation of docs before
all modules are compiled and then get a list of compiled elixir modules
under the namespace we want instead of directory hacks, but I have not
been able to figure out how to do that.
5 years ago
3830cb538b
removed a comments
5 years ago
cd040691bd
maked `unread_count` as virtual field
5 years ago
b87533760b
Merge branch 'develop' into issue/1276
5 years ago
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
5 years ago
6ea3c06d8d
[ #1505 ] Minor refactoring.
5 years ago
7c3991f59e
[ #1505 ] Fixed `replies` serialization (included objects' ids instead of activities' ids).
5 years ago
8fda6303ba
Fix email mix task on OTP releases
...
Closes pleroma#1548
5 years ago
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
5 years ago
964b4d82a0
Merge branch 'fix/upload-limit-otp' into 'develop'
...
Actually fix upload limit on OTP releases
Closes #1109
See merge request pleroma/pleroma!2185
5 years ago
dad23e3766
need_reboot flag
5 years ago
Ivan Tashkinov
