pleroma

phnt/pleroma

Fork 0

Commit Graph

Select branches

Hide Pull Requests

0-cycles-rough

1570-levenshtein-distance-user-search

1668/default-disable-prometheus

1754-bio-length-stable

1918-avatar-background-header-reset

2061-chat-deletion

2151-conversation-stream

2168-media-preview-proxy

2232-double-delete

2298-weird-follow-issue

2307-object-activities-index-issue

2788-fix-user-timeline-when-pins-are-nil

2795-small-fix-for-elixir-1-13

3259-objects-attachments-media-background-migration

add-assets-to-static-file-constants

akkoma/notifications-fix

alexgleason-oauth-form

arm64test

attachment-meta

birth-dates

blocking-use-index

bookwyrm-entities

bugfix/apc2s-published

bugfix/erlang-24-format

bugfix/inline-image-class

bugfix/non-ap_enabled-direct_follow

build-docker/feature/object-hashtags-rework

changelog-update

chore/benchmark-dedicated-db

chore/expose-invalidation-to-adminfe

chore/tag-settings-with-reboot

chore/unhide-features

chore/update-floki-find-usage

chores/non-pipeline-cleanup

chores/our-libs-hex-releases

cleanup/ostatus-user-upgrade

cockroachdb

contrib/munin-healthcheck

csp-flash

cycles

cycles-config-url

cycles-context

cycles-ensure-plug

cycles-validator

debug-remote-ip

delete-chats-for-deleted-users

deps-update

descriptions-automatic-tabs

develop

disable-instance-preload

distro-docs-elixir-1.11

docs-asdf

earmark

elixir-1.11-ci

email-list

endpoint-url

feat/fedsocket-simplify

feat/heif-upload-filter

feat/mrf-dnsrbl

feat/user-deletion-transaction

feature/1392-support-irreversible-filters

feature/1820-unify-settings

feature/1902-attachment-filename

feature/2145-installer-and-configdb-changes

feature/2295-email-mention-notification

feature/2389-adding-tabs-into-descriptions

feature/2515-admin-statuses

feature/add-subject-to-text-search

feature/compile_get

feature/config-versioning

feature/dynamic-supervisor

feature/installer

feature/mrf_auto_subject

feature/reply-filtering-mk3

feature/undo-validator

feature/update-description-for-dynamic-render

feature/user-whitelist

features/ap_c2s_proxyUrl

features/attachment_direct

features/attachment_validator

features/emoji_reactions_list

features/ingestion-listen

features/ingestion-unfollow

features/link-previews-disable-remote

features/mrf-id_filter

features/validators-note-2

feld/debugging

fep-fffd-url

finch_everywhere

finger

fix-home-timeline

fix-tags-again

fix/1518-admin-reports-timeout

fix/1604-emoji-path

fix/1650-domain-mutes

fix/2189-remote-user-deletion

fix/admin-api-grouped-reports-closed-reports

fix/articlenote-fixup-attachments

fix/disable-favicons-in-tests

fix/dont-expose-remote-accounts-to-search-engines

fix/epmd-loopback

fix/featured-collection-without-orderedItems-property

fix/grouped-reports-for-deprecated-format

fix/http_secury_plug

fix/mediaproxy-http-invalidation

fix/newlines-in-push-and-link-previews

fix/user-delete

flag-stuff

floki-fast_html-2-electric-boogalo

fluffytail

fluffytail-dev

fluffytail-dev-oban

fluffytail-follows

fluffytail-v2.7

followers-export

frontend-caching

frontend-dl-task

frontend-enable

frontends/logic-flow

frontends/static

gin-speedup

groups

gun-memory-leak

hj-develop-patch-68148-maintainers

ilja_simple_policy_reasons_for_instance_specific_policies

image-description-summary

inner-joins

instance-nodeinfo-metadata

instance-view-recompilation

integration/alex.s/gun

issue/1469

issue/1969

issue/2190

issue/2205

issue/2315-poll-notify

maint/niou-curses

make-hashtags-fast-again

matrix

matrix-explorations

media-mime-filter

media-preview-proxy

message-debug-mode

mongoose-im-deactivated-users

mrf-hashtag-default

mrf-tuples-fix

namespace-move-notification

new_users_digest

note-update

nsfw-api-mrf

object-flake

object-id-column

openbsd-docs

operation-warpsneed

phoenix1.7

pleroma-fe-2020-05-01-c67e9daf

poll-notification-fixes

quote-post

rate-limiter-compile-time-and-runtime-settings-mix-with-increased-complexity

refactor/fe-bundles

refactor/start-restart-pleroma

