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

386c130769 More readme updates. Lain Iwakura 2017-11-23 16:41:09 +01:00
ecf109a0fe Add mix deps.get back to readme. Lain Iwakura 2017-11-23 16:35:03 +01:00
44dc694882 Add configuration generation tool, update readme. Lain Iwakura 2017-11-23 16:22:20 +01:00
d16b613929 MastodonUI login: Show error message on error. Roger Braun 2017-11-23 12:06:14 +01:00
ad90da07f5 untoot. Roger Braun 2017-11-22 16:10:03 +01:00
698a75cb39 Merge branch 'develop' into 'develop' lambda 2017-11-22 14:19:27 +00:00
d7b6fa79cb Fixed in-reply CSS, also included full column width (to have timelines take the whole screen size.) Hyper! (Stitch) 2017-11-22 14:12:04 +00:00
bcc4e73e51 Update README.md lambda 2017-11-22 13:42:27 +00:00
0716f8e626 Update frontend. Roger Braun 2017-11-22 12:19:13 +01:00
1625021a9c Merge branch 'fix/self-follow' into 'develop' eal 2017-11-21 23:09:59 +00:00
e9037ffc8d Do not include user in their own follower count. eal 2017-11-21 15:33:09 +02:00
9b35a4e850 Merge branch 'fix/mastoapi-attachment-count' into 'develop' eal 2017-11-20 20:55:27 +00:00
fa19de97ba MastoAPI: no more than 4 attachments. eal 2017-11-20 22:49:20 +02:00
dae2949bcc Fix a links... Retweet button still broken. Hyper! (Stitch) 2017-11-20 17:19:22 +00:00
3d29fc5462 Make /api/friends/ids test deterministic. eal 2017-11-20 19:16:43 +02:00
0c68e75b93 Update pl-dark-masto-fe.css Hyper! (Stitch) 2017-11-20 17:09:14 +00:00
cb071745b5 Update pl-dark-masto-fe.css, fix notification_message and retweet Hyper! (Stitch) 2017-11-20 16:54:32 +00:00
747a68a075 Treat internal emoji like external. Roger Braun 2017-11-20 17:53:21 +01:00
cf0bbf320d MastoAPI: Add max_toot_chars. Roger Braun 2017-11-20 08:54:47 +01:00
6900851581 Merge branch 'fix/self-follow' into 'develop' lambda 2017-11-20 07:27:10 +00:00
8d4e7b32c9 Ensure correct state in self-unfollow. eal 2017-11-20 09:26:31 +02:00
bd921ca5d7 Fix posts being streamed to non-local websocket channels. eal 2017-11-20 07:58:43 +02:00
edc3e5bc30 Make users in tests follow themselves by default. eal 2017-11-20 07:52:02 +02:00
4db5954786 Don't let the user unfollow their own account. eal 2017-11-20 01:21:53 +02:00
aadf54e0df Don't show the user in their own following count. eal 2017-11-20 00:31:39 +02:00
36011fee4e Add Custom Pleroma-dark theme Hyper! (Stitch) 2017-11-19 19:07:19 +00:00
f065689407 Update pl-dark-masto-fe.css Hyper! (Stitch) 2017-11-19 19:04:51 +00:00
97bb99edba Add new file Hyper! (Stitch) 2017-11-19 19:04:21 +00:00
52aa65fe6e Federator Queue: Add seperate in/out queues. Roger Braun 2017-11-19 15:10:51 +01:00
5ff5d583b6 MastodonAPI: Streaming fixes. Roger Braun 2017-11-19 13:47:50 +01:00
f6495abf73 Update frontend. Roger Braun 2017-11-19 13:31:09 +01:00
0f099dac67 MastodonAPI: Add sign out. Roger Braun 2017-11-19 13:23:16 +01:00
40ca379357 Fix flakey test. Roger Braun 2017-11-19 13:07:29 +01:00
c336a13d2c MastoAPI: Only return create activties in contexts. Roger Braun 2017-11-19 12:59:23 +01:00
a6f65083ae Merge branch 'feature/fix-warnings' into 'develop' lambda 2017-11-19 11:50:02 +00:00
59770c3f5c

