Default Branch

neckbeard

0834949d5f · Merge remote-tracking branch 'upstream/develop' into neckbeard · Updated 3 days ago

Branches

0.9.9-beta-3

ea1e3e95ef · Revert "Do object insertion through Cachex" · Updated 2 years ago

9660
3
1427-oauth-graceful-admin-scope

81b05340e9 · [#1427] Graceful clearance of OAuth admin scopes for non-admin users (no error raised). · Updated 1 year ago

5570
0
Included
1478-oauth-admin-scopes-tweaks

39ce894a07 · Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks · Updated 1 year ago

5490
0
Included
Move-fqa-to-docs

df472ff1ec · Moved fqa into docs. · Updated 1 year ago

8217
1
adminfe

2cb1e2a7e8 · Merge remote-tracking branch 'origin/neckbeard' into adminfe · Updated 9 months ago

3466
33
adminfe-build

6944560c72 · add build of aadmin-fe · Updated 4 months ago

1242
1
bbs

f3915e6e9e · Basic SSH daemon. · Updated 3 years ago

12933
1
bugfix/1442-dont-return-nil-for-following-count

50b152766f · Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count · Updated 1 year ago

5736
0
Included
bugfix/68-twitterAPI-add-in_reply_to_screen_name

9cb981c8d8 · [HTTPoisonMock] Add mock for application/activity+json on https://mastodon.social/users/lambadalambda · Updated 2 years ago

11612
2
bugfix/filter_id

a9181ec77b · Ensure filters have a filter_id · Updated 2 years ago

11145
2
chore/maint-1.1/enable-otp-releases

287883af33 · gitlab: enable OTP releases for maint/1.1 branch · Updated 1 year ago

6862
1
chore/remove-sporadically-failing-tests

f8b83915ce · Remove sporadically failing tests · Updated 1 year ago

5817
1
config/benchmark

b7811dfb7b · Instead allow a dedicated benchmark config · Updated 1 year ago

5546
0
Included
custom-resources-folder

169cad7825 · Fix typo · Updated 1 year ago

8217
2
develop

ecb8fe183c · Merge branch 'patch-1' into 'develop' · Updated 1 year ago

5488
0
Included
disable-attachment-links

4499a7a075 · Disable attachment links by default · Updated 1 year ago

5954
0
Included
doc/add-lighttpd

2ed9718a6b · installation/pleroma.lighttpd: Add example configuration · Updated 2 years ago

11340
1
docs/installation-merge

284bb5693f · Proofcheck and update CentOS installation guides · Updated 1 year ago

8349
30
dtluna/pleroma-bugfix/repeated-follow-unfollow

0f0445ba28 · Merge branch 'develop' into dtluna/pleroma-bugfix/repeated-follow-unfollow · Updated 3 years ago

13286
1
failing-search-fixes-part-2

c1fb08fc77 · CI: Don't use special database options that deactivate sync. · Updated 1 year ago

6001
1
fallback-redirect

aba333241b · router: redirect known users to /users/foo when no other routes match · Updated 2 years ago

10373
1
feature/1392-support-irreversible-filters

0b09a28fc5 · Restrict thread statuses that contain user's irreversible filters · Updated 1 year ago

5662
3
feature/1482-activity_pub_transactions

28ba1d6ffb · fix for compiling · Updated 1 year ago

5505
3
feature/activitypub

18dfdfdc68 · Restrict activity fixing more. · Updated 3 years ago

12313
1
feature/activitypub-c2s-source

28d2bbfc0d · activitypub: c2s: support using `source` field to reformat posts like friendica does · Updated 2 years ago

9484
1
feature/add-task-to-create-custom-emoji-list

70c68f26fa · Format lib/mix/tasks/create_custom_emoji_list.ex · Updated 2 years ago

11595
2
feature/atom-feed-pagination

f212c015cd · Update twitter_api_controller_test.exs · Updated 3 years ago

12484
3
feature/attachments-cleanup

2b70c1b575 · Update CHANGELOG · Updated 1 year ago

5535
13
feature/backup

bdbb0373f2 · make credo happy · Updated 1 year ago

8453
5
feature/blocks

e4899bd8f6 · Fix bug when no posts are in the db. · Updated 3 years ago

12748
1
feature/chat-enhanced

f6446d7b9e · Handle incoming announces for chat messages. · Updated 2 years ago

12097
9
feature/compile_get

6ea40564c2 · Config: add compile_get! · Updated 1 year ago

5654
2
feature/diaspora

7676af8b8a · diaspora: hcard: chase keys module changes · Updated 1 year ago

7684
3
feature/emoji-vacuum

f3a5e5f0b1 · Add task to steal emoji from a given instance. · Updated 2 years ago

11726
1
feature/generic-actor

c88a9e604f · Basic FederatedChatChannel. · Updated 2 years ago

11033
5
feature/groups

3b41ef2eaf · TwitterAPI: Add join representation. · Updated 3 years ago

12500
8
feature/make-startup-errorless-again

a381b0a7ec · kill prometheus errors at startup when prometheus is not configured · Updated 1 year ago

8276
1
feature/otp-releases

d642eae179 · Enable building an OTP release. · Updated 2 years ago

11905
1
feature/peertube

1cc8bb393c · Render peertube videos in mastodon. · Updated 2 years ago

12246
3
feature/reply-filtering-mk3

799b4ba17e · changelog · Updated 1 year ago

6995
10
feature/sse_streaming

a00dbfe05c · . · Updated 3 years ago

12725
4
feature/static-fe

07e03d0fae · static fe: add remote follow button · Updated 2 years ago

9364
8
feature/streaming

fecde7b9dd · . · Updated 3 years ago

12852
1
feature/tag_feed

969769730e · update tests · Updated 1 year ago

5547
0
Included
feature/update-url-regex

c426a5d9e4 · Change @link_regex to match any URL scheme · Updated 2 years ago

12123
1
feature/user-whitelist

8d717c4be7 · remove vim swap file · Updated 1 year ago

5743
6
features/apc2s-media-upload-object

475732de59 · activity_pub_controller.ex: fix typo · Updated 1 year ago

6308
2
features/flavour-change-get

5e7316dc0d · Add GET to /api/v1/pleroma/flavour/:flavour · Updated 1 year ago

8802
1
features/masto-api/multi-tag-timelines

6caedebcb3 · [Web.ActivityPub.ActivityPub]: Fix restrict_tag() · Updated 2 years ago

10353
12
features/mastoapi/2.7.0-registration

3adde01eba · OAuth: Add client_credentials flow · Updated 1 year ago

8937
6
features/notifications_exclude_types

936b595837 · Revert "Web.ActivityPub.Transmogrifier: Don’t overwrite emoji in add_emoji_tags/1" · Updated 2 years ago

9484
6
features/openrc-console

528069a42d · init.d/pleroma: Add option to attach an elixir console · Updated 1 year ago

6784
1
fed-tests

9ff32999f5 · Tests: Run the daemon · Updated 1 year ago

7588
5
fix-admin-api-scope

385356aad0 · fix oauth scopes for AdminApi#reports_update · Updated 1 year ago

5511
0
Included
fix-chat-2

f7aea5ce5d · update frontend · Updated 2 years ago

9869
1
fix-dokku-2

86d821a96e · Dokku deploys: Keep the git dir so version number generation works. · Updated 1 year ago

5948
0
Included
fix/activities-failing-to-render-with-nonexistent-object

7ffed8ffc1 · Fix activities failing to render because the object is a user/unavailable · Updated 1 year ago

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

a4b4f6b704 · AdminAPI: Fix grouped reports for closed/resolved reports · Updated 1 year ago

5785
1
fix/cache-object-after-updates

e7f781b8ed · Formating · Updated 2 years ago

9742
2
fix/disable-rate-limiter-for-socket-localhost

45180d4c60 · Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost · Updated 1 year ago

5547
0
Included
fix/grouped-reports-for-deprecated-format

8103dfc515 · AdminAPI: Grouped reports old/new fix · Updated 1 year ago

5785
1
fix/instance-gen-config

bec058f79a · Add a polyfill for Application.put_all_env/2 · Updated 1 year ago

7244
2
fix/mastoapi-mutes

b97ed9f840 · MastoAPI: treat mutes as blocks. · Updated 2 years ago

12123
1
fix/release-envvars

4a5bb7eb02 · OTP releases: only set name and distribution type if not set already · Updated 1 year ago

5760
0
Included
fix/rm-user-task

52385f498e · rm_user: also ensure that cache is running. · Updated 2 years ago

12121
1
fix/update-admin-fe

da995784ec · Update admin-fe · Updated 1 year ago

6705
1
flake-test

46f29be443 · update frontend · Updated 2 years ago

10089
7
hotfix-0.9.99

1a64eaf554 · Bump version to 0.9.99. · Updated 2 years ago

9660
15
hotfix-0.9.99999

f061d551a9 · Bump version. · Updated 1 year ago

9660
31
integration/alex.s/gun

361940e119 · Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into integration/alex.s/gun · Updated 1 year ago

6995
104
integration/alex.s/reply-filtering

e91a8bea2f · mastodon api: remove unused add_link_headers() · Updated 1 year ago

6995
14
issue/1354

933dc12043 · added code of mr#2067 · Updated 1 year ago

5539
0
Included
issue/1383

54c9db38c8 · Merge branch 'develop' into issue/1383 · Updated 1 year ago

5495
0
Included
issue/1487

fa7d8e77e6 · fixed Metadata.Utils.scrub_html_and_truncate · Updated 1 year ago

5504
0
Included
keyword_policy/mgmt_api

b7994e674f · refactor save_keyword_policy and list_keyword_policy to be just save and list as they are already under KeywordPolicy module · Updated 1 year ago

8937
19
logo-in-readme

a3b0890f04 · Add logo to README. · Updated 2 years ago

11791
1
maint-object-experiment

09f30430e1 · Object: Use ap_id column. · Updated 1 year ago

6783
3
maybe-faster-search

84fe16202f · Search: join on activities instead of objects · Updated 1 year ago

6973
1
merge-to-dev-0.9.99

7e67a29852 · Merge branch 'master' of git.pleroma.social:pleroma/pleroma · Updated 2 years ago

9660
19
migration-fix

0355146207 · Fix typo · Updated 10 months ago

4178
19
misskey-compat

6a85f7d1ea · Transmogrifier: Extend misskey like compatibility. · Updated 1 year ago

6396
0
Included
mongoose-im-hints

5a252a53dc · Documentation: Add info about mongooseIM usage. · Updated 1 year ago

8243
1
mrf-error-handling

ccc891561b · fix tests · Updated 1 year ago

8726
41
mrf-error-handling2

f66141f6c4 · fix tests · Updated 1 year ago

7893
3
nb-migration-fix

b8d7f93e1f · Merge remote-tracking branch 'upstream/fix/2139-oban-migration' into nb-migration-fix · Updated 5 months ago

1608
1
nb-testing

00a532d28d · Merge branch 'neckbeard' into nb-testing · Updated 6 months ago

1771
2
notifications-from-account

34d85f8a54 · Return 404 if account to filter notifications from is not found · Updated 1 year ago

5547
0
Included
oauth-scopes-tweaks-and-tests

badd0a96ea · Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests · Updated 1 year ago

5501
0
Included
object-and-activity-ap-id

2d2036b72f · Merge branch 'develop' into object-and-activity-ap-id · Updated 1 year ago

6063
15
object-id-column

0e4d3e7354 · Changelog: Add info and warning about object ap_ids. · Updated 1 year ago

6308
7
origin/neckbeard

344a29b65c · update project info · Updated 3 weeks ago

376
0
Included
panel-link-admin-fe

fba0a56f44 · instance/panel.html: Add AdminFE link · Updated 1 year ago

7089
1
refactor/2

3dd6bd4bfd · wip · Updated 3 years ago

13090
6
refactor/error-view

58fc8b5557 · Render errors using ErrorView · Updated 3 years ago

13016
2
refactor/status-view

cc06d22d35 · Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into refactor/status-view · Updated 3 years ago

13008
2
refactor/user-controller

c27adf2bd4 · Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into refactor/user-controller · Updated 3 years ago

13008
4
release-0.9.9

e58596bbdc · Bump version. · Updated 2 years ago

9660
12
release/1.0

f5305d2815 · Merge branch 'backport/1.0-branch-name-change' into 'master' · Updated 1 year ago

7737
132
release/1.0.1

e01bab843b · version bump to 1.0.1 · Updated 1 year ago

7737
20
release/1.0.2

d9aacbec4d · mix: update version to 1.0.2 · Updated 1 year ago

7737
47
release/1.0.3

2536628cac · mix: update version to 1.0.3 · Updated 1 year ago

7737
58
release/1.0.4

455f2934b7 · mix: update version to 1.0.4 · Updated 1 year ago

7737
61
release/1.0.5

dcb4711e92 · mix: update version to 1.0.5 · Updated 1 year ago

7737
110
release/1.0.6

65cc68ff2f · mix: bump version to 1.0.6 · Updated 1 year ago

7737
116
release/1.1.1

c00b55bc80 · Add a changelog entry for user search refactoring · Updated 1 year ago

6758
0
Included
release/1.1.2

59d447d555 · pleroma_ctl: Fix attempting to use RPC for config generation · Updated 1 year ago

6755
0
Included
release/1.1.3

948d0d3b0b · mixfile: bump version to 1.1.3 · Updated 1 year ago

6750
0
Included
release/1.1.4

b7de4ad082 · Apply suggestion to CHANGELOG.md · Updated 1 year ago

6740
0
Included
release/1.1.5

287d92c920 · Add a changelog entry about frontend bundle update · Updated 1 year ago

6732
0
Included
release/1.1.6

34206e4d7f · changelog: fix wrong header levels · Updated 1 year ago

6719
0
Included
release/1.1.7

3b407a9a29 · remove a random test · Updated 1 year ago

6706
0
Included
release/1.1.8

e372917f6c · Update version to 1.1.8 · Updated 1 year ago

6700
0
Included
remake-remodel

56bbcef4d2 · [#1878] Added types for `emoji`, `attachment`, added casting for `tag` Object fields. · Updated 1 year ago

5491
8
remote-follow-auth-fix

724036d358 · Fixed UtilController.do_remote_follow/2 auth check (allowed password auth without OAuth scope check). · Updated 1 year ago

5562
1
require-signature

775212121c · Verify HTTP signatures only when request accepts "activity+json" type · Updated 1 year ago

5557
0
Included
revert-48552b38

96f7114d95 · Merge remote-tracking branch 'origin/develop' into revert-48552b38 · Updated 2 years ago

9517
4
revert-bca1512d

2792672793 · Revert "Merge branch 'admin-scope-support-code' into 'develop'" · Updated 1 year ago

5572
0
Included
revert-bd89cdbe

18527f56aa · Revert "Merge branch 'revert-4d3655c4' into 'develop'" · Updated 2 years ago

9797
1
revert/tags-releases

5bc9e6e0f3 · Revert "Build releases only on tags or develop" · Updated 1 year ago

7737
6
rinpatch/pleroma-feature/federated-pins

01f2013b67 · Fix post fetching · Updated 2 years ago

9257
42
security/client-blocklist

3a454c8daf · clients: we block tootdon, so we shouldn't list it as supported · Updated 1 year ago

8191
3
security/fix-for-0.9.99999

b243cd8d42 · update versions · Updated 1 year ago

9660
28
stable

1629fa2412 · Merge branch 'release/1.1.8' into 'stable' · Updated 1 year ago

6699
0
Included
translation/errors-french

a4647e9804 · fr/LC_MESSAGES/errors.po: Create translation file · Updated 1 year ago

7419
0
Included
twapi-timeline-fixes

5d0ca6a061 · Don't return follows and likes in the timeline anymore. · Updated 2 years ago

10076
1
uguu

756a029edf · Update frontend · Updated 1 year ago

5568
0
Included
update-ci

5bcc1cd7ab · update ci · Updated 2 years ago

10403
1
upgrade-val

693a9451ff · file extensions are really hard · Updated 3 weeks ago

327
0
Included
use-pg12-in-ci

798aa0c335 · Use PosgreSQL v12 in the federated tests · Updated 1 year ago

5726
0
Included
user-deletion-rework

087318c124 · Merge branch 'develop' into user-deletion-rework · Updated 1 year ago

9014
6
v0.9.9

cd20af5198 · Set version. · Updated 2 years ago

10403
1