Mark Felder
8b28dce82a
Deprecate Pleroma.Uploaders.S3, :public_endpoint
4 years ago
feld
5453038ce9
Merge branch 'fix/backup-url-on-s3' into 'develop'
...
Standardize base url for uploads
See merge request pleroma/pleroma!3246
4 years ago
lain
7a1cb752dd
Pagination: Don't be dos'd by random parameters.
4 years ago
Mark Felder
ef59d99833
Simplify. We will always have a result from Upload.base_url/0, so just add it to the list
4 years ago
Mark Felder
1040881047
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
4 years ago
lain
e1a547d7d3
ChatMessages: Fix pagination headers.
...
They used to contain the path parameter `id` as query param,
which would break the link.
4 years ago
Mark Felder
9887cdf9be
Formatting
4 years ago
feld
fa63f1b55b
Apply 4 suggestion(s) to 2 file(s)
4 years ago
Mark Felder
e8bf060e6e
Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0
...
Now we should have a correct base URL for S3 hosted objects throughout the codebase.
4 years ago
Mark Felder
86dcfb4eb9
More places we should be using Upload.base_url
4 years ago
Mark Felder
530fb5b29e
Avoid duplicate Config calls
4 years ago
Mark Felder
3c936061d5
Apply Upload.base_url for S3
4 years ago
Mark Felder
ad79983614
Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
4 years ago
lain
80167e62dd
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
...
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
4 years ago
Alex Gleason
3342f6a7ef
Backups: render ID in API
4 years ago
lain
ac1298fce8
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
...
Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236
4 years ago
lain
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
4 years ago
lain
4d56aca904
Merge branch 'adminapi-user-email' into 'develop'
...
AdminAPI: return user email
See merge request pleroma/pleroma!3240
4 years ago
Ivan Tashkinov
0d521022fe
[ #3213 ] Removed PK from hashtags_objects table. Improved hashtags_transfer mix task (logging of failed ids).
4 years ago
Alex Gleason
20af025c65
AdminAPI: return user email
4 years ago
Roger Braun
48cd336a72
allow external emoji
4 years ago
Mark Felder
d69c78ceb9
Remove configurability of upload proxy opts, simplify
4 years ago
Mark Felder
64116f63d9
URI.encode custom emojis
4 years ago
lain
20a269ed69
Merge branch 'fix/pagination-regression' into 'develop'
...
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
4 years ago
lain
e802b48d55
User: Use ObjectID type to validate also-known-as field
4 years ago
lain
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
4 years ago
lain
bea69853a2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
4 years ago
lain
d44850d7a5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
4 years ago
lain
8e5904daa5
SideEffects.DeleteTest: asyncify.
...
Replace Mock with Mox, mock out Logger.
4 years ago
Mark Felder
83f27282ba
Do not try to guess which pagination we need by the existence of an :offset param.
...
Require explicit request to get offset pagination.
4 years ago
lain
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
Alex Gleason
0ec7e9b8e9
AdminAPI: return id for moderation log entries
4 years ago
feld
afe9c152ab
Merge branch 'fix/reports-ordering' into 'develop'
...
Do not reverse order of reports. We want newest ones sorted to the top.
Closes #2364
See merge request pleroma/pleroma!3225
4 years ago
Alex Gleason
4200a06340
Aliases: refactor validate_also_known_as/1
4 years ago
Alex Gleason
0d6b9ce8ca
Apply 2 suggestion(s) to 1 file(s)
4 years ago
feld
2aa60e7592
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Ivan Tashkinov
303055456f
Alternative implementation of hashtag-filtering queries in ActivityPub. Fixed GROUP BY clause for aggregation on hashtags.
4 years ago
Ivan Tashkinov
367f0c31c3
[ #3213 ] Added query options support for Repo.chunk_stream/4.
...
Used infinite timeout in transfer_hashtags select query.
4 years ago
Alex Gleason
11d40e92b7
Render AKAs in Actor endpoints
4 years ago
Alex Gleason
cbce880076
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Mark Felder
2597b028f7
Make pagination type conditional
4 years ago
Mark Felder
085d4e6cfc
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
4 years ago
Mark Felder
4c5f75f4e9
Support pagination in AdminAPI for user statuses
4 years ago
Mark Felder
744b34709d
Do not reverse order of reports. We want newest ones sorted to the top.
4 years ago
Ivan Tashkinov
8d1a0c1afd
[ #3213 ] Made Object.object_data_hashtags/1 handle both AS2 and plain text hashtags.
4 years ago
Ivan Tashkinov
e0b5edb6d5
[ #3213 ] Fixed Object.object_data_hashtags/1 to process only AS2 elements of `data.tag` (basing on #2984 ).
4 years ago
Haelwenn
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
4 years ago
Haelwenn
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
4 years ago
Haelwenn (lanodan) Monnier
18b536c176
Pleroma.Object/1: take %Object{} as argument instead
4 years ago
Ivan Tashkinov
14fae94c0e
[ #3213 ] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.
4 years ago
Alexander Strizhakov
2e859794ee
non condition dir creation
4 years ago
Alexander Strizhakov
dad76703aa
not needed
4 years ago
Alexander Strizhakov
7bfb041658
insreasing test coverage for StealEmojiPolicy
4 years ago
Alexander Strizhakov
aafd7b44ce
check dir existence in policy
4 years ago
Mark Felder
e02889edb2
Add MRFs to the list of things that may need a soft reboot
4 years ago
Mark Felder
72aeb2e73b
Mark private
4 years ago
Mark Felder
77e39e6aae
Create dir for EmojiStealPolicy automatically
4 years ago
Ivan Tashkinov
4134abef63
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov
cbb19d0e18
[ #3213 ] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to `hashtags` table.
4 years ago
lain
e4f1d8f48c
Merge branch 'cachex-test' into 'develop'
...
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
4 years ago
Ivan Tashkinov
e369b1306b
Added Hashtag entity and objects-hashtags association with auto-sync with `data.tag` on Object update.
4 years ago
Haelwenn (lanodan) Monnier
87b13c5430
Create Object.hashtags/1 wrapper
4 years ago
Haelwenn (lanodan) Monnier
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
4 years ago
Ivan Tashkinov
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
4 years ago
lain
ab633e51ab
Linting
4 years ago
lain
5db1e6c8d3
Pipeline test: Switch from Mock to Mox.
...
Speeds up the test and makes it possible to run async.
4 years ago
lain
c9d73af74d
Cachex: Unify arity of callback function
4 years ago
lain
ee81a94ab2
Caching: Add caching behavior, add null implementation.
4 years ago
Kaizhe Huang
fb02241580
Fix trailing whitespaces in lib/pleroma/web/web_finger.ex
4 years ago
lain
95a9bdfc37
Tests: Use NullCache for async tests.
...
Caching can't work in async tests, so for them it is mocked to a
null cache that is always empty. Synchronous tests are stubbed
with the real Cachex, which is emptied after every test.
4 years ago
lain
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
4 years ago
FiveYellowMice
83cd7f2b5f
WebFinger: add subscribe_address in return data of JSON responses
4 years ago
Alex Gleason
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
lain
8b8c317c0f
Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
...
Fix mastoapi ws posts dropping
Closes #2336
See merge request pleroma/pleroma!3198
4 years ago
lain
6bb4f4e172
Merge branch 'support/2255_posix_errors' into 'develop'
...
[#2255 ] added error messages for posix error code
See merge request pleroma/pleroma!3138
4 years ago
Mark Felder
6dac2ac71a
Minor refactoring of the logic for hiding followers/following counts.
...
Field is not nullable anymore, and this is more readable.
4 years ago
Alexander Strizhakov
cebe3c7def
Fix for dropping posts/notifs in WS when mix task is executed
...
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
4 years ago
Mark Felder
6520599b7d
Update Earmark to 1.4.13, use the new compact_output mode
4 years ago
Alex Gleason
642729b49f
Fix AudioVideoValidator markdown
4 years ago
Alex Gleason
f8c93246d6
Refactor Earmark code, fix tests
4 years ago
Alex Gleason
ba71bbf610
Improve Formatter.minify/2
4 years ago
Alex Gleason
e9e17e5df3
Upgrade Earmark to v1.4.10
4 years ago
Ivan Tashkinov
7fff9c1bee
Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
4 years ago
Ivan Tashkinov
7da0349d73
Changed default OAuth token expiration time to 30 days.
4 years ago
lain
477c6c8e55
Merge branch 'auth-improvements' into 'develop'
...
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
4 years ago
lain
1436a2fa2d
Merge branch 'stream-follow-updates' into 'develop'
...
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
4 years ago
lain
e73d878b38
Merge branch 'feat/warn-large-pool-size' into 'develop'
...
Add a startup error for modified Repo pool_size
See merge request pleroma/pleroma!3190
4 years ago
lain
50d16a9e27
ApplicationRequirements: Add test, more text for pool size.
4 years ago
lain
5b9b7b4888
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder
fb3fd692c6
Add a startup error for modified Repo pool_size
4 years ago
Haelwenn (lanodan) Monnier
1403798820
instance.reachable?: Limit to binary input
4 years ago
Haelwenn (lanodan) Monnier
e1a2e8b17c
instance: Do not fetch unreachable instances
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346
4 years ago
Ivan Tashkinov
c8e7ace812
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
ed76323776
Merge branch 'feature/configdb-mix-tasks' into 'develop'
...
Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174
4 years ago
Ivan Tashkinov
e00c667145
[ #3174 ] Refactoring: ConfigDB fetching functions, ConfigDB tests.
...
Minor fixes.
4 years ago
Ivan Tashkinov
a010c5b16a
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov
e9859b68fc
[ #3112 ] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
4 years ago
feld
6adad96c79
Merge branch 'issue/2256' into 'develop'
...
[#2256 ] added subject actor to moderation log
See merge request pleroma/pleroma!3164
4 years ago
rinpatch
1d04bd0894
Merge branch 'supported-emojos' into 'develop'
...
Update Emoji support to unicode 13.1, support all RGI emoji.
See merge request pleroma/pleroma!3186
4 years ago
Alexander Strizhakov
a02eb88396
config_db search methods
4 years ago
lain
fa0d0b602f
Emoji: Also accept regional indicators
4 years ago
lain
8fb259e739
Emoji: Only accept RGI emoji.
...
"recommended for general interchange"
4 years ago
Egor Kislitsyn
c9afb350e7
Document follow relationship updates and cleanup
4 years ago
lain
b6f5e9ac9c
Emoji: Remove unused emoji-data.txt
4 years ago
lain
1adee08321
Emoji: Update to Unicode 13.1, switch base file, allow multichar.
4 years ago
lain
04af0bbe44
User: Remove left-over (wrong) fix.
4 years ago
lain
222312900e
User: Don't allow local users in remote changesets
4 years ago
Egor Kislitsyn
35ba48494f
Stream follow updates
4 years ago
Ivan Tashkinov
d50a3345ae
[ #3112 ] Allowed revoking same-user token from any apps. Added tests.
4 years ago
Ivan Tashkinov
50e47a215f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
Alexander Strizhakov
6aadb1cb40
digest algorithm is taken from header
4 years ago
Maksim Pechnikov
fb72f2034a
fix spec
4 years ago
Ivan Tashkinov
62993db499
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
4 years ago
Alexander Strizhakov
5eef4988bf
fix for elixir 1.11
...
load runtime configs in releases with config provider
4 years ago
lain
67b15cc033
Search: Save detected pg version in a persistent term.
4 years ago
lain
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
Ivan Tashkinov
489b12cde4
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Ivan Tashkinov
ccc2cf0e87
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
4 years ago
Alex Gleason
30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
feld
ecd1ef8cb5
Merge branch 'fix/2302-report-duplicates' into 'develop'
...
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
4 years ago
lain
e4289792d2
Linting.
4 years ago
lain
9a1e5f5d48
Search: Change search method based on detected pg version
4 years ago
lain
a407e33c78
Application: Save postgres version in the environment
4 years ago
Alexander Strizhakov
0a5b22bc3b
start limiters in mix tasks
4 years ago
feld
79a509ee61
Merge branch '2301-users-search-discoverability-fix' into 'develop'
...
[#2301 ] Proper handling of User.is_discoverable
Closes #2301
See merge request pleroma/pleroma!3162
4 years ago
feld
cd1b4155d5
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
...
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
4 years ago
Maksim Pechnikov
66f411fba0
added subject actor to moderation log
4 years ago
Ivan Tashkinov
b27d8f7437
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
5e04f4156c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
4 years ago
Ivan Tashkinov
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
4 years ago
Haelwenn
c8d11c3064
Merge branch '2317-old-reset-tokens' into 'develop'
...
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
4 years ago
lain
8b90d62506
Search: Only skip ordering the rum index.
4 years ago
lain
a60242464e
Search: Add option to search with the websearch function
4 years ago
Ivan Tashkinov
fcad3e716a
[ #2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results.
4 years ago
Alexander Strizhakov
46dab37351
little fix
4 years ago
lain
5e2ba57327
Activity search: Fix order of results
...
Greatly speeds up the search for RUM.
4 years ago
lain
11e0d5f9ac
Password Resets: Don't accept tokens above a certain age.
...
By default, one day
4 years ago
Alexander Strizhakov
8a8c154b4e
test fixes
4 years ago
Alexander Strizhakov
be0b874e1d
fix for mastodon forwarded reports
4 years ago
Alexander Strizhakov
e2bf6b1f7e
fix for forwarded reports
4 years ago
minibikini
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
4 years ago
lain
aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
4 years ago
lain
6b32e1de23
Merge branch 'frontend-admin-api' into 'develop'
...
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
4 years ago
Maksim Pechnikov
9c5d1cb9ed
fix tests
4 years ago
Maksim
25eb222bed
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder
ccddedb504
Credo
4 years ago
Mark Felder
499faa82f6
Synchronize reaction notification text with PleromaFE's style
4 years ago
Mark Felder
5d0bc5e028
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
4 years ago
Mark Felder
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
4 years ago
Mark Felder
83ec2f1384
Allow subscribing for pleroma:emoji_reaction push notifications
4 years ago
Mark Felder
3ce11b830e
Add capability for emoji reaction push notifications
4 years ago
lain
bb9650f3c2
FrontendController: Return error on installation error.
4 years ago
feld
d33b9e7b33
Merge branch 'remove/fedsockets' into 'develop'
...
Remove FedSockets
See merge request pleroma/pleroma!3155
4 years ago
Egor Kislitsyn
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
4 years ago
Egor Kislitsyn
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
4 years ago
rinpatch
2c55f7d7cb
Remove FedSockets
...
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
4 years ago
lain
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain
81293e5aad
ActivityPubController: Don't return local only objects
4 years ago
Mark Felder
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
4 years ago
Maksim Pechnikov
e4b202d905
added test
4 years ago
Egor Kislitsyn
fb41bd1a85
Hide reactions from muted and blocked users
4 years ago
Maksim Pechnikov
e1d25bad0c
fix tests
4 years ago
Alex Gleason
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
Maksim Pechnikov
36ec604521
added test
4 years ago
lain
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
4 years ago
Ilja
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
4 years ago
Maksim Pechnikov
1830b6aae5
added error messages for posix error code
4 years ago
rinpatch
6ca709816f
Fix object spoofing vulnerability in attachments
...
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects .
content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
possibility I missed something.
Closes pleroma#1948
4 years ago
Haelwenn
99bc175f02
Merge branch 'title-injection-change' into 'develop'
...
Title injection change
See merge request pleroma/pleroma!3132
4 years ago
Mark Felder
2156de2fee
Ingest blurhash field during transmogrification
4 years ago
Mark Felder
2254e5e595
Render blurhashes in Mastodon API
4 years ago
Mark Felder
6fd72e9e85
Ingest blurhash for attachments if they were federated
4 years ago
Egor Kislitsyn
d26a449396
Change endpoint path
4 years ago
Egor Kislitsyn
435bf1f945
Remove FrontendInstallerWorker
4 years ago
lain
631def2df2
RedirectController: Don't replace title, but inject into the meta
4 years ago
Egor Kislitsyn
08cbd655d1
Merge branch 'develop' into frontend-admin-api
4 years ago
Alexander Strizhakov
8da9f919f8
little changes for MRF config descriptions
...
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
4 years ago
Egor Kislitsyn
af3f00292c
Fix formatting
4 years ago
Egor Kislitsyn
0118ccb53c
Add `local` visibility
4 years ago
feld
3cd7ea693f
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
...
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
4 years ago
Alexander Strizhakov
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
4 years ago
Alexander Strizhakov
f97f24b067
making credo happy and test fix
4 years ago
Alexander Strizhakov
efc27f6464
fix for adminFE
...
- revert UserAllowPolicy description
- MRF descriptions order
4 years ago
Alexander Strizhakov
485697d96c
config descriptions for custom MRF policies
4 years ago
lain
88f6b61a5e
Merge branch '2260-wrong-report-link' into 'develop'
...
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
4 years ago
lain
d77fd6b3d0
Merge branch 'fix/html-title-load' into 'develop'
...
Fix title on load of Pleroma HTML, fixes #2281
Closes #2281
See merge request pleroma/pleroma!3125
4 years ago
Alexander Strizhakov
0c68b9ac13
escaping summary and other fields in xml templates
4 years ago
Sean King
e4a21084f0
Fix title on load of Pleroma HTML
4 years ago
lain
294628d981
Merge branch 'feature/expire-mutes' into 'develop'
...
Expiring mutes for users and activities
Closes #1817
See merge request pleroma/pleroma!2971
4 years ago
lain
6d850c46dc
AdminEmail: Use AP id as user url.
4 years ago
lain
7bbc328d66
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
4 years ago
lain
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
4 years ago
lain
4800ee656b
Merge branch 'features/federation-status' into 'develop'
...
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
4 years ago
lain
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
4 years ago
Ivan Tashkinov
73e66fd31f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
4 years ago
Haelwenn
9c09ea01aa
Merge branch '2284-voters-count' into 'develop'
...
Always return voters_count in polls
See merge request pleroma/pleroma!3120
4 years ago
lain
504a829edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
4 years ago
lain
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
4 years ago
lain
bc4d9c4ffc
Merge branch 'hide-muted-chats' into 'develop'
...
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
4 years ago
Egor Kislitsyn
ca95cbe0b4
Add `with_muted` param to ChatController.index/2
4 years ago
lain
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
4 years ago
lain
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
4 years ago
lain
92d252f364
Poll Schema: Update and fix.
4 years ago
lain
1cfc3278c0
Poll View: Always return `voters_count`.
4 years ago
lain
c37118e6f2
Conversations: A few refactors
4 years ago
lain
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
4 years ago
Mark Felder
7efc074ead
Permit fetching individual reports with notes preloaded
4 years ago
Egor Kislitsyn
be52819a11
Hide chats from muted users
4 years ago
lain
24ce324973
Merge branch 'bugfix/poll_replies_count' into 'develop'
...
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
4 years ago
minibikini
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
4 years ago
Haelwenn (lanodan) Monnier
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
4 years ago
feld
9fbe9ef774
Merge branch 'tesla-get-to-pleroma' into 'develop'
...
Use Pleroma.HTTP instead of Tesla
Closes #2275
See merge request pleroma/pleroma!3113
4 years ago
Ekaterina Vaartis
8f00d90f91
Use Pleroma.HTTP instead of Tesla
...
Closes #2275
As discovered in the issue, captcha used Tesla.get instead of
Pleroma.HTTP. I've also grep'ed the repo and changed the other place
where this was used.
4 years ago
feld
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
4 years ago
Ivan Tashkinov
04f6b48ac1
Auth subsystem refactoring and tweaks.
...
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
4 years ago
eugenijm
8e41baff40
Add idempotency_key to the chat_message entity.
4 years ago
Egor Kislitsyn
d1698267a2
Fix credo warning
4 years ago
Egor Kislitsyn
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Alibek Omarov
d63ec02f31
ConversationView: fix formatting
4 years ago
Alibek Omarov
9b93eef715
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
4 years ago
Alibek Omarov
241bd061fc
ConversationView: add current user to conversations, according to Mastodon behaviour
4 years ago
minibikini
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
4 years ago
feld
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
4 years ago
Egor Kislitsyn
d83c2bd330
Add support for install via `file` and `build_url` params
4 years ago
Egor Kislitsyn
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
4 years ago
Ivan Tashkinov
9f5f7dc9f9
Fixed User.is_discoverable attribute rendering in Admin API User view.
4 years ago
Ivan Tashkinov
da4a1e57b1
@doc fix.
4 years ago
Ivan Tashkinov
ba50dc05a8
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# CHANGELOG.md
4 years ago
Mark Felder
d2b140a525
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
4 years ago
Egor Kislitsyn
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
feld
1204aaa2e3
Merge branch 'feature/autofollowing' into 'develop'
...
autofollowing_nicknames
See merge request pleroma/pleroma!3087
4 years ago
Haelwenn
d8d4bd15d0
Merge branch '2236-no-name' into 'develop'
...
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
4 years ago
feld
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Maksim Pechnikov
d28f72a55a
FrontStatic plug: excluded invalid url
4 years ago
minibikini
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Mark Felder
291189357b
Merge branch 'develop' into feature/account-export
4 years ago
Mark Felder
9e54ef086b
Merge branch 'develop' into feature/account-export
4 years ago
feld
5aff479951
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
4 years ago
feld
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Egor Kislitsyn
03e306785b
Add an API endpoint to install a new frontend
4 years ago
lain
de6d49c8ce
ActivityPub: Add back debug call + explanation.
4 years ago
lain
9542c5d0f4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
4 years ago
Haelwenn
073ad7e6d9
Merge branch 'docs/ap_c2s' into 'develop'
...
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
4 years ago
rinpatch
df61071422
Merge branch '2242-nsfw-case' into 'develop'
...
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
4 years ago
lain
60e379ce0b
User: Correctly handle whitespace names.
4 years ago
feld
d6907e6e0c
Merge branch 'chore/elixir-1.11' into 'develop'
...
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
4 years ago
Ivan Tashkinov
8a68673eed
[ #3059 ] Formatting fix.
4 years ago
Ivan Tashkinov
8a55de1d78
[ #3059 ] Fixed Phoenix 1.5 telemetry processing.
4 years ago
lain
8d251096fe
SideEffects: Correctly handle chat messages sent to yourself
4 years ago
Maksim Pechnikov
ef627b9391
fix module name
4 years ago
Maksim Pechnikov
44e5a57d1a
admin api: added user filters by `actor_types`
4 years ago
Maksim Pechnikov
60663150b5
admin user search: added filter by `actor_type`
4 years ago
Maksim Pechnikov
46b420aa60
need_confirmed -> unconfirmed
4 years ago
Maksim Pechnikov
cf4f393794
added AdminApi.UserController
4 years ago
Maksim Pechnikov
9ef46ce410
added 'unconfirmed' filter to admin/users
4 years ago
Haelwenn
2ca98f2d94
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Egor Kislitsyn
034ac43f3a
Fix credo warnings
4 years ago
Egor Kislitsyn
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
4 years ago
Egor Kislitsyn
ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
4 years ago
lain
e97b254c6b
Transmogrifier: Refactor and unify incoming tag handling
4 years ago
lain
39fd4d7639
Transmogrifier: Downcase incoming Hashtags
...
Also, set sensitive to true if we have an nsfw hashtag present.
4 years ago
Egor Kislitsyn
98f32cf820
Fix tests
4 years ago
Egor Kislitsyn
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
4 years ago
Egor Kislitsyn
18a91d85e5
Merge branch 'develop' into feature/local-only-scope
4 years ago
Haelwenn
0495a07dc7
Merge branch '2239-mute-fixes' into 'develop'
...
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
4 years ago
Ivan Tashkinov
524fb0e4c2
[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
...
Added tests and documentation.
4 years ago
Ivan Tashkinov
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
4 years ago
Ivan Tashkinov
d54233760f
[ #3053 ] Post-merge fix.
4 years ago
Ivan Tashkinov
049ece1ef3
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
4 years ago
Mark Felder
1b8fd7e65a
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
4 years ago
Haelwenn (lanodan) Monnier
aafdc975bd
federation_status: Add ApiSpec
4 years ago
Haelwenn (lanodan) Monnier
3b5a7a6b14
federation_status: New endpoint showing unreachable instances
4 years ago
Mark Felder
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
Haelwenn
724e4b7f00
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Egor Kislitsyn
2a475622ee
Add Pleroma.Constants.as_local_public/0
4 years ago
Egor Kislitsyn
4f79bbbc31
Add local-only statuses
4 years ago
Egor Kislitsyn
3985c1b450
Fix warnings
4 years ago
lain
7a2f100061
ActivityPub: Show own replies to muted users.
...
Aligns mute with block behavior.
4 years ago
Mark Felder
1fb9452131
Merge branch 'develop' into feature/account-export
4 years ago
feld
77bca41595
Apply 3 suggestion(s) to 3 file(s)
4 years ago
Alex Gleason
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
feld
2013705690
Merge branch 'feature/gen-magic' into 'develop'
...
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
4 years ago
Mark Felder
ed61002815
Undo API breaking changes
4 years ago
Mark Felder
b001237b79
Finish undoing API breakage
4 years ago
Mark Felder
3242cfef20
Undo API breaking changes
4 years ago
Alex Gleason
dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
4 years ago
Alex Gleason
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Alex Gleason
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Alex Gleason
c3112fd13a
Merge remote-tracking branch 'upstream/develop' into registration-workflow
4 years ago
Egor Kislitsyn
6734abcbd4
Add pagination for Mutes
4 years ago
Egor Kislitsyn
33f4f39b1c
Add pagination for Blocks
4 years ago
Mark Felder
b738f70953
Merge branch 'develop' into feature/gen-magic
4 years ago
Mark Felder
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
4 years ago
Mark Felder
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
4 years ago
Mark Felder
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
Mark Felder
8bacdc3680
Change user.discoverable field to user.is_discoverable
4 years ago
Mark Felder
9968b7efed
Change user.locked field to user.is_locked
4 years ago
Alexander Strizhakov
4c4ea9a348
changes after rebase
4 years ago
Alexander Strizhakov
3cb9c88837
migration and warning for RemoteIp plug rename
4 years ago
Alexander Strizhakov
5f2071c458
changes after rebase
4 years ago
Alexander Strizhakov
7f5dbb0201
changes after rebase
4 years ago
Alexander Strizhakov
b081080dd9
fixes after rebase
4 years ago
Alexander Strizhakov
c4c5caedd8
changes after rebase
4 years ago
Alexander Strizhakov
1d0e130cb3
fixes after rebase
4 years ago
Alexander Strizhakov
0f8ab46a0e
fix after rebase
4 years ago
Alexander Strizhakov
207211a2b3
update files consistency after rebase
4 years ago
Alexander Strizhakov
9f4fe5485b
alias alphabetically order
4 years ago
Alexander Strizhakov
3ef4e9d170
AdminSecretAuthenticationPlug module name
4 years ago
Alexander Strizhakov
c497558d43
AuthenticationPlug module name
4 years ago
Alexander Strizhakov
c1777e7479
BasicAuthDecoderPlug module name
4 years ago
Alexander Strizhakov
970932689f
DigestPlug rename
4 years ago
Alexander Strizhakov
66e0b0065b
Cache plug module name
4 years ago
Alexander Strizhakov
c6baa811d6
EnsureAuthenticatedPlug module name
4 years ago
Alexander Strizhakov
011525a3d1
EnsurePublicOrAuthenticatedPlug module name
4 years ago
Alexander Strizhakov
8e301a4c37
EnsureUserKeyPlug module name
4 years ago
Alexander Strizhakov
d6cb1a3b46
ExpectAuthenticatedCheckPlug module name
4 years ago
Alexander Strizhakov
99e4ed21b1
ExpectPublicOrAuthenticatedCheckPlug module name
4 years ago
Alexander Strizhakov
8c993c5f63
FederatingPlug module name
4 years ago
Alexander Strizhakov
abc3c7689b
HTTPSecurityPlug module name and filename
4 years ago
Alexander Strizhakov
5cd7030076
IdempotencyPlug module name
4 years ago
Alexander Strizhakov
8dfaa54ffc
InstanceStatic module name
4 years ago
Alexander Strizhakov
e2332d92ce
LegacyAuthenticationPlug module name
4 years ago
Alexander Strizhakov
96d320bdfe
OAuthPlug module name
4 years ago
Alexander Strizhakov
a6d8cef33e
OAuthScopesPlug module name
4 years ago
Alexander Strizhakov
15772fda57
PlugHelper module name
4 years ago
Alexander Strizhakov
4b1863ca4e
RateLimiter module name
4 years ago
Alexander Strizhakov
3be8ab5103
RemoteIp module name
4 years ago
Alexander Strizhakov
4b4c0eef36
SessionAuthenticationPlug module name
4 years ago
Alexander Strizhakov
8249b75761
SetFormatPlug module name
4 years ago
Alexander Strizhakov
c97c7d982f
SetLocalePlug module name
4 years ago
Alexander Strizhakov
f7614d4718
SetUserSessionIdPlug module name
4 years ago
Alexander Strizhakov
d36c9e210a
StaticFEPlug module name
4 years ago
Alexander Strizhakov
a07688deb1
TrailingFormatPlug module name
4 years ago
Alexander Strizhakov
a5987155f7
UploadedMedia module name
4 years ago
Alexander Strizhakov
ebd6dd7c53
UserEnabledPlug module name
4 years ago
Alexander Strizhakov
61c609884c
UserFetcherPlug module name
4 years ago
Alexander Strizhakov
1d16cd0c3d
UserIsAdminPlug module name
4 years ago
Alexander Strizhakov
2125286e90
fix for fallback controller
4 years ago
Alexander Strizhakov
e267991a44
renaming LimiterSupervisor
4 years ago
Alexander Strizhakov
6a87f94ee2
renaming ratelimiter supervisor
4 years ago
Alexander Strizhakov
2501793f81
moving plugs into web dir
4 years ago
Alexander Strizhakov
0374df1d12
other files consistency
4 years ago
Alexander Strizhakov
fc7151a9c4
more files renamings
4 years ago
Alexander Strizhakov
e8e4034c48
metadata providers consistency
4 years ago
Alexander Strizhakov
b5b4395e4a
oauth consistency
4 years ago
Alexander Strizhakov
103f3dcb9e
rich media parser ttl files consistency
4 years ago
Alex Gleason
83ae45b000
Preload `/api/pleroma/frontend_configurations`, fixes #1932
4 years ago
Alex Gleason
66e00ace7c
Refactor User.post_register_action/1 emails
4 years ago
Alex Gleason
cb29769a22
Make User.confirm/1 and User.approve/1 idempotent
4 years ago
Alex Gleason
6ebec50df6
Refactor User.confirm/1, add more tests
4 years ago
Mark Felder
8539e386c3
Add missing Copyright headers
4 years ago
Alex Gleason
bb8c0614ef
Move admin approval email logic into User.post_register_action/1
4 years ago
Alex Gleason
521e965884
Registration tests
4 years ago
Alex Gleason
28005563f0
Send approval pending email during registration
4 years ago
Alex Gleason
c69b205409
Registration: user state is separate from instance state
4 years ago
Alex Gleason
b2fed59209
Handle User.post_register_action/1 in steps
4 years ago
Ivan Tashkinov
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Ivan Tashkinov
89c595b772
[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
4 years ago
Ivan Tashkinov
e1eb54d389
[ #3053 ] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
4 years ago
Mark Felder
3ca98878d2
Deep link to the user account in AdminFE in account confirmation emails
4 years ago
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
4 years ago
Alex Gleason
9c672ecbb5
Remote Timeline: add Streaming support
4 years ago
Alex Gleason
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
4 years ago
Alex Gleason
5ec7d88b77
Aliases: fix URL regex
4 years ago
Alex Gleason
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
4 years ago
Haelwenn
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
4 years ago
Mark Felder
ed6511a086
Lint
4 years ago
feld
d0eca5b125
Apply 2 suggestion(s) to 2 file(s)
4 years ago
Mark Felder
8156940a49
Compatibility with phoenix_pubsub 2.0.0
4 years ago
Mark Felder
70880d54f8
@env is not used
4 years ago
Mark Felder
42e78a08b2
Fix rendering of reports
4 years ago
feld
6d1666a080
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Mark Felder
218a3e61e1
Fix incompatible types warning (Elixir 1.11)
4 years ago
Mark Felder
d3106c69c8
Fix incompatible type (Elixir 1.11)
4 years ago
Mark Felder
636c00037d
Fix duplicate @doc entries
4 years ago
Egor Kislitsyn
bc3db72403
Use ModerationLog instead of Logger
4 years ago
Egor Kislitsyn
8545d533dd
Use to_string/1 instead of :binary.list_to_bin/1
4 years ago
Egor Kislitsyn
08972dd135
Use Path.join/2
4 years ago
Egor Kislitsyn
9af9f02f4b
Use Gettext for error messages
4 years ago
Egor Kislitsyn
d7a5291b4f
Use `Jason.encode/1` for likes and bookmarks
4 years ago
Egor Kislitsyn
8baee855d9
Fix emails
4 years ago
Egor Kislitsyn
e4792ce76a
Do not limit admins
4 years ago
Egor Kislitsyn
17562bf414
Move API endpoints to `/api/v1/pleroma/backups`
4 years ago
Egor Kislitsyn
a9efd441e2
Use `Pleroma.Repo.chunk_stream/2` instead of `Pleroma.RepoStreamer.chunk_stream/2`
4 years ago
Egor Kislitsyn
e50314d9d3
Fix export
4 years ago
Egor Kislitsyn
7c22c9afb4
Allow admins request user backups
4 years ago
Egor Kislitsyn
7fdd81d000
Add "Your backup is ready" email
4 years ago
Egor Kislitsyn
e52dd62e14
Add configurable temporary directory
4 years ago
Egor Kislitsyn
27bc121ec0
Require email
4 years ago
Egor Kislitsyn
cd13613db3
Fix query
4 years ago
Egor Kislitsyn
86ce4afd93
Improve backup urls
4 years ago
Egor Kislitsyn
2c73bfe122
Add API endpoints for Backups
4 years ago
Egor Kislitsyn
739cb1463b
Add backups deletion
4 years ago
Egor Kislitsyn
3ad7492f9d
Add config for Pleroma.Backup
4 years ago
Egor Kislitsyn
a0ad9bd734
Add BackupWorker
4 years ago
Egor Kislitsyn
4f3a633745
Add `backups` table
4 years ago
Egor Kislitsyn
75e07ba206
Fix tests
4 years ago
Egor Kislitsyn
be42ab70dc
Add backup upload
4 years ago
Egor Kislitsyn
c01a818048
Add tests
4 years ago
Egor Kislitsyn
9d564ffc29
Zip exported files
4 years ago
Egor Kislitsyn
257e059e61
Add account export
4 years ago
Mark Felder
7a2ed2fc90
Credo
4 years ago
Mark Felder
d43d05005a
Move hardcoded default configuration into config.exs
4 years ago
Mark Felder
cddca85c84
Merge branch 'develop' into revert/rich-media-censorship
4 years ago
rinpatch
2698bbc9f6
Merge branch 'filtering-following' into 'develop'
...
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
4 years ago
Ivan Tashkinov
6c2264af24
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Ivan Tashkinov
094edde7c4
[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
4 years ago
Haelwenn (lanodan) Monnier
f497eb034d
activity_pub_controller.ex: Remove unused @doc block
...
[ci skip]
4 years ago
Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
4 years ago
Mark Felder
35ee759e74
Add helper function to convert single IPs into CIDR format if they were not provided that way
4 years ago
rinpatch
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
4 years ago
Ivan Tashkinov
f6024252ae
[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
4 years ago
Ivan Tashkinov
0d575735bf
No auth check in UserController.feed_redirect/2, even on non-federating instances.
4 years ago
Ivan Tashkinov
7efadc3cbd
No auth check in OStatusController, even on non-federating instances.
4 years ago
Alexander Strizhakov
cbdaabad34
web push http_client fix
4 years ago
rinpatch
2566467782
Merge branch '2201-i-hate-this' into 'develop'
...
User search: Once again, change uri handling.
Closes #2201
See merge request pleroma/pleroma!3048
4 years ago
lain
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
4 years ago
rinpatch
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
4 years ago
Mark Felder
b3a9ba09ec
More robust expires_at timestamp processing
4 years ago
lain
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
4 years ago
Ivan Tashkinov
7d5c3883ac
[ #3031 ] Refactoring: moved system commands checks to ApplicationRequirements.
4 years ago
Mark Felder
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
4 years ago
Maksim Pechnikov
de993b856b
added `force` option to the unfollow operation
4 years ago
Ivan Tashkinov
4e4f771082
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
...
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
4 years ago
Mark Felder
dcdf75fbac
Merge branch 'develop' into fix/deprecation-warning-welcome-message
4 years ago
feld
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
4 years ago
Mark Felder
2bf2c68dee
Merge branch 'develop' into fix/deprecation-warning-welcome-message
4 years ago
rinpatch
5cd71208d9
Merge branch 'search-even-more' into 'develop'
...
More user search improvements
See merge request pleroma/pleroma!3032
4 years ago
rinpatch
f67c967c4a
Merge branch 'features/incoming-create-exists' into 'develop'
...
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
4 years ago
lain
05b5241314
Linter fixes
4 years ago
lain
a8c17ea25a
User Search: Also find user by uri
4 years ago
lain
d0078bc404
User Search: Boost resolved results and exact ap_id matches.
4 years ago
Alexander Strizhakov
5d7ec00bed
fixes after rebase
4 years ago
Alexander Strizhakov
8c6ec4c111
pack routes change
4 years ago
Alexander Strizhakov
dbbc801667
pagination for remote emoji packs
4 years ago
Alexander Strizhakov
9b6d89ff8c
support for special chars in pack name
4 years ago
Mark Felder
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
4 years ago
lain
e02101e15c
Merge branch 'issue/2115' into 'develop'
...
[#2115 ] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
4 years ago
lain
4dadb7c433
Merge branch 'user-query/filter-out-internal' into 'develop'
...
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
4 years ago
lain
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn (lanodan) Monnier
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
4 years ago
Roman Chvanikov
8f5589cf66
Merge develop
4 years ago
lain
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Maksim Pechnikov
72d2b34d3b
Merge branch 'develop' into issue/1975
4 years ago
Alex Gleason
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
4 years ago
Mark Felder
e2dcf039d2
Fix gun_pool_options deprecation warning message
4 years ago
Mark Felder
2fc3b46ee7
Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
4 years ago
lain
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
4 years ago
Egor Kislitsyn
0e0ece251a
Filter out internal users by default
4 years ago
lain
ee3052a2d8
ActivityPub: Return Announces when filtering by `following`.
4 years ago
Mark Felder
e5927e92a6
Fix deprecation warning for welcome message
4 years ago
feld
a5c34e3123
Merge branch 'fix/fedsocket-useragent' into 'develop'
...
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
4 years ago
Alex Gleason
23d5d7cf59
Fix #2172 HTTP error on password reset
4 years ago
Alex Gleason
8b6ac45f3c
Allow emails to be sent again, #2101 #2172
...
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
4 years ago
lain
59680f27ff
Merge branch 'bugfix/federator-actor-error' into 'develop'
...
federator: normalize only actor, catch actor error
See merge request pleroma/pleroma!2986
4 years ago
lain
9108e27c2f
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
...
[#2074 ] OAuth scope checking in Streaming API
Closes #2074
See merge request pleroma/pleroma!3013
4 years ago
lain
b36b6259d8
Merge branch 'issue/2099' into 'develop'
...
[#2099 ] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
4 years ago
Mark Felder
8afdbcdb1c
Force HTTP for fedsockets
4 years ago
lain
f2f0a0260f
ActivityPub: Don't block-filter your own posts
...
We are filtering out replies to people you block, but that should
not include your own posts.
4 years ago
Roman Chvanikov
28d0986f83
Refactor mutes removing in CommonAPI and User
4 years ago
Roman Chvanikov
4987ee6256
Merge branch 'develop' into feature/expire-mutes
4 years ago
Ivan Tashkinov
60b025b782
[ #2074 ] OAuth scope checking in Streaming API.
4 years ago
rinpatch
4b12e071ac
OpenAPI: make it possible to generate a spec without starting the app
...
Needed for api docs generation on pleroma.social that will come later
4 years ago
rinpatch
51116b5392
OpenAPI: fix various errors pointed out by editor.swagger.io
4 years ago
Mark Felder
26859c549c
Add user agent to fedsocket requests
4 years ago
Maksim Pechnikov
ed3bc53fa1
Merge branch 'develop' into issue/2099
4 years ago
feld
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
4 years ago
rinpatch
26c571df33
FedSockets: fix log spam on cached rejects
4 years ago
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
4 years ago
Maksim Pechnikov
2ec0dcf001
Merge branch 'develop' into issue/2099
4 years ago
Ivan Tashkinov
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn (lanodan) Monnier
7bf269fe83
Fix MRF reject for ChatMessage
4 years ago
Haelwenn (lanodan) Monnier
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
4 years ago
Haelwenn (lanodan) Monnier
3a0f99ed35
KeywordPolicy: Still match when fields are absent
4 years ago
Haelwenn
beefc022dd
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
...
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
4 years ago
feld
608824b97e
Merge branch 'instance-docs' into 'develop'
...
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
4 years ago
rinpatch
6bbd65fb09
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
...
[#2130 ] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
4 years ago
rinpatch
608017b7df
Merge branch 'fix/streaming-termination-errors' into 'develop'
...
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
4 years ago
Haelwenn
0465bdbd49
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
4 years ago
lain
bb70b231d0
Merge branch 'reply-visibility-user-guard' into 'develop'
...
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999
4 years ago
rinpatch
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
4 years ago
stwf
41939e3175
User search respect discoverable flag
4 years ago
rinpatch
eff7f9892d
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
...
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
4 years ago
rinpatch
dee4639dbb
Merge branch 'feat/rich-media-head' into 'develop'
...
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
4 years ago
Mark Felder
f7e40f7ef1
Deny ConfigDB migration when deprecated settings found
4 years ago
lain
2a7c9ac147
Merge branch 'nondiscoverable-user-metadata' into 'develop'
...
search indexing metadata should respect discoverable flag
See merge request pleroma/pleroma!2998
4 years ago
Ivan Tashkinov
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
Ivan Tashkinov
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
4 years ago
lain
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
...
# Conflicts:
# CHANGELOG.md
4 years ago
rinpatch
db80b9d630
RichMedia: Fix log spam on failures and resetting TTL on cached errors
4 years ago
eugenijm
c711a2b157
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
4 years ago
eugenijm
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
4 years ago
Roman Chvanikov
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
4 years ago
lain
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
4 years ago
Maksim Pechnikov
5a8ea0a5b0
small refactoring
4 years ago
Maksim Pechnikov
b867f9d7ae
Merge branch 'develop' into issue/2099
4 years ago