refactor/uploads

relay-list-change-for-stable

release/1.0

release/1.0.1

release/1.0.2

release/1.0.3

release/1.0.4

release/1.0.5

release/1.0.6

release/2.2.3

remote-follow-auth-fix

remove-scrobbles

request-logger

revert-6dd1575c

revert-mediaproxy-host-validation

revert/attachment-cleanup

rich-media

simplePolicy_reasons_for_instance_specific_policies

stable

status-view

store-ip

systemd-template-unit

telemtry

test-speedup

test/buildperf

tests/openapi-oauth

thumbnail-proxy

tusooa/3018-unified-stream

tusooa/3054-banned-delete

tusooa/media-altdomain

unused_indexes

use-system-time

vips

weblate

weblate-extract

youtube-fix

2.6.1

v0.9.9

v0.9.99

v0.9.999

v0.9.9999

v0.9.99999

v1.0.0

v1.0.1

v1.0.2

v1.0.3

v1.0.4

v1.0.5

v1.0.6

v1.0.7

v1.0.90

v1.0.91

v1.1.0

v1.1.1

v1.1.2

v1.1.3

v1.1.4

v1.1.5

v1.1.6

v1.1.7

v1.1.8

v1.1.9

v2.0.0

v2.0.1

v2.0.2

v2.0.3

v2.0.4

v2.0.5

v2.0.6

v2.0.7

v2.1.0

v2.1.1

v2.1.2

v2.2.0

v2.2.1

v2.2.2

v2.3.0

v2.4.0

v2.4.1

v2.4.2

v2.4.3

v2.4.4

v2.4.5

v2.5.0

v2.5.1

v2.5.2

v2.5.3

v2.5.4

v2.5.5

v2.6.0

v2.6.1

v2.6.2

v2.7.1

b99f5d6183

Emoji: split qualification variation into a module Hélène 2022-07-26 01:38:59 +02:00
230ec88dc7 Merge branch 'authorized-fetch' into 'develop' marcin mikołajczak 2022-07-25 17:54:26 +00:00
5153eba3a8 Add authorized_fetch_mode to description.exs marcin mikołajczak 2022-07-25 19:53:01 +02:00
fb3f6e1975

EmojiReactValidator: use new qualification method Hélène 2022-07-25 16:49:23 +02:00
01d396585e

Emoji: implement full-qualifier using combinations Hélène 2022-07-25 16:20:12 +02:00
d39f803bdd Merge branch 'fix/emoji-react-qualification' into 'develop' tusooa 2022-07-24 21:36:43 +00:00
193d611f60 Merge branch 'fix/emoji-react-qualification' into 'develop' Hélène 2022-07-24 11:41:30 +00:00
388bbc4978

EmojiReactValidator: fix emoji qualification Hélène 2022-07-24 13:31:35 +02:00
997f08b350

Make AntiLinkSpamPolicy history-aware Tusooa Zhu 2022-07-24 00:18:09 -04:00
d877d2a4e7

Make HashtagPolicy history-aware Tusooa Zhu 2022-07-24 00:02:39 -04:00
82c8fc1ede

Make NoEmptyPolicy work with Update Tusooa Zhu 2022-07-23 23:24:25 -04:00
46a5c06853

Make NormalizeMarkup history-aware Tusooa Zhu 2022-07-23 22:50:38 -04:00
fc7ce5f93c

Make NoPlaceholderTextPolicy history-aware Tusooa Zhu 2022-07-23 22:41:04 -04:00
dce7e42928

Make MediaProxyWarmingPolicy history-aware Tusooa Zhu 2022-07-23 22:34:03 -04:00
0a337063e1

Make ForceMentionsInContent history-aware Tusooa Zhu 2022-07-23 22:23:57 -04:00
cd19537f39

Make EnsureRePrepended history-aware Tusooa Zhu 2022-07-23 17:48:39 -04:00
eba9b0760f

