rinpatch
423cfaf141
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
Alexander Strizhakov
7cf7083076
relay list shows hosts without accepted follow
5 years ago
lain
47604907c9
Merge branch 'proper_error_messages' into 'develop'
...
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
5 years ago
feld
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
lain
4bce13fa2f
MastodonController: Return 404 errors correctly.
5 years ago
lain
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
Mark Felder
05da5f5cca
Update Copyrights
5 years ago
eugenijm
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
Haelwenn
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
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
--stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
5 years ago
Alexander Strizhakov
34f1d09f3a
spec fix
5 years ago
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
5 years ago
rinpatch
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
5 years ago
rinpatch
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
5 years ago
feld
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
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email
5 years ago
eugenijm
4ab07cf0d5
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
5 years ago
eugenijm
e2a6a40367
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
5 years ago
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings
5 years ago
eugenijm
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
Ivan Tashkinov
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
5 years ago
Haelwenn
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
5 years ago
lain
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
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
lain
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
5 years ago
lain
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
lain
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
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
5 years ago
lain
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
5 years ago
Egor Kislitsyn
2ef70b55f5
Fix `status.expires_at` type
5 years ago
rinpatch
472132215e
Use floki's new APIs for parsing fragments
5 years ago
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
Haelwenn (lanodan) Monnier
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
Mark Felder
478619782b
Standardize @behaviour usage in MRFs
5 years ago
rinpatch
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
rinpatch
23049a077e
NodeInfo: Fix federating status not being reported when MRF
...
transparency is disabled
Closes #1568
5 years ago
Mark Felder
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
Egor Kislitsyn
50d9fcbe29
Hotlink logo instead of attachment
5 years ago
feld
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
5 years ago
rinpatch
ea1631d7e6
Make Floki use fast_html
5 years ago
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
Maksim Pechnikov
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
Ivan Tashkinov
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
5 years ago
Ivan Tashkinov
6ea3c06d8d
[ #1505 ] Minor refactoring.
5 years ago
Ivan Tashkinov
7c3991f59e
[ #1505 ] Fixed `replies` serialization (included objects' ids instead of activities' ids).
5 years ago
Ivan Tashkinov
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Ivan Tashkinov
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
5 years ago
lain
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