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

4d55d7c95e Insert object after being rewritten. lain 2018-04-28 16:10:24 +0200
a7a40bb8f1 Merge branch 'fix/blocked-user-boosts' into 'develop' lambda 2018-04-28 13:49:12 +0000
6908f29e0a Added a test (written by @andrewzah) for the MR Wim Vanderbauwhede 2018-04-28 12:01:43 +0100
634c0c52a1 Merge remote-tracking branch 'upstream/develop' into patch-bio Wim Vanderbauwhede 2018-04-28 11:59:01 +0100
39c80a3667 Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop' lambda 2018-04-27 05:49:12 +0000
6eb274f278 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-04-26 07:07:04 +0200
3bad2b827a Resurrect instance specific panel. lain 2018-04-26 07:06:32 +0200
90bbd94614 ActivityPub MRF SimplePolicy: fix media stripping William Pitcock 2018-04-25 21:25:56 +0000
845bd56c9c Merge branch 'patch-1' into 'develop' eal 2018-04-25 14:35:44 +0000
a7eb148d61 Optionally deactivate public timelines. lain 2018-04-25 16:10:18 +0200
279b1d19f0 Align local bio limits to remote limit. lain 2018-04-25 15:41:59 +0200
2d775bf1be Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats Francis Dinh 2018-04-25 01:58:50 -0400
e981280fa7 Formatting fixes Francis Dinh 2018-04-25 01:43:45 -0400
9e0dd21ed6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats Francis Dinh 2018-04-25 00:46:28 -0400
0df1a4efc8 Fix comment grammar Francis Dinh 2018-04-25 00:46:06 -0400
715c90e54f Fix typo in MastoFE login page. Normandy 2018-04-24 21:58:45 +0000
d4a54a90c9 Merge branch 'gitignore' into 'develop' lambda 2018-04-24 19:26:01 +0000
c78e7d8b11 Fix formatting. lain 2018-04-24 21:25:31 +0200
52b1bc782b Add common files to gitignore Rachel H 2018-04-24 12:18:23 -0700
7a52c4549c Merge branch 'feature/message-rewrite-facility' into 'develop' lambda 2018-04-24 17:21:28 +0000
bbd549c018 Update .gitlab-ci.yml lambda 2018-04-24 12:28:59 +0000
7517155544 Changed to support \r\n and \n Wim Vanderbauwhede 2018-04-24 13:28:55 +0100
3f9385096e Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop lain 2018-04-24 14:25:17 +0200
52ee91efce Patch to replace newlines with <br> tags in bio Wim Vanderbauwhede 2018-04-24 13:20:17 +0100
afe892ddac

Correct syntax with mix format Dashie 2018-04-24 14:12:23 +0200
9972678a68