Make MRF Keyword history-aware Tusooa Zhu 2022-07-23 15:56:36 -04:00
301ce5bc62 Merge branch 'mute-expiration' into 'develop' tusooa 2022-07-23 00:34:15 +00:00
8b11f2b9f0 Merge branch 'mute-expiration' into 'develop' marcin mikołajczak 2022-07-23 00:33:01 +00:00
21e587ff1a Merge branch 'revert-454f892f' into 'develop' Haelwenn 2022-07-22 23:56:52 +00:00
1e3910334e Merge branch 'revert-454f892f' into 'develop' Haelwenn 2022-07-22 23:19:56 +00:00
cfb21d011f Revert "Merge branch 'fix/emoji-react-qualification' into 'develop'" Haelwenn 2022-07-22 23:19:49 +00:00
e077da27fe Merge branch 'weblate' into 'develop' Haelwenn 2022-07-22 22:46:37 +00:00
e6a602e435 Merge branch 'weblate' into 'develop' weblate bot 2022-07-22 21:25:12 +00:00
c057ec6878 Translated using Weblate (French) Haelwenn 2022-07-22 01:36:46 +00:00
4217ac4074 Translated using Weblate (Chinese (Simplified)) Yating Zhan 2022-07-22 14:48:46 +00:00
1b091c7950 Translated using Weblate (Chinese (Simplified)) tusooa 2022-07-22 14:45:37 +00:00
0ad115ddf0 Translated using Weblate (Chinese (Simplified)) Yating Zhan 2022-07-22 13:06:52 +00:00
a543161ba9 Translated using Weblate (Chinese (Simplified)) Yating Zhan 2022-07-22 14:42:26 +00:00
2fffca8ef3 Translated using Weblate (Chinese (Simplified)) Yating Zhan 2022-07-22 13:12:08 +00:00
13e41ab8ba Translated using Weblate (Chinese (Simplified)) tusooa 2022-07-22 03:44:10 +00:00
ca8341a96c Translated using Weblate (Chinese (Simplified)) tusooa 2022-07-21 23:56:00 +00:00
5ca95a4f1a Translated using Weblate (Chinese (Simplified)) Yating Zhan 2022-07-22 13:37:40 +00:00
aff4d5df1c Translated using Weblate (Chinese (Simplified)) tusooa 2022-07-22 03:31:26 +00:00
48bd45acec Translated using Weblate (Chinese (Simplified)) tusooa 2022-07-22 03:12:18 +00:00
0b2243f17e Translated using Weblate (French) Haelwenn 2022-07-21 23:19:55 +00:00
9399fd4abd Translated using Weblate (French) Haelwenn 2022-07-21 22:58:48 +00:00
54cf23f2f8 Translated using Weblate (Chinese (Simplified)) tusooa 2022-07-21 23:01:58 +00:00
8b55661ae6 Translated using Weblate (Chinese (Simplified)) tusooa 2022-07-21 22:59:36 +00:00
8c3684ee8c Added translation using Weblate (French) Haelwenn 2022-07-21 23:09:30 +00:00
bc488824f8 Added translation using Weblate (French) Haelwenn 2022-07-21 23:09:19 +00:00
77ebde450e Translated using Weblate (French) Haelwenn 2022-07-21 20:45:10 +00:00
21bd168226 Translated using Weblate (Chinese (Simplified)) tusooa 2022-07-21 21:08:08 +00:00
6da0b50645 Translated using Weblate (French) Haelwenn 2022-07-21 20:06:21 +00:00
37ea9e014a Added translation using Weblate (French) Haelwenn 2022-07-21 20:42:56 +00:00
99ad602577 Added translation using Weblate (French) Haelwenn 2022-07-21 20:03:35 +00:00
cc40640f54 Translated using Weblate (Chinese (Simplified)) tusooa 2022-07-21 01:26:20 +00:00
ffe8459349 Added translation using Weblate (Chinese (Simplified)) tusooa 2022-07-21 01:21:26 +00:00
3b2bac7a0f Merge branch 'fix-owncast' into 'develop' Haelwenn 2022-07-22 19:00:23 +00:00
c5fb2bec30 Merge branch 'fix-owncast' into 'develop' Haelwenn 2022-07-22 18:31:03 +00:00
eba1666575 AttachmentValidator: fix_media_type/1 fallback to application/octet-stream Haelwenn (lanodan) Monnier 2022-07-22 20:22:44 +02:00
09e0304b9c Add test for broken owncast federation FloatingGhost 2022-07-01 11:44:45 +01:00
be98900904 ArticleNotePageValidator: Fix when attachments are a Map (ie. owncast) Haelwenn (lanodan) Monnier 2022-07-22 20:02:53 +02:00
e6a0afde63 Merge branch 'quote-post' into 'develop' Alex Gleason 2022-07-22 09:47:47 +00:00
d001a48a4c Merge branch 'fix/articlenote-fixup-attachments' into 'develop' a1batross 2022-07-21 23:09:31 +00:00
c589b8445f Merge branch 'birthday_fix' into 'develop' tusooa 2022-07-21 21:27:16 +00:00
0806ae67a9 Merge branch 'birthday_fix' into 'develop' marcin mikołajczak 2022-07-21 17:47:54 +00:00
454f892f37 Merge branch 'fix/emoji-react-qualification' into 'develop' Haelwenn 2022-07-21 17:45:47 +00:00
4350a205a4