Fix all compilation warnings Thog 2017-11-19 02:22:07 +01:00
ed3403ad8b Merge branch 'formatting-fixes' into 'develop' lambda 2017-11-18 15:58:44 +00:00
146ec80285 Merge branch 'fix/mastofe-login-redirect' into 'develop' eal 2017-11-18 14:38:05 +00:00
7b397ed125 Merge branch 'sensitive-content-bit' into 'develop' eal 2017-11-18 14:34:37 +00:00
f53cdabcdf Add #nsfw tag if sensitive content bit is set eal 2017-11-18 16:30:18 +02:00
31e4277ba5 Don't add summary if empty. eal 2017-11-18 15:25:22 +02:00
fb118b2978 Don't insert newlines to generated HTML. eal 2017-11-18 14:46:54 +02:00
66e78c3ec4 Escape HTML instead of discarding it. eal 2017-11-18 14:43:41 +02:00
4647bcd6e6 Don't start streamer during tests. Roger Braun 2017-11-18 12:22:07 +01:00
9c60cc88df Redirect to Getting Started on login. eal 2017-11-16 20:47:44 +02:00
a743940463 MastoAPI: Implement all streaming functions. Roger Braun 2017-11-16 16:49:51 +01:00
5719f69ae3 MastodonAPI: Stream fixes. Roger Braun 2017-11-16 13:48:58 +01:00
a2d7e0f4d4 Merge branch 'feature/masto-styled-login-page' into 'develop' lambda 2017-11-16 12:01:07 +00:00
43499848d0 Small css fix. Roger Braun 2017-11-16 12:58:33 +01:00
189513e4ff Add styles to make login page resemble mastodon's Shpuld Shpuldson 2017-11-16 13:26:56 +02:00
8de890a0d9 Add custom emoji to Mastodon UI initial state. Roger Braun 2017-11-16 09:40:06 +01:00
3d1360c4d6 Add mastodon emoji folder. Roger Braun 2017-11-16 09:35:14 +01:00
ced0d64d75 MastoAPI: Make attachment ids strings. Roger Braun 2017-11-15 18:58:13 +01:00
1cca544e20 Merge branch 'twitterapi-bitlbee' into 'develop' lambda 2017-11-14 16:47:54 +00:00
1eb7a862d2 Merge branch 'twitterapi-show-user' into 'develop' lambda 2017-11-14 16:44:25 +00:00
f9828e578c TwitterAPI: Add /users/show. eal 2017-11-14 17:34:48 +02:00
0a69611884 Merge branch 'api-links' into 'develop' lambda 2017-11-14 14:19:39 +00:00
312d389f56 Add links to API documentation. eal 2017-11-14 16:15:03 +02:00
163c658202 TwitterAPI: Add unimplemented /mutes/users/ids. eal 2017-11-14 16:12:52 +02:00
22bbe27115 TwitterAPI: Add unimplemented /friendships/no_retweets/ids. eal 2017-11-14 16:10:13 +02:00
dd76036cbb Merge branch 'mastoapi-media-timeline' into 'develop' lambda 2017-11-14 14:09:36 +00:00
3533bf7eac TwitterAPI: Add /friends/ids. eal 2017-11-14 16:04:58 +02:00
06c3ee3bac Accept 1 as true. eal 2017-11-14 15:50:23 +02:00
c84723b679 MastoAPI: Add media timelines. eal 2017-11-14 15:41:16 +02:00
773eba4f0b Update frontend. Roger Braun 2017-11-14 09:34:28 +01:00
083cd169d2 MastoAPI: Fix repeat api bug. Roger Braun 2017-11-13 09:48:56 +01:00
5fc6e9d467 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2017-11-12 14:23:39 +01:00
d293ceb1b5 Add Mastodon frontend. Roger Braun 2017-11-12 14:23:05 +01:00
08bc316742 Merge branch 'mastodon-notification-endpoints' into 'develop' lambda 2017-11-12 11:08:06 +00:00
87dee3902a Merge branch 'filetype-recognition' into 'develop' lambda 2017-11-12 09:27:59 +00:00
efcf54dc02 Merge branch 'mastoapi-update-credentials' into 'develop' lambda 2017-11-12 09:24:32 +00:00
18a95cd375 Add common video and audio types. eal 2017-11-12 01:16:46 +02:00
fc7483cb3c MastoAPI: Add update credentials endpoint. eal 2017-11-12 00:27:09 +02:00
260b148b92 Use headers for file content type recognition. eal 2017-11-11 23:09:33 +02:00
414c52509b MastoAPI: Websocket streaming for federated timeline. Roger Braun 2017-11-11 20:00:11 +01:00
bd5bdc4c24 MastoAPI: Basic streaming. Roger Braun 2017-11-11 14:59:25 +01:00
a1923d20e8 MastoAPI: Fix reblog emojis. Roger Braun 2017-11-11 11:18:05 +01:00
fd12e585c9 Handle existing redirect params. Roger Braun 2017-11-10 18:24:50 +01:00
1d3d66a841 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2017-11-10 17:37:54 +01:00
6e9c22c0af MastoAPI: Use string ids everywhere. Roger Braun 2017-11-10 17:18:19 +01:00
e6a78c6ed0 MastoAPI: Add notification get, clear and dismiss. eal 2017-11-10 15:24:39 +02:00
1b8ad9f731 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2017-11-09 16:49:32 +01:00
266d9c008d MastoAPI: Fetch statuses in search. Roger Braun 2017-11-09 16:48:45 +01:00
2247d7580e Merge branch 'fix-tootdon-image-uploads' into 'develop' lambda 2017-11-09 14:41:44 +00:00
ccde03285d add sort index for activities Roger Braun 2017-11-09 15:16:10 +01:00
e942e1e552 Correct mimetype on bad uploads. eal 2017-11-09 14:11:37 +02:00
9e60de695d Fix migration for empty db. Roger Braun 2017-11-09 13:45:17 +01:00
6bf261589f Update activities in own migration. Roger Braun 2017-11-09 13:32:53 +01:00
20b8b87743 Update in chunks. Roger Braun 2017-11-09 12:33:38 +01:00
f1d27a5fbb Add actor column to activities. Roger Braun 2017-11-09 10:41:19 +01:00
41b8a76e96 Re-fetch user data on salmon decode error. Roger Braun 2017-11-09 08:32:54 +01:00
77e272df2d Merge branch 'following-you-in-user-view' into 'develop' lambda 2017-11-08 17:57:13 +00:00
f7fc048aeb TwitterAPI user view: add follows_you. eal 2017-11-08 19:13:03 +02:00
d2430d5007 Look through whole db for user timelines. Roger Braun 2017-11-08 17:25:18 +01:00
36557155af Update frontend. Roger Braun 2017-11-08 16:16:29 +01:00
8bbbfd72aa Merge branch 'blocks-in-user-view' into 'develop' lambda 2017-11-08 13:39:02 +00:00
4656cb9b99 TwitterAPI user view: add blocks. eal 2017-11-08 13:02:00 +02:00
3bbefd0a1e Merge branch 'twitter-api-blocks' into 'develop' lambda 2017-11-08 10:35:23 +00:00
6c0758e041 TwitterAPI: Add blocks. eal 2017-11-08 00:04:53 +02:00
be67db5547 Merge branch 'mastodon-emoji-endpoint' into 'develop' lambda 2017-11-07 20:01:15 +00:00