Commit Graph

Select branches

Hide Pull Requests

113-mastoapi-api-web-settings-endpoint

add-mediaproxy-question-to-configgen

api-links

authenticated-profile-fetching

bbs

blocks-in-user-view

bugfix/mastofe_thread_render

develop

dtluna/pleroma-bugfix/repeated-follow-unfollow

feature/activitypub

feature/atom-feed-pagination

feature/blocks

feature/caddyfile

feature/chat

feature/chat-enhanced

feature/domain-blocks

feature/emoji-vacuum

feature/groups

feature/in-out-federator

feature/invites

feature/masto-styled-login-page

feature/mediaproxy-nodeinfo

feature/otp-releases

feature/peertube

feature/remote-follow

feature/sse_streaming

feature/streaming

feature/update-url-regex

feature/user_deletion

features/column_media_streaming

features/glitch-soc-frontend

features/initial-state_rights

feld/pleroma-feld-mastodon-usersearch

filetype-recognition

fix-tootdon-image-uploads

fix-tootdon-oauth

fix/background-profile-fetch

fix/config-disable-chat

fix/follow-import-by-uri

fix/link-headers

fix/linkify

fix/login-with-username-or-email

fix/mastoapi-attachment-linking

fix/mastoapi-mutes

fix/mp3-recognition

fix/no-image-upload-filetype

fix/note-count-not-updating

fix/odd-passwords

fix/rm-user-task

fix/split-custom-emoji

fix/timeline-headers

fix/tootdon-mentions

fix/twitterapi-incorrect-follows-you

following-you-in-user-view

formatting-fixes

logo-in-readme

master

mastoapi-media-timeline

mastoapi-update-credentials

mastodon-emoji-endpoint

mastodon-notification-endpoints

missing-mastodon-follow-endpoint

oauth2

patch-1

patch-2

refactor/2

refactor/error-view

refactor/status-view

refactor/user-controller

snoot

stats-daemon

status-separate-content-summary

twitter-api-blocks

twitterapi-bitlbee

twitterapi-show-user

websocket-streaming

pre_rebase

v0.9.0

Mono Color

• 75d089965c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into snoot snoot Vivian Lim 2018-12-11 18:34:51 -0800
• 26e14568bb Revert "Don't share this server's view of the public timeline with the outside world" Vivian Lim 2018-12-11 18:34:28 -0800
• 2999a08e35 Merge branch 'new-fe-options' into 'develop' scarlett 2018-12-10 23:32:29 +0000
• e1cbb18327 Document the new frontend options. scarlett 2018-12-10 23:23:10 +0000
• 213176c3c3 Add new frontend options to server-side config. scarlett 2018-12-10 23:15:01 +0000
• 37bd32e58b Merge branch '2018-12-10-update-frontend' into 'develop' lambda 2018-12-10 19:55:32 +0000
• d6bf06ab4f Fix warnings. lain 2018-12-10 20:49:06 +0100
• 8682be29a5 update frontend lain 2018-12-10 20:46:10 +0100
• 0863ec2737 Merge branch 'fix_empty_bio_crash' into 'develop' lambda 2018-12-10 19:08:35 +0000
• 8aa646ca31 Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop' lambda 2018-12-10 19:06:39 +0000
• 729321ad20 Merge branch 'fix/config-md-typos' into 'develop' lambda 2018-12-10 19:06:13 +0000
• ff10b9927b Merge branch 'support/bugfix_272' into 'develop' lambda 2018-12-10 19:05:16 +0000
• 6786ad3d98 Merge branch 'fix/theora-detection-read-bytes' into 'develop' lambda 2018-12-10 19:04:06 +0000
• 0554d91dcd Merge branch 'anonymize-filter-text' into 'develop' lambda 2018-12-10 19:03:06 +0000
• bda25b999b Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc' lambda 2018-12-10 18:33:36 +0000
• ab98c92d86 Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop' lambda 2018-12-10 18:28:02 +0000
• b621ebb7a6 Format. lain 2018-12-10 19:19:40 +0100
• c81c74d847 Treat warnings as errors outside of tests. lain 2018-12-10 19:13:53 +0100
• e94c3442f4 updates Maksim Pechnikov 2018-12-10 09:39:57 +0300
• 993c8c8bd4 Keep the shortdoc descriptive rinpatch 2018-12-10 08:03:17 +0300
• 9ba4a1c5fe Fixes #415. Properly handle nil and empty string by User.parse_bio raeno 2018-12-10 01:01:43 +0400
• cbe048bb3f Mix tasks: improve uploads.ex moduledoc Rin Toshaka 2018-12-09 20:17:35 +0100
• 074fa790ba fix compile warnings Maksim Pechnikov 2018-12-09 12:12:48 +0300
• cf85a9aea1 Merge branch 'angristan-docker' into 'develop' Haelwenn 2018-12-09 13:53:20 +0000
• 88e463e797 Update angristan/docker-pleroma link Stanislas 2018-12-09 12:56:29 +0000
• 100a06afe1 config.md: Fix typos and add option description Rin Toshaka 2018-12-09 11:09:21 +0100
• 068353ac0b formatting Maksim Pechnikov 2018-12-07 07:53:14 +0300
• 9442588ae9 fix hashtags in api response Maksim Pechnikov 2018-12-06 21:50:34 +0300
• f079ca7181
  Remove french. href 2018-12-08 11:09:35 +0100
