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

• c9a50312a5 Merge pull request #40 from pleroma/mfc-preview-url markf 2019-01-24 15:06:47 -06:00
• 6f37cbf7e1
  mfc conversion: fix preview_url in APIs href 2019-01-24 21:52:25 +01:00
• 18cec0a57b Use 800x800 for thumbnail image per suggestion by Florian Mark Felder 2019-01-24 14:13:52 -06:00
• 41d24da881
  Fix MFC conversion href 2019-01-24 20:34:00 +01:00
• dee76f47b9 Merge pull request #39 from pleroma/mfc-issue-38 markf 2019-01-24 13:16:32 -06:00
• a0625ebf48
  MFC Uploader: revert image suffix to .preview.png href 2019-01-24 20:14:54 +01:00
• 7cc1e6fbaf
  MFC Uploader: add longer/configurable timeout for image conversions href 2019-01-24 20:05:07 +01:00
• 0fccd1eb84 fix mfc/image preview url Maksim Pechnikov 2019-01-24 09:33:46 +03:00
• 4d0cc20efc update frontend Mark Felder 2019-01-23 17:34:57 -06:00
• 6506a37a76 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-23 17:27:21 -06:00
• b8b7a11190 Merge branch 'develop' into mfc-develop Mark Felder 2019-01-23 17:22:45 -06:00
• 122e99ff95 Merge pull request #36 from pleroma/mfc-preview-media href 2019-01-23 19:20:35 +01:00
• b2c01622d7 remove unused code Maksim Pechnikov 2019-01-23 21:18:39 +03:00
• 3a8f829e75 add test Maksim Pechnikov 2019-01-23 09:38:11 +03:00
• db596069cd add MFC preview video\image Maksim Pechnikov 2019-01-21 00:26:02 +03:00
• d7ff131dd0 Add MFC NSFW image here now that it is configurable Mark Felder 2019-01-22 14:11:35 -06:00
• 8c67440c3e update frontend Mark Felder 2019-01-22 13:11:58 -06:00
• 27a7f6123a update frontend Mark Felder 2019-01-22 12:52:49 -06:00
• c5f94d3029 update frontend Mark Felder 2019-01-22 12:19:29 -06:00
• 5a78aa92d1 Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-22 12:17:30 -06:00
• 59056696b4 update frontend Mark Felder 2019-01-22 09:09:38 -06:00
• 78694f55c0 Merge branch 'oembed_provider' of https://git.pleroma.social/raeno/pleroma into mfc-develop Mark Felder 2019-01-19 07:24:20 -06:00
• 195e488e19 Advertise the Roma apps instead Mark Felder 2019-01-18 11:10:45 -06:00
• 3abc1db14f Merge branch 'oembed_provider' of https://git.pleroma.social/raeno/pleroma into mfc-develop Mark Felder 2019-01-18 11:06:21 -06:00
• f71b50baa0 Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-18 08:54:06 -06:00
• d3427fdba9 update frontend Mark Felder 2019-01-16 11:11:00 -06:00
• 913b6bd16b Merge branch 'classic-flakeids' of https://git.pleroma.social/href/pleroma into mfc-develop Mark Felder 2019-01-16 11:07:32 -06:00
• 02342a8385 Merge branch 'develop' into mfc-develop Roger Braun 2019-01-16 18:06:40 +01:00
• eb0e9c19f2
  Treat User.Info pinned ids as strings href 2019-01-16 16:15:46 +01:00
• 3728ed68b5
  FlakeId.from_string/1: remove old, un-needed conversion href 2019-01-16 10:01:15 +01:00
• 5b92767731
  2019 href 2019-01-15 16:42:33 +01:00
• c60dfef22c
  ActivityPub: restrict_since/restrict_max: ignore empty param href 2019-01-15 16:39:23 +01:00
• 65eede90fb
  Test FlakeID old id compat & Ecto type href 2019-01-15 16:18:18 +01:00
• 7bd29b3620
  Flake Ids for Users and Activities href 2019-01-09 16:08:24 +01:00
• 90fb2dcc1a Merge pull request #34 from pleroma/follow-sync-2 markf 2019-01-09 11:37:16 -06:00
• c6a6a149d3 Make follow syncing work even if the endpoint return bad data. Roger Braun 2019-01-09 10:59:31 +01:00
• 0a3b74739b update frontend Mark Felder 2019-01-08 10:26:21 -06:00
• 3ce9bf63d0 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-08 09:47:07 -06:00
• 6defdc6dd5 update frontend Mark Felder 2019-01-08 09:46:43 -06:00
• 8ce29a8968 Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2019-01-08 09:44:05 -06:00
• 93e47d964e Merge pull request #33 from pleroma/sync-follows markf 2019-01-07 10:21:26 -06:00
• a4fa95a257 Fix specs. Roger Braun 2019-01-07 11:43:48 +01:00
• e72740d7b3 Add support for the Share following endpoint as well Mark Felder 2019-01-04 16:51:41 -06:00
• 157edcd70d update frontend Mark Felder 2019-01-04 15:01:08 -06:00
• 96ac411f3d update frontend Mark Felder 2019-01-04 14:46:27 -06:00
• f10955039f update frontend Mark Felder 2019-01-04 14:40:09 -06:00
• b13109e1c3 Add sync of followers. Roger Braun 2019-01-04 17:10:13 +01:00
• df8b191abe update frontend Mark Felder 2018-12-31 11:23:56 -06:00
• db43812ad4 Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-27 11:57:29 -06:00
• a89edf5585 update frontend Mark Felder 2018-12-24 15:07:40 -06:00
• 09f14ee0b7 Fix missing Repo alias Mark Felder 2018-12-23 15:57:08 -06:00
• b6373440bf Remove two lines that crept back in from develop Remove third line which was from Ivan related to email confirmation and not relevant to our environment Mark Felder 2018-12-23 15:48:23 -06:00
• bf65db8497 Finish the merge properly... Mark Felder 2018-12-23 15:24:51 -06:00
• 2bc931c424 update frontend Mark Felder 2018-12-23 15:23:14 -06:00
• a754688d43 Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-23 15:19:32 -06:00
• 54fc0088c0 update frontend Mark Felder 2018-12-23 15:08:08 -06:00
• 72d25fc4d3 Merge pull request #31 from pleroma/models-no-hiding markf 2018-12-23 15:00:11 -06:00
• 94cb41a7c6 Don't allow models to lock their accounts (just fails silently for now). Roger Braun 2018-12-23 15:54:18 +01:00
• 16bb979c7e Merge pull request #30 from pleroma/mfc/fix/client-ip-endpoint markf 2018-12-21 11:49:52 -06:00
• e7f217279d
  MFC Login: send client IP to passcode endpoint too. href 2018-12-21 17:26:21 +01:00
