Fork of Pleroma with site-specific changes and feature branches
https://git.pleroma.social/pleroma/pleroma
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Tree:
13cc52dc60
feature/docker-compose
feature/saner-totp
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
3259-objects-attachments-media-background-migration
add-assets-to-static-file-constants
alexgleason-oauth-form
arm64test
attachment-meta
block-behavior
bugfix/erlang-24-format
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
contrib/munin-healthcheck
cycles
cycles-config-url
cycles-context
cycles-ensure-plug
cycles-validator
debug-remote-ip
delete-chats-for-deleted-users
deletion-resilience
descriptions-automatic-tabs
develop
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/1469-webfinger-expanding
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/image-object
features/ingestion-listen
features/ingestion-unfollow
features/link-previews-disable-remote
features/validators-note-2
fix-object-deletion-timeout
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/disable-favicons-in-tests
fix/dont-expose-remote-accounts-to-search-engines
fix/epmd-loopback
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
flash-support-csp
floki-fast_html-2-electric-boogalo
frontend-dl-task
frontend-enable
frontends/logic-flow
frontends/static
gin-speedup
groups
gun-memory-leak
ilja_simple_policy_reasons_for_instance_specific_policies
instance-deletion
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-explorations
media-preview-proxy
message-debug-mode
moderators
mongoose-im-deactivated-users
mrf-hashtag-default
namespace-move-notification
note-update
notice-routes
nsfw-api-mrf
object-id-column
pleroma-fe-2020-05-01-c67e9daf
poll-notification-fixes
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
revert-6dd1575c
revert/attachment-cleanup
rich-media
simplePolicy_reasons_for_instance_specific_policies
stable
store-ip
test-speedup
test/buildperf
tests/openapi-oauth
thumbnail-proxy
use-system-time
userfeed-fe-fallback
warnings-as-errors
youtube-fix
v2.4.1
v2.4.0
v2.3.0
v2.2.2
v2.2.1
v2.2.0
v2.1.2
v2.1.1
v2.1.0
v2.0.7
v2.0.6
v2.0.5
v2.0.4
v2.0.3
v2.0.2
v2.0.1
v2.0.0
v1.1.9
v1.1.8
v1.1.7
v1.1.6
v1.1.5
v1.1.4
v1.1.3
v1.1.2
v1.1.1
v1.1.0
v1.0.91
v1.0.90
v1.0.7
v1.0.6
v1.0.5
v1.0.4
v1.0.3
v1.0.2
v1.0.1
v1.0.0
v0.9.99999
v0.9.9999
v0.9.999
v0.9.99
v0.9.9
Ivan Tashkinov
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs |
4 years ago | |
|---|---|---|
| .. | ||
| tasks/pleroma | Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation | 4 years ago |
| pleroma.ex | Bump copyright years of files changed in 2019 | 4 years ago |