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

Mono Color

• ac7580df78 Merge branch 'fix/background-profile-fetch' into 'develop' lambda 2018-01-16 14:18:07 +0000
• 6678fe3217 Add a Caddyfile. eal 2018-01-16 15:48:27 +0200
• b3e7d7ae6d Fetch external profile in the background. eal 2018-01-16 15:31:03 +0200
• 80f6ac412a Merge branch 'default-pictures' into 'develop' eal 2018-01-15 20:26:49 +0000
• 14b086eec2 Add a default profile picture and banner. eal 2018-01-15 22:18:17 +0200
• baf66caefd Merge branch 'prod.exs' into 'develop' eal 2018-01-15 17:44:49 +0000
• db5dfd1b3e Merge branch 'fix/pleroma.nginx' into 'develop' eal 2018-01-15 17:26:41 +0000
• 5a6f54b336 Merge branch 'stats-daemon' into 'develop' lambda 2018-01-15 08:04:54 +0000
• aceef36e56 Correct pleroma.nginx Hakaba Hitoyo 2018-01-14 10:57:25 +0000
• 048f61d7f8 #95 Correct prod.exs Hakaba Hitoyo 2018-01-14 08:54:28 +0000
• 6e1cb86166 Fix instance test. eal 2018-01-14 08:28:35 +0200
• d8db39564e Move user count to stats agent. eal 2018-01-14 08:15:11 +0200
• 9717166d10 Add a stats agent for storing data from expensive queries. eal 2018-01-13 18:24:16 +0200
• d49109ca17 Merge branch 'add-mediaproxy-question-to-configgen' into 'develop' eal 2018-01-12 20:57:31 +0000
• d56ab43609 Ask for proxy URL if proxy enabled. eal 2018-01-12 22:38:14 +0200
• 29b7e822fb
  added question about activating mediaproxy to config generator Sebastian Huebner 2018-01-09 12:31:11 +0100
• 1e185b9301
  apply proxy settings to media_proxy Jeff Becker 2017-12-31 09:25:00 -0500
• 39854d6c11
  clarify Jeff Becker 2017-12-30 13:04:26 -0500
• 658c4754ff
  docs Jeff Becker 2017-12-30 13:02:51 -0500
• 5ddd15d794
  make httppoison use configurable http proxy Jeff Becker 2017-12-30 11:35:53 -0500
• 5c09d8d3f1 Unlink follow import process from the one processing request. eal 2017-12-23 16:40:43 +0200
• ad180ad6dd Merge branch 'media-proxy-fix-encoding' into 'develop' lambda 2017-12-22 12:07:10 +0000
• 0ccd0e5cc9
  Remove a useless URI.encode call in MediaProxy href 2017-12-21 20:59:10 +0100
• 35ac549a99 Merge branch 'media-proxy' into 'develop' lambda 2017-12-20 14:22:24 +0000
• 2a744cdff8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Lain Iwakura 2017-12-19 16:15:45 +0100
• f1f79c0dca Fix timelines in subway tooter. Lain Iwakura 2017-12-19 16:15:07 +0100
• 29c9812789 Merge branch 'fix/twitterapi-follow-lists' into 'develop' lambda 2017-12-18 22:44:15 +0000
• 47887ac848 MastoAPI: Fix always-sensitive bugs. Lain Iwakura 2017-12-18 16:56:03 +0100
• 846d59a536 Send out salmons before websub. Lain Iwakura 2017-12-18 16:16:22 +0100
• 1969773fb4 Fix follower/following lists. eal 2017-12-18 16:23:04 +0200
• 6b48489237 Merge branch 'feature/follow-import' into 'develop' lambda 2017-12-18 10:59:57 +0000
• fdfb508259 Run follow import in the background. eal 2017-12-12 21:04:41 +0200
• d89193a8d7 Allow uploading a file for follow import. eal 2017-12-12 21:03:28 +0200
• 4a13b84887 Add recipients field to activities. Lain Iwakura 2017-12-12 18:07:14 +0100
• 39ccfdc084 Add follow import. eal 2017-12-12 18:35:23 +0200
• f909aec050
  proxy emojis href 2017-12-12 12:30:24 +0100
• 8e82547179
  fix content-type and fallback to image/jpeg href 2017-12-12 11:45:55 +0100
• 888ec9e579 ActivityPub: Check inbox requests for valid signature. Roger Braun 2017-12-12 10:17:50 +0100
• a9c23e1c32 Add plug to validate signed http requests. Roger Braun 2017-12-12 10:17:21 +0100
• 9223038319 Fix some more tests. eal 2017-12-11 21:01:36 +0200
• e2e6365035 ActivityPub: Add controller tests. Lain Iwakura 2017-12-11 18:22:48 +0100
• 64330d9455 ActivityPub: Add object routes / controller. Lain Iwakura 2017-12-11 18:21:33 +0100
• a89a613e4e ActivityPub: Use only string keys in views. Lain Iwakura 2017-12-11 18:20:41 +0100
• da005d3332 ActivityPub: Add Objects View. Lain Iwakura 2017-12-11 18:19:46 +0100
• 79b3397c17 Fix tests. eal 2017-12-11 18:41:03 +0200
• 4b06e46a3a Merge branch 'fix/tootdon-mentions' into 'develop' lambda 2017-12-11 16:21:43 +0000
• b00e230760 Add a bunch of useless HTML to mentions. eal 2017-12-11 18:14:33 +0200
• c3bcafc51b HTTPSig: Add method to validate conn Roger Braun 2017-12-11 10:37:40 +0100
• 5599c5920c Basic incoming AP support. Roger Braun 2017-12-11 10:37:22 +0100
• 9093b2cf49
  Merge remote-tracking branch 'upstream/develop' into media-proxy href 2017-12-11 02:45:28 +0100
