Alexander Strizhakov
22d52f5691
same copyright date format
5 years ago
Mark Felder
4427161ca3
Merge branch 'develop' into gun
5 years ago
Mark Felder
05da5f5cca
Update Copyrights
5 years ago
Ivan Tashkinov
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
5 years ago
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
eugenijm
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
5 years ago
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
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
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow
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
d9e4b77f8b
Merge branch 'develop' into gun
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
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier
3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
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
f446744a6a
Allow account registration without an email
5 years ago
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings
5 years ago
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
eugenijm
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
Ivan Tashkinov
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
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
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun
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
Mark Felder
cf94349287
Merge branch 'develop' into gun
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
Alexander Strizhakov
514c899275
adding gun adapter
5 years ago
Maksim Pechnikov
28701c08ad
Merge branch 'develop' into issue/1276
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
Maksim Pechnikov
6f9839c73c
Merge branch 'develop' into issue/1276
5 years ago
rinpatch
23049a077e
NodeInfo: Fix federating status not being reported when MRF
...
transparency is disabled
Closes #1568
5 years ago
Maksim Pechnikov
da44ee5b0f
Merge branch 'develop' into issue/1276
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
58574ef156
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
6813c0302c
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
cd040691bd
maked `unread_count` as virtual field
5 years ago
Maksim Pechnikov
b87533760b
Merge branch 'develop' into issue/1276
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
Alexander Strizhakov
dad23e3766
need_reboot flag
5 years ago
rinpatch
15ea75cd2a
Actually fix upload limit on OTP releases
...
Closes #1109
5 years ago
Haelwenn
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
Lain Soykaf
d85bcc8627
Questions: Add timezone to `closed` property
5 years ago
Lain Soykaf
4538a1ee01
EmojiReactions: Remove old API endpoints
5 years ago
Lain Soykaf
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
5 years ago
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
5 years ago
feld
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
Alexander Strizhakov
c85aa6e87f
removing confusing error
5 years ago
rinpatch
15cb1f6804
Merge branch 'fix/unpinnable-polls' into 'develop'
...
fix not being able to pin polls
See merge request pleroma/pleroma!2172
5 years ago
Alexander Strizhakov
5db6ac8ee4
removing migrate_from_db endpoint from admin api
5 years ago
rinpatch
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
Egor Kislitsyn
8c71f7e11a
Add support for cancellation of a follow request
5 years ago
Ivan Tashkinov
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
50f5a92021
fix not being able to pin polls
5 years ago
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
5 years ago
lain
a0d9d42eaa
Emoji Reactions: Actually use the validation.
5 years ago
feld
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
feld
b3e9c87724
Update emoji_api_controller.ex
5 years ago
rinpatch
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
5 years ago
Haelwenn
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
Alexander Strizhakov
e7fee0d6fa
emoji api error on not writable dir
5 years ago
lain
b3a877d6c9
Emoji Reactions: Correctly handle deleted users
5 years ago
lain
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
5 years ago
Alexander Strizhakov
1f4fbe9d98
title parse improvement
5 years ago
Maksim Pechnikov
ba5e8a6444
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
lain
cedee2793d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
5 years ago
lain
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
Alexander Strizhakov
7bd4c14581
meta tag parser respect first title header
5 years ago
lain
d385789a45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
5 years ago
lain
77f24525ca
Streamer: Correctly handle reblog mutes
5 years ago
lain
46915207b6
Remove `whole_db` parameter everywhere, it's not used anymore
5 years ago
lain
e3fae3380e
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
5 years ago
Maksim Pechnikov
bcffa662dc
Merge branch 'develop' into feature/tag_feed
5 years ago
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
5 years ago
Maksim Pechnikov
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
5 years ago
feld
36838b516f
Merge branch 'fix/runtime-config' into 'develop'
...
Fixes for runtime config
See merge request pleroma/pleroma!2143
5 years ago
Mark Felder
d770cffce0
Merge branch 'develop' into issue/1280
5 years ago
Alexander Strizhakov
e93cc561cd
restarting pleroma from outside application
5 years ago
Ivan Tashkinov
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
5 years ago
Alexander Strizhakov
de4102b247
can be changed in runtime
5 years ago
Maksim Pechnikov
99c0a11c58
added atom feed
5 years ago
Maksim Pechnikov
055edd3d72
Merge branch 'develop' into feature/tag_feed
5 years ago
rinpatch
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
lain
347f3ed2c6
Emoji reactions: Change api format once more
5 years ago
Maksim Pechnikov
8589632d09
fixed delete ScheduledActivity
5 years ago
lain
34fc0ca053
Emoji reactions: Add sanity checks for the cache
5 years ago
Maksim Pechnikov
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
Haelwenn
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
5 years ago
Mark Felder
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
Mark Felder
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
5 years ago
lain
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
Ivan Tashkinov
cf96c40057
[ #1505 ] Added Mastodon-compatible `replies` collection to Note federated representation.
5 years ago
rinpatch
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
Maksim Pechnikov
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
minibikini
7c0ac54437
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
5 years ago
Egor Kislitsyn
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
feld
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
5 years ago
Egor Kislitsyn
df0b8f1d08
Add new users digest email
5 years ago
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
Alexander Strizhakov
d5f8a88a37
support for updating env after settings deletion
5 years ago
Alexander Strizhakov
32a643a159
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov
b8d5c09f48
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
5ea8596448
Merge branch 'develop' into feature/tag_feed
5 years ago
Haelwenn (lanodan) Monnier
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
5 years ago
Alexander Strizhakov
f01ab6cd29
some refactor and tests
5 years ago
rinpatch
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
5 years ago
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov
dcae5914d1
fix for db key
5 years ago
Maksim Pechnikov
41e2332007
Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov
6e88a7e591
exclude blocked user posts from search results
5 years ago
lain
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
rinpatch
00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
5 years ago
Alexander Strizhakov
8023fa48db
merge fix
5 years ago
lain
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
lain
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
lain
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
lain
510776ba31
CommonAPI: Don't error out on double favs/repeats
5 years ago
lain
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
lain
5fddf988ea
Pleroma API: `emoji_reactions_by` does not need authorization
5 years ago
Haelwenn
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
5 years ago
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
5 years ago
Haelwenn (lanodan) Monnier
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
5 years ago
Alexander Strizhakov
e699861690
full update for some subkeys
5 years ago
Alexander Strizhakov
89e93fb33f
return db key on update requests
5 years ago
Maksim Pechnikov
108a39c876
updated error messages for authentication process
5 years ago
Alexander Strizhakov
60ba2339a2
saving to DB only added by user settings
5 years ago
Alexander Strizhakov
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
5 years ago
Maksim Pechnikov
a5db044e57
Merge branch 'develop' into feature/tag_feed
5 years ago
Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
lain
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Alexander Strizhakov
59ba5c80b9
little cleanup
5 years ago
Egor Kislitsyn
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
Ivan Tashkinov
76c1948880
[ #1478 ] Adjusted AdminAPIController admin subscope requirements.
5 years ago
Maksim Pechnikov
c9f45edeac
Merge branch 'develop' into feature/tag_feed
5 years ago
lain
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
5 years ago
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
feld
bb5862ea2f
Merge branch 'issue/1354' into 'develop'
...
[#1354 ] fix remote follow
See merge request pleroma/pleroma!2079
5 years ago
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
feld
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
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov
d933fd3d61
more renamings
5 years ago
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
Alexander Strizhakov
958d0452e4
fix for pleroma assets group update
5 years ago
Ivan Tashkinov
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
lain
05ca420c09
Merge branch 'issue/1490' into 'develop'
...
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
5 years ago
Alexander Strizhakov
88a16bb9fc
deep merge in config update
5 years ago
Alexander
c841174de8
flag for delete fix
5 years ago
Alexander
0b02040327
little fixes and typos fix
5 years ago
Alexander
9c1f3bfeff
fixes for logger backends
5 years ago
Alexander
063ab6d911
logger backends fix
5 years ago
Alexander
583cee4607
parsing proxy url setting
5 years ago
Alexander
fea734ca70
errors on endpoints
5 years ago
Alexander
5cacb988b9
partially settings update
5 years ago
Alex S
2753285b77
config editing through database
5 years ago
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Maksim Pechnikov
70410dfafd
fix create service actor
5 years ago
Maksim Pechnikov
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
Ivan Tashkinov
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Maksim Pechnikov
933dc12043
added code of mr#2067
5 years ago
Maksim Pechnikov
385356aad0
fix oauth scopes for AdminApi#reports_update
5 years ago
Maksim Pechnikov
bdd71669da
update test
5 years ago
Maksim
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
5 years ago
Maksim
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
5 years ago
Maksim Pechnikov
5b84156013
moved remote follow in separate controller
5 years ago
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
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
Mark Felder
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
5 years ago
Maksim Pechnikov
7bd0bca2ab
fixed remote follow
5 years ago
Ivan Tashkinov
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Ivan Tashkinov
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
5 years ago
Egor Kislitsyn
34d85f8a54
Return 404 if account to filter notifications from is not found
5 years ago
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
Maksim Pechnikov
b53573a837
add tag feeds
5 years ago
Thomas Citharel
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
Egor Kislitsyn
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
Maksim Pechnikov
a879c396bb
Merge branch 'develop' into feature/tag_feed
5 years ago
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
Phil Hagelberg
02c3031e99
Don't log when users or objects are deleted.
5 years ago
rinpatch
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
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Ivan Tashkinov
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
lain
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
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
Mark Felder
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
Maxim Filippov
82fae3e23f
AdminAPI: Merge account views for list instance statuses
5 years ago
Egor Kislitsyn
ee6805850c
Set log level to debug for not important messages
5 years ago
rinpatch
72f3b22134
Merge branch 'domain-block-precedence' into 'develop'
...
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
5 years ago
Sadposter
1ad96d667a
remove single-step pipe
5 years ago
feld
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
Sadposter
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
Sadposter
25f774f7c1
format activity_pub.ex
5 years ago
Sadposter
19d228cc58
modify SQL to include followed-but-domain-blocked activities
5 years ago
Egor Kislitsyn
75b419d7c8
Do not apply http signature pipeline to the unsubscribe route
5 years ago
minibikini
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
5 years ago
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
Egor Kislitsyn
a37bd5c255
Change log level
5 years ago
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Maksim Pechnikov
2b821036c4
Merge branch 'develop' into issue/1383
5 years ago
lain
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
lain
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
5 years ago
Egor Kislitsyn
78299ab182
Set Plug.Logger to log at `:debug` level
5 years ago
lain
d4bafabfd1
Beginnings of the create validator
5 years ago
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago
rinpatch
3c45ed4f47
OTP: Fix runtime upload limit config being ignored
...
Closes #1109
5 years ago
Maksim Pechnikov
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
rinpatch
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
5 years ago
Maksim Pechnikov
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
rinpatch
af5fef1f22
Merge branch 'fix/clause-never-matches' into 'develop'
...
Fix never matching clause
See merge request pleroma/pleroma!2042
5 years ago
rinpatch
a21340caa1
Fix never matching clause
...
`length/1` is only used with lists.
5 years ago
rinpatch
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
rinpatch
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
Maxim Filippov
a7f77785c2
Implement report notes destruction
5 years ago
Ivan Tashkinov
40e1817f70
[ #1427 ] Fixes / improvements of admin scopes support. Added tests.
5 years ago