Add User.decrease_note_count and call it from ActivityPub.delete Dashie 2018-04-24 11:34:18 +0200
62a2287bba Merge branch 'favicon_tag' into 'develop' lambda 2018-04-24 05:54:28 +0000
fc6f5bcad3 update frontend lain 2018-04-23 19:23:45 +0200
661fd3c93e update frontend lain 2018-04-23 19:09:24 +0200
8c0806539c Embed announce activity data instead of linking to it Francis Dinh 2018-04-22 21:28:51 -0400
b1742eca42 Revert "Rename make_unannounce_data helper to make_undo_data" Francis Dinh 2018-04-22 19:42:28 -0400
0574df273c Small cleanup. lain 2018-04-22 10:01:10 +0200
114ca9e069 Merge branch 'develop' into fix/note-count-not-updating lain 2018-04-22 09:56:24 +0200
c649ca8958 Rename make_unannounce_data helper to make_undo_data Francis Dinh 2018-04-22 01:55:41 -0400
26af5bad33 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-04-21 18:28:24 +0200
0c221943ef Formatter: Use proper escaping for links. lain 2018-04-21 18:24:45 +0200
22bfeac256 Update note count in ActivityPub.create. eal 2018-04-21 12:58:04 +0300
d0b1c498a0 Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop' lambda 2018-04-21 08:05:36 +0000
b7669c6efe Merge branch 'readme-update' into 'develop' lambda 2018-04-21 08:05:04 +0000
b4b314be5d Merge branch 'nginx-certbot-doc' into 'develop' lambda 2018-04-21 07:59:49 +0000
04276f0f53 Update README.md lambda 2018-04-21 07:57:33 +0000
9e6ae44729 Formatting fixes. lain 2018-04-21 09:43:53 +0200
ce7618f6f6 add formatter lain 2018-04-21 09:34:23 +0200
21510f6990 . lain 2018-04-21 09:30:15 +0200
44a7789732 . lain 2018-04-21 09:28:44 +0200
34aab9f877 .. lain 2018-04-21 09:27:35 +0200
b68c4bd271 Update CI. lain 2018-04-21 09:24:51 +0200
ff5e957476 Make search use id index too. lain 2018-04-21 09:22:31 +0200
f0798440de Use correct activity for undo Francis Dinh 2018-04-20 23:22:16 -0400
4b9f2ab526 Fix federation of unreblog activity Francis Dinh 2018-04-20 23:09:19 -0400
caf30646b1 Elaborate on setup steps and CLI commands. csaurus 2018-04-20 18:17:01 -0400
1c6a691570 Add info about certbot with the webroot plugin to pleroma.nginx csaurus 2018-04-20 18:43:49 -0400
c5dc7e6e31 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats Francis Dinh 2018-04-20 16:47:44 -0400
90ad55b8ff formatting Kawen 2018-04-20 19:21:48 +0200
b0671be283 enable instance panel by default, added some content Kawen 2018-04-20 19:04:57 +0200
a61e8ac154 Formatting. lain 2018-04-20 13:10:57 +0200
18c3ca7844 Add format checking to CI. lain 2018-04-20 13:09:41 +0200
193be32f45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop lain 2018-04-19 21:44:29 +0200
0b4ff1bfe2 fix again lain 2018-04-19 21:44:11 +0200
3f7b02e7c4 Merge branch 'feature/qvitter-notification-endpoint' into 'develop' lambda 2018-04-19 19:03:35 +0000
8dbb4c6c50 Remove hack for /about/more as we are doing this in Pleroma now Mark Felder 2018-04-19 18:58:13 +0000
fa37acfcc7 TwitterAPI: Add Qvitter notification endpoint. eal 2018-04-19 21:46:59 +0300
678fed47ee Merge branch 'patch-2' into 'develop' lambda 2018-04-19 14:30:13 +0000
f08f9d4498 ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case) nenolod@dereferenced.org 2018-04-19 12:29:35 +0000
7b96a756fb fix again lain 2018-04-19 13:04:29 +0200
77fc40d5d7 Fix generate config lain 2018-04-19 12:50:25 +0200
8696c25efd Ignore setup_db.psql and ignore a folder for custom emojis Dominik V. Salonen 2018-04-19 10:42:22 +0000
e30a056476 Revert "Ask for proxy URL if proxy enabled." eal 2018-04-19 13:29:14 +0300
e4da81d662 Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop' lambda 2018-04-19 07:41:09 +0000
32a26eb910 Fix TwitterAPI.delete call Francis Dinh 2018-04-18 20:41:12 -0400
ee6f15529d CommonAPI post: kill \r with fire William Pitcock 2018-04-18 20:30:59 +0000
b586ead6b8 rm_user: also ensure that cache is running. eal 2018-04-18 17:52:25 +0300
8b5ea91f68 Merge branch 'fix/rm-user-task' into 'develop' lambda 2018-04-18 14:41:03 +0000
4e3fc530db Fix rm_user task. eal 2018-04-18 17:39:27 +0300
a80cdd5906 Merge branch 'fix/login-with-username-or-email' into 'develop' lambda 2018-04-18 11:26:38 +0000
947431e9aa MastoAPI and OAuth: allow login with either email or username. eal 2018-04-18 13:13:57 +0300
7b4f55238e Handle unrepeats via the TwitterAPI Francis Dinh 2018-04-18 06:00:40 -0400
687db1bc3a Expose unannounce activity so that it can be tested Francis Dinh 2018-04-18 03:39:42 -0400
0251690e96 Add federation for unrepeats Francis Dinh 2018-04-17 20:35:07 -0400
e153b364a7 update frontend lain 2018-04-17 11:09:19 +0200
c9e7b984d5 Add make_unannounce_data helper function Francis Dinh 2018-04-17 04:13:08 -0400
85bd191291 Remove unretweet function for now Francis Dinh 2018-04-17 04:12:16 -0400
42279f54cf Return target status in MastoAPI endpoint instead of reblog activity Francis Dinh 2018-04-16 23:30:52 -0400
d16877251a doc fixes Francis Dinh 2018-04-16 10:59:32 -0400
5b0d0b9ab2 Add unreblogging tests Francis Dinh 2018-04-14 22:34:06 -0400
b949577472 Add unrepeat functionality Francis Dinh 2018-04-14 03:39:16 -0400
d24ddd9fb9 ActivityPub MRF: implement the SimplePolicy policy William Pitcock 2018-04-14 11:31:12 +0000
4a178b3d65 ActivityPub: implement MRF core hook and baseline noop policy object William Pitcock 2018-04-14 09:20:18 +0000
48380aeccc ActivityPub.ex: do not return boosted statuses from blocked users. eal 2018-04-14 14:26:20 +0300
5256c712dc Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/ Mark Felder 2018-04-13 13:40:24 +0000
fef8daa454 Update README.md lambda 2018-04-13 09:46:58 +0000
3b68eaa0ce Merge branch 'mix_task_rm_user' into 'develop' lambda 2018-04-13 07:43:32 +0000
13a64b82e3 Switch to User.delete for rm_user task Phenethylamine 2018-04-12 14:30:53 -0400
4478b9115c Add rm_user mix task Phenethylamine 2018-04-12 02:43:48 -0400
3d636cf533 Merge branch 'develop' into 'develop' lambda 2018-04-11 20:58:25 +0000
5612716c25 update frontend lain 2018-04-11 22:03:28 +0200
a8dddd9279 update frontend lain 2018-04-11 21:55:38 +0200
2de2e29df2 Oops Gian Sass 2018-04-11 15:51:02 -0400
3a5c0465eb Add unit test for pinned statuses Gian Sass 2018-04-11 15:48:32 -0400
907df9b8ed Fix issue #124 Gian Sass 2018-04-11 14:55:49 -0400