• 5436aaad4f Merge branch 'fix/add-upload.ex' into 'develop' lambda 2018-12-08 09:12:37 +0000
• beadeaffa1 Merge branch 'fix/nodeinfo-nil-features' into 'develop' lambda 2018-12-08 09:12:06 +0000
• 8fa5c66eab Merge branch 'fix/media-proxy-url-encoded' into 'develop' lambda 2018-12-08 09:11:18 +0000
• 4976a8b05f Merge branch 'fix/typo-relay-ex' into 'develop' lambda 2018-12-08 09:08:56 +0000
• 6c73136aec [#283] Mix Tasks: Fix a typo in relay.ex Rin Toshaka 2018-12-08 08:30:34 +0100
• bdc8112e40
  Media proxy: fix url encoding href 2018-12-07 21:44:04 +0100
• 7d86c0c53f Merge branch 'fix/gopher-respect-ip' into 'develop' lambda 2018-12-07 18:49:40 +0000
• 94ac0075bf Merge branch 'media-proxy-follow-redirect' into 'develop' lambda 2018-12-07 18:48:26 +0000
• 134cc94cbd
  Nodeinfo: remove null features; relay feature. href 2018-12-07 19:44:45 +0100
• d8fcf7c5cf
  Media proxy: follow HTTP redirects by default href 2018-12-07 19:36:44 +0100
• 94d8f1ab30 Merge branch '394_user_tags' into 'develop' lambda 2018-12-07 18:25:38 +0000
• 09f20de0d7 Make gopher respect ip Rin Toshaka 2018-12-07 19:21:58 +0100
• fd5c7b445f Fix a typo Rin Toshaka 2018-12-07 19:19:14 +0100
• da4315b5ef Merge branch 'emoji-alphabetical-ordering' into 'develop' lambda 2018-12-07 18:13:39 +0000
• a02e0c18bc Mix Tasks: Add task uploads.ex for migrating local uploads. Rin Toshaka 2018-12-07 15:13:57 +0100
• 3b27f61ffa
  AnonymizeFilename: allow for a pre-defined text instead of random string href 2018-12-07 14:07:11 +0100
• 3c925e9d88
  Emojis: Alphabetical ordering href 2018-12-07 11:16:27 +0100
• 1cea97df64 [#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.) Ivan Tashkinov 2018-12-07 12:27:32 +0300
• 8764f64690 Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop' lambda 2018-12-07 09:23:56 +0000
• 4b90c7cc9d Merge branch 'fix/typo-in-relay-doc' into 'develop' lambda 2018-12-07 09:19:15 +0000
• 4e2250b1dd Fix a typo in relay.ex moduledoc rinpatch 2018-12-07 11:41:01 +0300
• 6ed5044c4e [#394] Refactoring (using Ecto.Multi; "untag" route change). Ivan Tashkinov 2018-12-07 11:04:39 +0300
• f7e23aee90 Oops rinpatch 2018-12-07 10:44:54 +0300
• f661813807 Add mix pleroma.user unsubscribe to mix doc rinpatch 2018-12-07 10:39:54 +0300
• c88db2c1b1 Merge branch 'fix/add-common.ex' into 'develop' eal 2018-12-07 06:48:39 +0000
• 08e10a70ec Rename def to defval rinpatch 2018-12-07 09:46:13 +0300
• 1d11c4cf11 add common.ex Rin Toshaka 2018-12-07 06:12:39 +0100
• 220de24002 Merge branch 'refactor/mix-tasks' into 'develop' kaniini 2018-12-06 22:09:27 +0000
• 7a2162bbcb [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. Ivan Tashkinov 2018-12-06 22:26:25 +0300
• f5726a2e12 Update README.md Rin Toshaka 2018-12-06 18:45:07 +0100
• abbf347dc7 [#394] View tests fix. Ivan Tashkinov 2018-12-06 20:38:52 +0300
• 71d5cf9ed8 Remove unused vars from user.ex Rin Toshaka 2018-12-06 18:25:39 +0100
• 7bcb6a183a [#394] Refactoring. Ivan Tashkinov 2018-12-06 20:23:16 +0300
• 66313cda02 Update instance.ex for web push Rin Toshaka 2018-12-06 18:16:51 +0100
• 22830c8fc9 [#394] Formatting fix. Ivan Tashkinov 2018-12-06 20:13:07 +0300
• 88f92693f2 Merge develop Rin Toshaka 2018-12-06 18:11:22 +0100
• 7b19487389 [#394] Added `users.tags` and admin routes to tag and untag users. Added tests. Ivan Tashkinov 2018-12-06 20:06:50 +0300
• ca7b46fb3b Refactor common functions to common.ex Rin Toshaka 2018-12-06 18:01:28 +0100
• 4a2a7ce636 Refactor common functions to common.ex Rin Toshaka 2018-12-06 18:00:24 +0100
• 3a84511df1 remove migrate_local_uploads.ex Rin Toshaka 2018-12-06 17:35:33 +0100
• 1d531fd2f3 Merge branch 'fix/mastodon-api-settings' into 'develop' kaniini 2018-12-06 16:01:58 +0000
• abead01ab6 Merge branch 'correct-and-improve-http-options' into 'develop' kaniini 2018-12-06 15:57:56 +0000
• b0adea30b3 Merge branch 're-mrf' into 'develop' kaniini 2018-12-06 15:36:41 +0000
• 776179c2ed Merge branch 'feature/compat/push-subscriptions' into 'develop' kaniini 2018-12-06 15:35:30 +0000
• 2ae1128d9f MastoAPI: Fix put_settings rinpatch 2018-12-06 17:42:07 +0300
• d27e3f269f Rename regular expression 'have_re' to 'reply_prefix'. scarlett 2018-12-06 14:00:41 +0000
• 6f36e903b0 use `User.avatar_url` Egor Kislitsyn 2018-12-06 20:55:46 +0700
• 79668c08fc cleanup Egor Kislitsyn 2018-12-06 20:50:20 +0700
• 3dff61ebec Harden re: detection. scarlett 2018-12-06 13:48:12 +0000
• 3d492795b7 clean up Egor Kislitsyn 2018-12-06 20:42:00 +0700
• 0020b22688 add VAPID to test config Egor Kislitsyn 2018-12-06 20:17:00 +0700
• 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions Egor Kislitsyn 2018-12-06 20:15:16 +0700
• bac58b1524 show warning if VAPID is not set Egor Kislitsyn 2018-12-06 19:56:56 +0700
• 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions Egor Kislitsyn 2018-12-06 19:55:58 +0700
• 04a48286e6 Add web push support Egor Kislitsyn 2018-12-06 19:29:04 +0700
• 6a6aaa0e1a Use object.normalize. scarlett 2018-12-06 11:37:29 +0000
• a09ed0f5af avoid mix format bug Hakaba Hitoyo 2018-12-06 18:41:29 +0900
• ccf0b46dd6 Merge branch '210_twitter_api_uploads_alt_text' into 'develop' kaniini 2018-12-06 07:36:21 +0000
• 3e90f688f1 [#210] Mastodon: actor storing for media uploads, ownership check to update_media. Refactoring. Ivan Tashkinov 2018-12-06 10:26:17 +0300
• 96ba95df2e remove follow_redirect options Hakaba Hitoyo 2018-12-06 11:38:33 +0900
• 27792b2d77 remove pool and timeout options which duplicate with the default Hakaba Hitoyo 2018-12-06 11:23:15 +0900
• 505d820827 Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options Hakaba Hitoyo 2018-12-06 10:48:05 +0900
• 48a0315646 Merge branch 'follower-hiding' into 'develop' kaniini 2018-12-05 21:41:53 +0000
• 6ab58fdfa1 Merge branch 'dev_vald_fe/data_tag' into 'develop' kaniini 2018-12-05 20:47:44 +0000
• 194869c7db added data attrs to twitter scrubber Vald 2018-12-06 02:14:56 +0530
• 7d5720f2e4 Fix merge. lain 2018-12-05 21:31:02 +0100
• 76d6b1c6ab Merge remote-tracking branch 'origin' into follower-hiding lain 2018-12-05 21:27:56 +0100
• 3ea4476445 MastodonAPI: Show users their own network. lain 2018-12-05 21:25:06 +0100
• 3c8ffe7ed3 resolved activity view test Vald 2018-12-06 01:54:04 +0530
• 028904c333 lint Vald 2018-12-06 01:46:53 +0530
• 911a877576 resolved api and controller test failures Vald 2018-12-06 01:46:30 +0530