• d1806ec07f
  nginx sample config, quickly tested href 2017-12-11 02:40:19 +0100
• 077faaed8c
  Limit body size to 25MB href 2017-12-11 02:31:37 +0100
• 25118aeef7 Add link to AP address in webfinger. Roger Braun 2017-12-09 15:34:43 +0100
• 30e9b22f96 Merge branch 'develop' into feature/activitypub Roger Braun 2017-12-09 11:00:56 +0100
• d5a13c10ac Merge branch 'feature/user_deletion' into develop Roger Braun 2017-12-09 10:10:45 +0100
• ef2322bdb7 Delete notifications on activity deletion. Lain Iwakura 2017-12-08 18:17:30 +0100
• bad499b3fd Basic user deletion. Lain Iwakura 2017-12-08 17:50:11 +0100
• 35cfbf43a0 Merge branch 'fix/linkify' into 'develop' lambda 2017-12-08 12:34:03 +0000
• 40c30ab895 Merge branch 'fix/mastoapi-attachment-linking' into 'develop' lambda 2017-12-08 12:32:33 +0000
• d7da3ca05d Merge branch 'postgresetup' into 'develop' lambda 2017-12-08 12:31:14 +0000
• a3e68f0233 Allow parentheses in links. eal 2017-12-07 21:38:31 +0200
• bf91e5659f Fix HTML escape breaking some links. eal 2017-12-07 21:34:25 +0200
• 5436dbaeaf MastoAPI: don't add attachment links. eal 2017-12-07 20:44:09 +0200
• afd0ea37f3 Add websocket upgrade to example nginx config. eal 2017-12-07 20:07:51 +0200
• 6df6ad0b42 User deletion: Remove relationships. Lain Iwakura 2017-12-07 18:13:05 +0100
• a78ae2a685 Don't follow deactivated users. Lain Iwakura 2017-12-07 17:51:55 +0100
• b727ecc5e7 Add function to deactivate users. Lain Iwakura 2017-12-07 17:47:23 +0100
• 0ec5aeb8a7 Don't log in deactivated users. Lain Iwakura 2017-12-07 17:41:34 +0100
• e31a5ff4af Priority queue fixes. Lain Iwakura 2017-12-06 16:51:11 +0100
• 66c3813ea6 Add basic queue prioritization. Lain Iwakura 2017-12-05 18:21:30 +0100
• 72f7baa654
  Merge remote-tracking branch 'upstream/develop' into media-proxy href 2017-12-05 14:12:15 +0100
• 08e7e249b1 Merge branch 'feature/chat' into 'develop' lambda 2017-12-05 11:27:11 +0000
• e7c2472abd Fix tests. Lain Iwakura 2017-12-05 12:18:04 +0100
• 74e92152b7 Update frontend. Lain Iwakura 2017-12-05 12:11:46 +0100
• b652dc5f2e Update frontend. Lain Iwakura 2017-12-05 11:53:12 +0100
• 1c90bfb4f6 Merge remote-tracking branch 'origin/develop' into feature/chat Roger Braun 2017-12-05 10:20:00 +0100
• 7f336cb8b1 Merge branch 'fix/odd-passwords' into 'develop' lambda 2017-12-05 09:10:37 +0000
• 5945ec84e9 Don't save user in socket, just save the name. Roger Braun 2017-12-05 10:01:36 +0100
• 69f1024bb0 Add basic channel state. Roger Braun 2017-12-05 09:36:26 +0100
• c1fa1e8844 Fix basic auth for passwords with a colon. eal 2017-12-04 22:45:16 +0200
• d01243c16e Update frontend. Lain Iwakura 2017-12-04 19:12:31 +0100
• 5c40986120 Basic backend chat. Lain Iwakura 2017-12-04 19:10:15 +0100
• 964e2dd2f0 unfuck Henry Jameson 2017-12-04 04:06:52 +0300
• 6b60f5f64a made psql script compatible with migrations or generate_config reruns Henry Jameson 2017-12-04 02:06:05 +0300
• 071f518028 reverts config gen Henry Jameson 2017-12-04 02:01:45 +0300
• a884e08271 fix Henry Jameson 2017-11-28 00:44:14 +0300
• 4071403117 fixes Henry Jameson 2017-11-28 00:42:03 +0300
• 0673511d39 first version of safe DB setup Henry Jameson 2017-11-26 20:57:49 +0300
• d08a34e88b OStatus: Add user bio as summary field Roger Braun 2017-12-03 13:34:17 +0100
• 50dca016f2 Add count index for local users. Lain Iwakura 2017-11-30 15:00:12 +0100
• 5637d163e6 MastodonAPI: Add proper user count. Lain Iwakura 2017-11-30 14:59:44 +0100
• 1cb5cbdc6c
  Improve error handling, add configuration href 2017-11-28 21:44:25 +0100
• e28c110eba
  mandatory typo fix... href 2017-11-22 19:14:03 +0100
• 5f35fdcf5d
  media proxy: good enough wip href 2017-11-22 19:06:07 +0100
• 9d1c0ec18d Merge branch 'salmon-native-keys' into 'develop' lambda 2017-11-28 16:46:01 +0000
• 4524721fba
  Salmon: generate private key with native crypto if available. href 2017-11-28 16:50:12 +0100
• c680ae581d Return xml notice at /notice path. Lain Iwakura 2017-11-27 17:24:52 +0100
• 89a8dc7485 Merge branch 'patch-1' into 'develop' eal 2017-11-25 23:10:43 +0000
• f86fca682a fix mix typo in README.md Partial name 2017-11-25 02:42:39 +0000
• 44f7154fb9 Update frontend. Roger Braun 2017-11-24 08:37:41 +0100