limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
12067 commits 27 branches 107 tags 315 MiB
Commit graph

12067 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
2a7c9ac147 Merge branch 'nondiscoverable-user-metadata' into 'develop' 
search indexing metadata should respect discoverable flag

See merge request pleroma/pleroma!2998
 2020-09-17 14:20:03 +00:00
Ivan Tashkinov
d9fb5bc08a Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 2020-09-17 17:14:20 +03:00
Ivan Tashkinov
7cdbd91d83 [#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests. 2020-09-17 17:13:40 +03:00
rinpatch
cd93aa2aed Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop' 
RichMedia: Fix log spam on failures and resetting TTL on cached errors

See merge request pleroma/pleroma!3006
 2020-09-17 14:13:24 +00:00
lain
7c60789ba5 Merge branch 'develop' into 'nondiscoverable-user-metadata' 
# Conflicts:
#   CHANGELOG.md
 2020-09-17 14:09:01 +00:00
rinpatch
db80b9d630 RichMedia: Fix log spam on failures and resetting TTL on cached errors 2020-09-17 16:56:39 +03:00
eugenijm
c711a2b157 Return the file content for GET /api/pleroma/admin/instance_document/:document_name 2020-09-17 16:55:53 +03:00
stwf
f58262c673 add description to changelog 2020-09-17 09:48:17 -04:00
eugenijm
582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API 2020-09-17 16:48:07 +03:00
lain
5426eb5997 Merge branch 'chat-moderation' into 'develop' 
Chat moderation MVP

See merge request pleroma/pleroma!2937
 2020-09-17 11:56:30 +00:00
lain
5e3c70afa5 AdminAPI Chat tests: Remove factory. 
The factory system doesn't work too well with how the chats are
done. Instead of tempting people to use it, let's rather use the
CommonAPI system for now.
 2020-09-17 13:37:25 +02:00
lain
e39ff2616b Admin chat api tests: Small additions. 2020-09-17 13:29:26 +02:00
lain
7a73850928 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation 2020-09-17 13:26:04 +02:00
Maksim Pechnikov
5a8ea0a5b0 small refactoring 2020-09-17 09:13:43 +03:00
Maksim Pechnikov
b867f9d7ae Merge branch 'develop' into issue/2099 2020-09-17 08:41:35 +03:00
Ivan Tashkinov
a781f41f96 [#2497] Media preview proxy: misc. improvements (static param support, dynamic fifo pipe path), refactoring. 2020-09-16 22:30:42 +03:00
feld
c5acbf8a1b Merge branch 'chore/unused-import' into 'develop' 
Remove unused import

See merge request pleroma/pleroma!3004
 2020-09-16 16:12:22 +00:00
Mark Felder
73e0e6a8a2 Remove unused import 2020-09-16 10:56:42 -05:00
rinpatch
3a9baa9d0d Merge branch '2144-empty-users' into 'develop' 
User: Remote users don't need to be confirmed or approved

Closes #2144

See merge request pleroma/pleroma!3003
 2020-09-16 15:47:07 +00:00
lain
7a88b726bf User: Remote users don't need to be confirmed or approved 2020-09-16 17:29:16 +02:00
rinpatch
a4f80e1e74 Merge branch 'feat/connection-worker-monitor-flush' into 'develop' 
ConnectionPool Worker: use monitor flush instead of checking ref

See merge request pleroma/pleroma!3002
 2020-09-16 15:10:20 +00:00
rinpatch
adb1b0282d ConnectionPool Worker: use monitor flush instead of checking ref 
`:flush` removes the DOWN message if one had arrived, so this check
should no longer be necessary.
 2020-09-16 17:29:07 +03:00
rinpatch
eca8d26784 Merge branch 'chores/mrf-loglevel' into 'develop' 
Fetcher: Correctly return MRF reject reason

See merge request pleroma/pleroma!2990
 2020-09-16 13:37:04 +00:00
rinpatch
adbd0032fa Merge branch 'features/validators-video' into 'develop' 
Pipeline Ingestion: Video and Article

See merge request pleroma/pleroma!2908
 2020-09-16 13:36:27 +00:00
lain
6b088ed76a Merge branch 'issue/2089' into 'develop' 
[#2089] fix notifications

See merge request pleroma/pleroma!3000
 2020-09-16 12:22:48 +00:00
Maksim Pechnikov
599f8bb152 RepoStreamer.chunk_stream -> Repo.chunk_stream 2020-09-16 09:47:18 +03:00
Maksim
c74fad9e06 Apply 1 suggestion(s) to 1 file(s) 2020-09-16 03:18:50 +00:00
Ivan Tashkinov
2f155fb89f Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 2020-09-15 20:29:39 +03:00
Maksim Pechnikov
f879d07fa1 fixed tests 2020-09-15 15:32:49 +03:00
lain
cfad4f46b2 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
 2020-09-15 12:21:38 +00:00
eugenijm
3ab59a6f3c Mastodon API: fix the public timeline returning an error when the reply_visibility parameter is set to self for an unauthenticated user 2020-09-15 13:00:56 +03:00
Haelwenn
5c4ff5c73c 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
 2020-09-15 08:25:10 +00:00
Mark Felder
0b66e806e3 Move changelog entry to next patch 2020-09-14 17:11:08 -05:00
Mark Felder
709723182d Ensure SimplePolicy's tags in string representation don't trip up the object validator 2020-09-14 17:06:42 -05:00
stwf
f900a40d5d fix credo warning 2020-09-14 13:55:49 -04:00
stwf
38b2db297b search indexing metadata respects discoverable flag 2020-09-14 13:18:11 -04:00
Mark Felder
118bf6e92b Fixed Welcome chats with MRF Simple applied locally 2020-09-14 12:08:32 -05:00
Mark Felder
25d1caf1dd Merge duplicate Changed sections 2020-09-14 12:07:31 -05:00
Mark Felder
d31f0393bf Validate Welcome Chat message works with Simple policy applied to local instance 2020-09-14 12:06:08 -05:00
rinpatch
39d769f250 Merge branch 'remove/managed-config-option' into 'develop' 
Remove `:managed_config` option.

Closes #2086

See merge request pleroma/pleroma!2983
 2020-09-14 15:19:09 +00:00
rinpatch
0b5e72ecf0 Remove :managed_config option. 
In practice, it was already removed half a year ago, but the description
 and cheatsheet entries were still there.

The migration intentionally does not use ConfigDB.get_by_params, since
this will break migration code as soon as we add a new field is added
 to ConfigDB.

Closes #2086
 2020-09-14 18:04:16 +03:00
rinpatch
6e70415e4a Merge branch 'hotfix/rich-media-compile-error' into 'develop' 
RichMedia: fix a compilation error due to nonexistent variable

See merge request pleroma/pleroma!2996
 2020-09-14 12:48:27 +00:00
rinpatch
bb407edce4 RichMedia: fix a compilation error due to nonexistent variable 
No idea why this passed Gitlab CI
 2020-09-14 15:46:00 +03:00
rinpatch
4d543fcb75 Merge branch 'feat/rich-media-head' into 'develop' 
RichMedia: Do a HEAD request to check content type/length

See merge request pleroma/pleroma!2995
 2020-09-14 12:38:00 +00:00
rinpatch
738685a629 Apply 1 suggestion(s) to 1 file(s) 2020-09-14 11:56:00 +00:00
rinpatch
f70335002d RichMedia: Do a HEAD request to check content type/length 
This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).
 2020-09-14 14:45:58 +03:00
rinpatch
f66a15c4a5 RichMedia parser: do not set a cache TTL for unchanging errors 2020-09-14 14:44:25 +03:00
Maksim Pechnikov
3e53ab4e98 added notification constraints 2020-09-14 14:08:12 +03:00
rinpatch
2937e3095a Merge branch 'fix/2139-oban-migration' into 'develop' 
Remove old workers in oban migrations

Closes #2139

See merge request pleroma/pleroma!2994
 2020-09-14 07:54:06 +00:00
Maksim
489a107cf4 Apply 1 suggestion(s) to 1 file(s) 2020-09-13 11:54:15 +00:00