Merge remote-tracking branch 'upstream/develop' into HEAD Tusooa Zhu 2022-07-21 13:44:16 -04:00
411375ddbb Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2022-07-21 10:25:25 -05:00
f5adc68aaf Merge branch 'from/upstream-develop/tusooa/2050-avatar-style' into 'develop' tusooa 2022-07-21 08:05:44 +00:00
1b9e9885ad Merge branch 'fix/emoji-react-qualification' into 'develop' Hélène 2022-07-21 07:53:36 +00:00
1f18ab36b5 Merge branch 'resolve/notice-compatibility-routes-nginx' into 'develop' Haelwenn 2022-07-20 16:57:05 +00:00
e885da03a8 Merge branch 'resolve/notice-compatibility-routes-nginx' into 'develop' Sean King 2022-07-20 16:56:08 +00:00
fff7571e0d Merge branch 'fix-cycles' into 'develop' Haelwenn 2022-07-20 16:52:15 +00:00
240b167a67 Merge branch 'fix-cycles' into 'develop' Haelwenn 2022-07-20 15:50:24 +00:00
65a5c713e9 CI: Remove cache on cycles Haelwenn (lanodan) Monnier 2022-07-20 17:49:56 +02:00
ba31af021c Fix flaky/erratic tests in Pleroma.Config.TransferTaskTest Ilja 2022-07-20 11:53:54 +02:00
9a6280cdb9 Fix warnings ":logger is used by the current application but the current application does not depend on :logger" Ilja 2022-07-20 13:17:44 +02:00
3da1b2548d

Actually fix with forward slashes being restricted inside nickname Sean King 2022-07-18 21:30:57 -06:00
8a16504ce1 set upload to local for failing tests Ilja 2022-07-18 10:58:46 +02:00
1a67a20364 Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:40:24 +00:00
f9fc3a153d Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:40:10 +00:00
ce0a6737e7 Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:40:02 +00:00
97e8c8a10a Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:39:26 +00:00
d24d74b1a7 Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:39:21 +00:00
db789acf1e Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:39:11 +00:00
d622fe8d48 Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:39:03 +00:00
02b4b4da47 Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:38:45 +00:00
02947bafeb Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:38:30 +00:00
ad730c2135 Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:38:23 +00:00
2baf3084a1 Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:38:01 +00:00
92da9c4a47 Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:37:41 +00:00
275c60208b Apply ilja's suggestion(s) to 1 file(s) Hélène 2022-07-18 05:37:27 +00:00
2c7eed122e

Don't accept forward slash character for nicknames Sean King 2022-07-17 12:50:01 -06:00
fb268c4378 Allow to unset birthday marcin mikołajczak 2022-07-17 19:46:29 +02:00
3193f18cf3 Merge branch 'shrink-ci' into 'develop' Haelwenn 2022-07-17 17:34:47 +00:00
4d4a573593 Merge branch 'shrink-ci' into 'develop' Haelwenn 2022-07-17 17:34:36 +00:00
bb4860e222 Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop' Haelwenn 2022-07-17 17:34:21 +00:00
d00fea05bb Improve test after code review Ilja 2022-07-17 16:55:52 +02:00
64e16e6a4b

Document way to do notice compatibility routes with Nginx reverse-proxy instead Sean King 2022-07-16 23:44:37 -06:00
1f0d9a9b4d Merge branch 'from/upstream-develop/tusooa/config-translatable' into 'develop' tusooa 2022-07-17 03:56:28 +00:00
8aba7c08d1 Merge branch 'notification_types' into 'develop' tusooa 2022-07-17 03:17:43 +00:00
3eee8a6336 Merge branch 'notification_types' into 'develop' marcin mikołajczak 2022-07-17 03:14:45 +00:00
eb4b7f6efa Merge branch 'docs__setting_up_a_gitlab_runner' into 'develop' tusooa 2022-07-17 02:36:28 +00:00
597f56b4c4 Use :utc_datetime marcin mikołajczak 2022-07-16 16:09:47 +02:00
a4097e0802 Set uploader to Pleroma.Uploaders.Local for failing tests Ilja 2022-07-16 13:13:20 +02:00
8113dd31ee

Add api docs for settings endpoint Tusooa Zhu 2022-07-16 01:27:16 -04:00
8371fd8ca2

Implement settings api Tusooa Zhu 2022-07-16 01:20:25 -04:00
d368f37ead fix flaky test filter_controller_test.exs:200 Ilja 2022-07-15 22:37:30 +02:00