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
22018adae6
Fix Dialyzer warnings
5 years ago
10f452ad1f
Merge branch 'develop' into issue/1276
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
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
15ea75cd2a
Actually fix upload limit on OTP releases
...
Closes #1109
5 years ago
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
5 years ago
d85bcc8627
Questions: Add timezone to `closed` property
5 years ago
4538a1ee01
EmojiReactions: Remove old API endpoints
5 years ago
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
bc2e98b200
Add User.get_follow_state/2
5 years ago
8a79f20c21
EmojiReactions: Rename to EmojiReacts
5 years ago
df0b00b32d
Merge branch 'mastoapi-non-html-strings' into 'develop'
...
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
5 years ago
8b9742ecf5
Cancellation of a follow request for a remote user
5 years ago
c85aa6e87f
removing confusing error
5 years ago
15cb1f6804
Merge branch 'fix/unpinnable-polls' into 'develop'
...
fix not being able to pin polls
See merge request pleroma/pleroma!2172
5 years ago
72d767998c
Merge branch 'removing-admin-api-endpoint' into 'develop'
...
Removing migrate_from_db endpoint from admin api
See merge request pleroma/pleroma!2177
5 years ago
b21e59da5f
Merge branch 'remove-linker-scheme-option' into 'develop'
...
Remove AutoLinker `scheme` option from the config
See merge request pleroma/pleroma!2176
5 years ago
5db6ac8ee4
removing migrate_from_db endpoint from admin api
5 years ago
3909b5b7b3
Remove AutoLinker `scheme` option from the config
5 years ago
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
5 years ago
8c71f7e11a
Add support for cancellation of a follow request
5 years ago
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
2c40c8b4a2
Merge branch 'develop' into issue/1383
5 years ago
50f5a92021
fix not being able to pin polls
5 years ago
983a87175e
mastodon API: do not sanitize html in non-html fields
5 years ago
8057157ee3
Make attachments cleanup optional
5 years ago
c27d1d65bf
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
...
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
5 years ago
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
774cba84f5
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
...
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
5 years ago
a0d9d42eaa
Emoji Reactions: Actually use the validation.
5 years ago
e2f2602fdc
Merge branch 'emoji-api-errors' into 'develop'
...
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
5 years ago
df200ea7a4
Merge branch 'http-security-warning' into 'develop'
...
Warn if HTTPSecurityPlug is disabled
Closes #1528
See merge request pleroma/pleroma!2155
5 years ago
b3e9c87724
Update emoji_api_controller.ex
5 years ago
36becd5573
Update http_security_plug.ex
5 years ago
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
5 years ago
889965141a
RemoteIp: only trust X-Forwarded-For
...
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
5 years ago
946de2299c
Merge branch 'fix-streaming-reblog' into 'develop'
...
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
5 years ago
e07e7888d7
Fix credo warning
5 years ago
2bd4d6289b
Make the warning more scarier
5 years ago
e7fee0d6fa
emoji api error on not writable dir
5 years ago
b3a877d6c9
Emoji Reactions: Correctly handle deleted users
5 years ago
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
1f4fbe9d98
title parse improvement
5 years ago
ba5e8a6444
Merge branch 'develop' into issue/1276
5 years ago
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
cedee2793d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
5 years ago
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
5 years ago
2c121b2623
Merge branch 'fix/1524-link_preview' into 'develop'
...
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
5 years ago
7bd4c14581
meta tag parser respect first title header
5 years ago
d385789a45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
5 years ago
271935953a
Merge branch 'whole-db-removal' into 'develop'
...
Remove `whole_db` parameter everywhere, it's not used anymore
See merge request pleroma/pleroma!2152
5 years ago
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
5 years ago
77f24525ca
Streamer: Correctly handle reblog mutes
5 years ago
6302b40791
Warn if HTTPSecurityPlug is disabled
5 years ago
d9cb8acd3e
Merge branch 'fix/attachments-cleanup' into 'develop'
...
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
5 years ago
d18a2e4e36
Add test for custom base_url when deleting an attachment
5 years ago
804a702f97
Fix base_url string trimming
5 years ago
dea968463d
Add logging
5 years ago
46915207b6
Remove `whole_db` parameter everywhere, it's not used anymore
5 years ago
e3fae3380e
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
5 years ago
7f78bd7e37
Fix __MODULE__ usage
5 years ago
95afcae194
Merge branch 'support/update_ecto' into 'develop'
...
updated ecto and fixed warning
See merge request pleroma/pleroma!2150
5 years ago
4f004ab92e
Merge branch 'fix/attachments-cleanup' into 'develop'
...
Fix/attachments cleanup
See merge request pleroma/pleroma!2148
5 years ago
02c3dd2e3d
update ecto
5 years ago
eb4870e1cd
Remove unused var
5 years ago
52e08ec9fd
explicitly describe perform op in AttachmentsClenupWorker
5 years ago
bcffa662dc
Merge branch 'develop' into feature/tag_feed
5 years ago
dabd535e43
Remove user recommendation by third party engine
5 years ago
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
bfc70fdf29
Merge branch 'develop' into issue/1383
5 years ago
86c4b76bf0
Fix typo
5 years ago
36838b516f
Merge branch 'fix/runtime-config' into 'develop'
...
Fixes for runtime config
See merge request pleroma/pleroma!2143
5 years ago
d770cffce0
Merge branch 'develop' into issue/1280
5 years ago
e93cc561cd
restarting pleroma from outside application
5 years ago
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
5 years ago
de4102b247
can be changed in runtime
5 years ago
99c0a11c58
added atom feed
5 years ago
055edd3d72
Merge branch 'develop' into feature/tag_feed
5 years ago
8533b63d1f
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
...
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
5 years ago
0fceeb44b3
Merge branch 'emoji-reaction-sanity-check' into 'develop'
...
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
5 years ago
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
6a0f0ac4a2
fix for non existing atom
5 years ago
293281fcbd
Merge branch 'develop' into feature/tag_feed
5 years ago
6cd2e851d9
parsing Swoosh modules
5 years ago
8589632d09
fixed delete ScheduledActivity
5 years ago
34fc0ca053
Emoji reactions: Add sanity checks for the cache
5 years ago
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
5 years ago
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
ce7c887a27
removed try/rescue
5 years ago
6f77b77428
Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
5 years ago
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
5 years ago
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
5 years ago
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
cf96c40057
[ #1505 ] Added Mastodon-compatible `replies` collection to Note federated representation.
5 years ago
6e6f1ead31
Merge branch 'no-error-404' into 'develop'
...
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
5 years ago
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
7c0ac54437
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
5 years ago
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
5 years ago
b6f5b326e7
Fix credo warnings
5 years ago
aa0f0d4edd
Disable NewUsersDigestEmail by default
5 years ago
df0b8f1d08
Add new users digest email
5 years ago
34aa0c542b
Merge branch 'emoji-reaction-extensions-2' into 'develop'
...
Emoji Reactions: In the API, sort them by first emoji insertion date
See merge request pleroma/pleroma!2126
5 years ago
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
d5f8a88a37
support for updating env after settings deletion
5 years ago
32a643a159
Merge branch 'develop' into admin-be
5 years ago
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
5ea8596448
Merge branch 'develop' into feature/tag_feed
5 years ago
22e94bb2c7
Merge branch 'develop' into fix/attachments-cleanup
5 years ago
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
5 years ago
f01ab6cd29
some refactor and tests
5 years ago
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
5 years ago
503d966e9f
Merge branch 'develop' into admin-be
5 years ago
dcae5914d1
fix for db key
5 years ago
41e2332007
Merge branch 'develop' into feature/tag_feed
5 years ago
6e88a7e591
exclude blocked user posts from search results
5 years ago
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
5 years ago
8023fa48db
merge fix
5 years ago
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
5 years ago
42ea480e95
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
...
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
5 years ago
510776ba31
CommonAPI: Don't error out on double favs/repeats
5 years ago
c814f22030
Merge branch 'fix-admin-api-scope' into 'develop'
...
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
5 years ago
5fddf988ea
Pleroma API: `emoji_reactions_by` does not need authorization
5 years ago
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
5 years ago
5c533e10e7
Bump credo to 1.1.5
5 years ago
9367b70f37
Merge branch 'features/cleanup-incoming-actor' into 'develop'
...
transmogrifier.ex: simplify handle_incoming of actors
See merge request pleroma/pleroma!2114
5 years ago
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
5 years ago
cde828ff7d
Fix credo warning
5 years ago
d6a532bf0f
Delete attachments asynchronously
5 years ago
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
5 years ago
efb8ef5abe
releases support
5 years ago
e699861690
full update for some subkeys
5 years ago
81133702d4
Delete attachments after object and cache cleanup
5 years ago
89e93fb33f
return db key on update requests
5 years ago
7676ed8239
some clean up
5 years ago
108a39c876
updated error messages for authentication process
5 years ago
58e8963824
fix for config loader
5 years ago
60ba2339a2
saving to DB only added by user settings
5 years ago
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
5 years ago
a5db044e57
Merge branch 'develop' into feature/tag_feed
5 years ago
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
5 years ago
59ba5c80b9
little cleanup
5 years ago
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
76c1948880
[ #1478 ] Adjusted AdminAPIController admin subscope requirements.
5 years ago
c9f45edeac
Merge branch 'develop' into feature/tag_feed
5 years ago
0709757e47
Check if object->data is array when looking up attachment objects to delete
5 years ago
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
5 years ago
70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
88f0eed0f2
Delete attachments when status is deleted
5 years ago
8b4d81609d
Merge branch 'updated-at-on-conversation-read' into 'develop'
...
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
5 years ago
bb5862ea2f
Merge branch 'issue/1354' into 'develop'
...
[#1354 ] fix remote follow
See merge request pleroma/pleroma!2079
5 years ago
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
ea4a462858
Merge branch 'issue/1487' into 'develop'
...
[#1487 ] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
5 years ago
0c9c62509d
Remove MDII uploader
5 years ago
1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
d933fd3d61
more renamings
5 years ago
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
958d0452e4
fix for pleroma assets group update
5 years ago
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
05ca420c09
Merge branch 'issue/1490' into 'develop'
...
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
5 years ago
88a16bb9fc
deep merge in config update
5 years ago
c841174de8
flag for delete fix
5 years ago
0b02040327
little fixes and typos fix
5 years ago
9c1f3bfeff
fixes for logger backends
5 years ago
cda2c1fc63
fix for subgroup tuple
...
added settings for swoosh adapters local
5 years ago
063ab6d911
logger backends fix
5 years ago
583cee4607
parsing proxy url setting
5 years ago
a71393dd29
fix for endpoints after env update
5 years ago
fea734ca70
errors on endpoints
5 years ago
5cacb988b9
partially settings update
5 years ago
2753285b77
config editing through database
5 years ago
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
70410dfafd
fix create service actor
5 years ago
0b6d1292d2
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
5 years ago
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
933dc12043
added code of mr#2067
5 years ago
385356aad0
fix oauth scopes for AdminApi#reports_update
5 years ago
bdd71669da
update test
5 years ago
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
5 years ago
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
5 years ago
5b84156013
moved remote follow in separate controller
5 years ago
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
5 years ago
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
5 years ago
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
5 years ago
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
5 years ago
7bd0bca2ab
fixed remote follow
5 years ago
5fc84552d3
Fix all count
5 years ago
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
5 years ago
34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
775212121c
Verify HTTP signatures only when request accepts "activity+json" type
5 years ago
432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
404a9ccb9a
Stats: return status counts by scope
5 years ago
b53573a837
add tag feeds
5 years ago
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years ago
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
a879c396bb
Merge branch 'develop' into feature/tag_feed
5 years ago
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
a12b6454bb
Add an option to require fetches to be signed
5 years ago
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
02c3031e99
Don't log when users or objects are deleted.
5 years ago
bcd16676a7
Publisher: check out a connection for inserting publish_one jobs
...
Related to #1474 , federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
5 years ago
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
2f31cef71f
Merge branch 'feature/native-captcha' into 'develop'
...
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
5 years ago
81b05340e9
[ #1427 ] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
...
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
5 years ago
e536796984
Add native captcha and enable it by default.
5 years ago
8cb852523a
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
...
AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054
5 years ago
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
82fae3e23f
AdminAPI: Merge account views for list instance statuses
5 years ago
ee6805850c
Set log level to debug for not important messages
5 years ago
72f3b22134
Merge branch 'domain-block-precedence' into 'develop'
...
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
5 years ago
1ad96d667a
remove single-step pipe
5 years ago
1f498ba2bb
Merge branch '1427-oauth-admin-scopes' into 'develop'
...
[#1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests
Closes #1427
See merge request pleroma/pleroma!2053
5 years ago
3920244be5
[ #1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
5 years ago
457821adb0
Apply suggestion to lib/pleroma/user.ex
5 years ago
67a478d709
Merge branch 'fix/unsubscribe-route' into 'develop'
...
Do not apply http signature pipeline to the unsubscribe route
See merge request pleroma/pleroma!2052
5 years ago
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
25f774f7c1
format activity_pub.ex
5 years ago
19d228cc58
modify SQL to include followed-but-domain-blocked activities
5 years ago
75b419d7c8
Do not apply http signature pipeline to the unsubscribe route
5 years ago
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
5 years ago
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
a37bd5c255
Change log level
5 years ago
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
37c34ccec3
Merge branch 'fix/prefer-url-over-search' into 'develop'
...
status search: prefer the status fetched by url over other results
See merge request pleroma/pleroma!2050
5 years ago
f4b7f32d51
status search: prefer the status fetched by url over other results
5 years ago
b7a57d8e38
Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
5 years ago
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
2b821036c4
Merge branch 'develop' into issue/1383
5 years ago
0d2c13a119
Merge branch 'fix/otp-parsers' into 'develop'
...
OTP: Fix runtime upload limit config being ignored
Closes #1109
See merge request pleroma/pleroma!2045
5 years ago
b3c80b8404
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
...
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
5 years ago
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
5 years ago
a5e28bf214
Merge branch 'develop' into 'fix/oauth-compile-time'
...
# Conflicts:
# CHANGELOG.md
5 years ago
78299ab182
Set Plug.Logger to log at `:debug` level
5 years ago
ed92784e7c
Set Logger level to :info in prod
5 years ago
84f891ea3e
Add Pleroma.Utils.compile_dir/1
5 years ago
d4bafabfd1
Beginnings of the create validator
5 years ago
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago
3c45ed4f47
OTP: Fix runtime upload limit config being ignored
...
Closes #1109
5 years ago
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
5 years ago
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
5 years ago
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
af5fef1f22
Merge branch 'fix/clause-never-matches' into 'develop'
...
Fix never matching clause
See merge request pleroma/pleroma!2042
5 years ago
a21340caa1
Fix never matching clause
...
`length/1` is only used with lists.
5 years ago
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
5 years ago
29a3f70cba
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
...
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
5 years ago
a7f77785c2
Implement report notes destruction
5 years ago
1770602747
[ #1427 ] Extra check that admin OAuth scope is used by admin. Adjusted tests.
5 years ago
40e1817f70
[ #1427 ] Fixes / improvements of admin scopes support. Added tests.
5 years ago
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
5 years ago
93a80ee915
[ #1427 ] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
5 years ago
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
5 years ago
a75d4a41e0
Add a test for custom runtime modules
5 years ago
08c89fd2b8
Fix incorrect report count
5 years ago
e4292cbfad
Use Kernel.inspect/2 to print loaded custom modules
5 years ago
157bceeda9
Move runtime configuration from `:instance` to `:modules`
5 years ago
22fc271e23
init tag feed
5 years ago
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
5 years ago
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
5 years ago
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
5 years ago
d0bd4348b3
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
...
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
5 years ago
1216b546c6
Fix credo warning
5 years ago
48ae3c4347
Add support for custom modules
5 years ago
3fe7a1fd35
Merge branch 'develop' into issue/1342
5 years ago
1993d7096d
Validators: Add a type for the datetime used in AP.
5 years ago
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
e21afdb7c7
Merge branch 'develop' into issue/1411
5 years ago
3c3bba0b7c
fix ScheduledActivity
5 years ago
d3bce89edd
[ #1335 ] Merge issue fix.
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
aa97fe8f17
ChatChannel: Ignore messages that are too long.
5 years ago
3a0a400fe1
add @type to ScheduledActivity
5 years ago
29a98b86b7
Merge branch 'develop' into issue/1383
5 years ago
652cc6ba4b
updated ScheduledActivity
5 years ago
05fb8d0084
Fix Pleroma.FollowingRelationship.move_following/2
5 years ago
4b60d41db9
Add report notes
5 years ago
624e720aa4
Add `with_move` query param to the notifications API
5 years ago
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
cf52106e05
Update Floki dependency
5 years ago
88f7cf51d4
Merge branch 'develop' into issue/1411
5 years ago
0d24ab04c5
Merge branch 'remove-info-from-users' into 'develop'
...
Removed users.info field
See merge request pleroma/pleroma!2006
5 years ago
0326683932
hide follower/following for friendica
5 years ago
51111e286b
[ #1427 ] Initial support for OAuth admin scopes.
5 years ago
a98cda7758
Fix Pleroma.HTML.extract_first_external_url/2
5 years ago
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
04a8ffbe84
added privacy option to push notifications
5 years ago
a52da55eb9
added User.NotificationSetting struct
5 years ago
b7c449118b
Merge branch 'develop' into issue/1383
5 years ago
c7cc80a9ee
obligatory format commit
5 years ago
fa97eddf8a
make follows take precedence over domain blocks
5 years ago
fcabcab443
Fetch account from report, not from status (it might be deleted)
5 years ago
5135656f57
Handle reopened reports with deleted statuses
5 years ago
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
5 years ago
f36724efb1
User: Never return nil for user follower counts.
5 years ago
a4f834a687
moved DigestEmail to Oban Periodic jobs
5 years ago
f595cfe623
Remove User.user_info/2
5 years ago
1fc28a4b44
Add a view for the move notification
5 years ago
c5766a8100
moved ActivityExpiration to Oban Periodic jobs
5 years ago
6f202a401b
moved ScheduledActivity to Oban Periodic jobs
5 years ago
4af69f047d
Remove `account` field from web push payload
5 years ago
80ededc04f
Add `direct_conversation_id` to web push payload
5 years ago
ac3abb5414
moved Pleroma.Stats to Oban Periodic jobs
5 years ago
c8d3c3bfec
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
dc9090810d
Merge branch 'fix/ap-disable-remote-render' into 'develop'
...
Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010
5 years ago
b3b4e5ca80
AdminAPI: Grouped reports old/new fix
...
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
5 years ago
1364d303f8
AdminAPI: Fix grouped reports for closed/resolved reports
5 years ago
4b10804f21
OStatus controller: don't serve json at /notice/, redirect instead
5 years ago
02f7383891
ActivityPub controller: do not render remote users
5 years ago
5f981178d0
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
...
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
5 years ago
9374b52756
Merge branch 'fix/update-reports-old-format' into 'develop'
...
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
5 years ago
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
5 years ago
d3656c2725
add ability to set a custom user-agent string
5 years ago
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
40059c9b1e
Typo
5 years ago
2b341627da
Admin API: Render whole status in grouped reports
5 years ago
9f29930440
fetcher: move local object checking into a reusable function
5 years ago
1636cc5b7e
Removed users.info and remaining usages.
5 years ago
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
5 years ago
b64c7b35d4
Swap map with each
5 years ago
19b727bf8f
Merge branch 'fix/mix-task-logging' into 'develop'
...
Allow mix tasks to always run with debug logging
See merge request pleroma/pleroma!1997
5 years ago
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
5 years ago
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
5 years ago
320690f7a5
Object: Use inspect to log missing preload.
5 years ago
d38ab4bb89
Fix user.following_count
5 years ago
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
555edd01ab
[ #1335 ] User AP ID relations fetching performance optimizations.
5 years ago
565f261338
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
5 years ago
708fd234bd
fix order favorites activites
5 years ago
46eb160135
AdminAPI: Confirm user account, resend confirmation email
5 years ago
36686f5245
Support authentication via `x-admin-token` HTTP header
5 years ago
5cee51fac5
fix `order by` for fetch_favorites
5 years ago
3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
0937895182
updated fetch_favorites
5 years ago
9da4c88b49
fix test
5 years ago
4beb3ce5c5
/api/v1/favourites: added sorting for activites by adds to favorites
5 years ago
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
5 years ago
81cba405af
Merge branch 'nodeinfo-fields-limit' into 'develop'
...
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
5 years ago
b9041c2097
added recount unread notifications to markers
5 years ago
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
22554ac5ca
Merge branch 'bugfix/1395-email-activation' into 'develop'
...
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
5 years ago
f17e0f8e4f
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
5 years ago
72d2557e11
Add fieldsLimit to metadata of nodeinfo
5 years ago
eecd64cc07
object age policy: remove debug logging
5 years ago
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
5 years ago
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
30af5da330
Admin API: list all statuses from a given instance
5 years ago
09b4f7269e
Merge branch 'fix/conversations-rendering' into 'develop'
...
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
5 years ago
94f1cfced8
format the code
5 years ago
1afeaf82fa
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
...
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
5 years ago
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
5 years ago
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
5 years ago
facc37aaa6
Merge branch 'static-remote-redirect' into 'develop'
...
For remote notices, redirect to the original instead of 404 in static-fe
See merge request pleroma/pleroma!1974
5 years ago
62f3a93049
For remote notices, redirect to the original instead of 404.
...
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.
This new redirecting behavior should improve that situation.
5 years ago
b5b62f42b2
update Marker.multi_set_unread_count
5 years ago
768c1a5de1
Fix tests
5 years ago
27cd1374e3
Add a notification for Move activities
5 years ago
e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
e835cd97f6
Containment: Add a catch-all clause to contain_origin.
5 years ago
7d101bc9c5
Fix rendering conversations when there's a malformed status
5 years ago
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
5 years ago
e27d78e768
Merge branch 'nodeinfo-federation-enabled' into 'develop'
...
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
5 years ago
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
b39b49cc14
report federating status in nodeinfo
5 years ago
ddbfc995ac
clean sql query
5 years ago
1ca7b877a1
Merge branch 'iss-1376' into 'develop'
...
Check client and token in GET /oauth/authorize
See merge request pleroma/pleroma!1940
5 years ago
417f9a782f
Merge branch 'fix/1399' into 'develop'
...
fix for migrate config to db task
Closes #1399
See merge request pleroma/pleroma!1964
5 years ago
94627baa5c
New rate limiter
5 years ago
f6056e9c9c
UserEnabledPlug: Don't authenticate unconfirmed users.
5 years ago
8521553ad9
User: Don't let deactivated users authenticate.
5 years ago
5cf2c7422b
[ #1335 ] Applied code review suggestions.
5 years ago
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
31343e4321
Code style fixes
5 years ago
6a4201e0b4
fix for migrate task
5 years ago
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
3a1aaadc18
Merge branch 'issue/1339' into 'develop'
...
[#1339 ] add subject to atom feed
See merge request pleroma/pleroma!1961
5 years ago
9d0b989521
add subject to atom feed
5 years ago
3cc49cdb78
Formatter moved to new module.
5 years ago
ef7c3bdc7a
Add some further test cases.
...
Including like ... private visibility, cos that's super important.
5 years ago
4729027f91
Prevent non-local notices from rendering.
5 years ago
886a07ba57
Move static_fe config to its own section instead of in :instance.
5 years ago
b0080fa730
Render errors in HTML, not with JS.
5 years ago
e27c61218d
Expand subject content automatically when config is set.
5 years ago
bfd5d79826
Include metadata in static FE conversations and profiles.
5 years ago
828259fb65
Catch 404s.
5 years ago
df2f59be91
Pagination for user profiles.
5 years ago
8969c5522d
Make many of the improvements suggested in review.
5 years ago
e8bee35578
Static FE plug should only respond to text/html requests.
5 years ago
dc3b87d153
Move static FE routing into its own plug.
...
Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place.
5 years ago
c6c706161e
Make sure notice link is remote if the post is remote.
5 years ago
274cc18e8a
Visually separate header.
5 years ago
2ac1ece652
Fix a bug where reblogs were displayed under the wrong user.
5 years ago
5d7c44266b
Change date formatting.
5 years ago
1dc785b74b
Move static-fe CSS to a separate file.
5 years ago
e4b9784c39
Show counts for replies, likes, and announces for selected notice.
...
Using text instead of an icon, for now.
5 years ago
93e9c0cedf
Format dates using CommonAPI utils.
5 years ago
918e1353f6
Add header to profile/notice pages linking to pleroma-fe.
5 years ago
33a26b61c3
Remove activity/user representer; move logic to controller.
5 years ago
41fde63def
Get rid of @data in views and use separate fields.
5 years ago
e944a2213d
Use gettext for sensitive media warning.
5 years ago
2d1897e8a7
Apply all suggested changes from reviewers.
5 years ago
cc1b07132f
Notices should show entire thread from context.
5 years ago
748d800acb
Show images, video, and audio attachments to notices.
5 years ago
1d8950798c
Fix activity_representer to work with User.get_or_fetch returning tuple.
5 years ago
0cf04e1088
Fix OStatus controller to know about StaticFEController.
...
But only when it's configured to be on.
5 years ago
e79d8985ab
Don't show 404 in static-fe controller unless it's actually not found.
5 years ago
c1fc139986
Add permalinks to the static-fe notice rendering.
5 years ago
d1320160f4
Looks like source_data is on user directly now.
5 years ago
ca5ef201ef
static fe: add remote follow button
5 years ago
b33fbd58e3
static fe: add support for message subjects
5 years ago
e2904b5777
static fe: reformat activity representer
5 years ago
2b5bd5236d
static fe: add user profile rendering
5 years ago
8f08da750a
static fe: use a generic activity representer to render activities
5 years ago
ff8d0902f3
static fe: formatting
5 years ago
a4d3a8ec03
static fe: proof of concept
5 years ago
5b60d82592
object containment: handle all cases where ID is invalid (missing, nil, non-string)
5 years ago
532fd38b12
nodeinfo: add multifetch feature (ref pleroma-fe!977).
5 years ago
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
7258db023e
Support old flag format
5 years ago
7888803ffe
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
5 years ago
32afa07995
Fetcher: fix local check returning unwrapped object
...
This resulted in error messages about failed refetches being logged.
5 years ago
802d249827
Merge branch 'fix/trailing-format-plug-oauth' into 'develop'
...
Fix TrailingFormatPlug not being active for /api/oauth_tokens
Closes #1385
See merge request pleroma/pleroma!1944
5 years ago
365657320c
Fix TrailingFormatPlug not being active for /api/oauth_tokens
5 years ago
84175fe30e
Set better Cache-Control header for static content
...
Closes #1382
5 years ago
8b19464176
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'
...
Force password reset for multiple users
Closes admin-fe#46
See merge request pleroma/pleroma!1928
5 years ago
f171095960
Grouped reports with status data baked in
5 years ago
54746c6c26
Object Fetcher: set cache after reinjecting
...
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
5 years ago
e1fc6cb78f
Check client and token in GET /oauth/authorize
5 years ago
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
5 years ago
faced6236b
NoteValidator: Add very basic validator for Note objects.
5 years ago
3d1b445cbf
Object Validators: Extract common validations.
5 years ago
e52955c961
update following_relationship.ex
5 years ago
62bc0657e7
excluded invisible users from search results
5 years ago
Ivan Tashkinov