• 0d0fbdf845 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-18 15:21:20 -06:00
• b87af802cc Merge branch 'userless-admin' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-18 15:20:52 -06:00
• aaca6b7c53 Merge pull request #28 from pleroma/following-superadmin markf 2018-12-18 12:11:57 -06:00
• 19175e44b4 fix missing comma Mark Felder 2018-12-18 10:50:42 -06:00
• 21fcc38141 Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-18 10:47:40 -06:00
• 5d24d2a5f3 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-17 11:18:23 -06:00
• 8754aebc7d Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-17 11:17:58 -06:00
• 5bec24d427 Merge pull request #27 from pleroma/automatic-tagging roger 2018-12-16 20:57:26 +01:00
• d560103b74 Merge pull request #26 from pleroma/mfc/auth-client-ip roger 2018-12-16 20:57:11 +01:00
• 45e5c1a29f Add user following / unfollowing to the admin api. Roger Braun 2018-12-16 16:41:56 +01:00
• 26391902f5 Add automatic tagging of mfc members. Roger Braun 2018-12-15 20:05:11 +01:00
• 20641ca6ba Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-14 14:23:42 -06:00
• c883bc303d
  MFC: Send remote client ip when authenticating href 2018-12-14 18:35:53 +01:00
• 9206a176ef update frontend Mark Felder 2018-12-14 09:38:48 -06:00
• e2bc09e66b update frontend Mark Felder 2018-12-14 09:35:34 -06:00
• 8850c25fbf update frontend Mark Felder 2018-12-14 09:13:16 -06:00
• 494408295e update frontend Mark Felder 2018-12-13 13:35:37 -06:00
• 1adf41d0ce Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-13 10:50:55 -06:00
• c5d96d39d4 update frontend Mark Felder 2018-12-12 16:47:06 -06:00
• 3e7ef81818 Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-12 16:42:13 -06:00
• ff90be0e3d update frontend Mark Felder 2018-12-12 16:38:19 -06:00
• b7e00a6a6c Revert "Revert "Rename /notice/:id to /status/:id"" Mark Felder 2018-12-12 16:37:30 -06:00
• 05524e6017 update frontend Mark Felder 2018-12-12 16:32:30 -06:00
• fba9dcf110 Revert "Rename /notice/:id to /status/:id" Mark Felder 2018-12-12 16:31:41 -06:00
• 709d52a4d1 update frontend Mark Felder 2018-12-12 16:21:21 -06:00
• 195972f834 update frontend Mark Felder 2018-12-12 13:50:41 -06:00
• cb7cefb4e8 Merge pull request #24 from pleroma/notice-to-status markf 2018-12-12 13:49:30 -06:00
• e3cc5fa4e4
  Rename /notice/:id to /status/:id href 2018-12-12 20:24:57 +01:00
• 4c40d359c0 Merge pull request #23 from pleroma/mfc-username-extended markf 2018-12-12 12:18:58 -06:00
• b2215aef5c
  MFC/User: use configured regex for changeset href 2018-12-12 19:15:36 +01:00
• 23c7e349f5 Merge branch 'username-underscores' of https://git.pleroma.social/href/pleroma into mfc-develop Mark Felder 2018-12-12 11:59:26 -06:00
• 9a509693c8 Merge branch 'username-underscores' of https://git.pleroma.social/href/pleroma into mfc-develop Mark Felder 2018-12-12 11:51:54 -06:00
• 2773e1d047 Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-12 11:50:49 -06:00
• 613239f2f8
  Allow underscores in usernames. href 2018-12-12 18:17:15 +01:00
• 77da829860 Merge branch 'mfc-develop' of spark.your.org:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-11 19:55:17 -06:00
• 9983b2da89 update frontend Mark Felder 2018-12-11 19:54:30 -06:00
• 3ca55c92b9 Fix login problems. Roger Braun 2018-12-11 21:19:09 +01:00
• 9ef11074dc Fix warnings now treated as errors Mark Felder 2018-12-10 18:12:28 -06:00
• d00112e5fc Merge branch 'develop' of git.pleroma.social:/pleroma/pleroma into mfc-develop Mark Felder 2018-12-10 18:06:21 -06:00
• c72e1077cc update frontend Mark Felder 2018-12-08 07:38:00 -06:00