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

• a2640c8088
  Parse correctly content-type & do not forward content-length href 2018-11-23 18:57:27 +0100
• b19597f602
  reverse proxy / uploads href 2018-11-23 17:40:45 +0100
• d0ec2812bd Merge remote-tracking branch 'origin' into validate-user-info lain 2018-11-30 17:34:20 +0100
• 8f1fffebc6 Fix transmogrifier test. lain 2018-11-30 17:31:05 +0100
• d088ac6286 Fix OStatus user updates. lain 2018-11-30 17:21:58 +0100
• 48b95a9b95 Assorted fixes. lain 2018-11-30 17:08:02 +0100
• d407f662af Fix TwitterApiController. lain 2018-11-30 17:07:37 +0100
• a6812bc9df Remove "most recent notification" endpoint. lain 2018-11-30 16:47:37 +0100
• 52ce368562 Merge branch 'bugfix/server-true-in-prod' into 'develop' kaniini 2018-11-30 04:36:20 +0000
• 761ed2355f
  config/prod.exs: Remove server: true Haelwenn (lanodan) Monnier 2018-11-30 03:05:34 +0100
• c86d14a84d Merge branch 'enable-ci-cache' into 'develop' lambda 2018-11-29 09:34:46 +0000
• 72f038bdf2 Only jobs for one branch are allowed to use the same cache rinpatch 2018-11-29 12:20:47 +0300
• 36826b11a6 Cache _build rinpatch 2018-11-29 12:09:32 +0300
• 2a58f5dcaa Add dependency caching rinpatch 2018-11-29 11:45:14 +0300
• 6ac5d48575 More fixes lain 2018-11-29 00:25:43 +0100
• 73101c1fc1 Merge branch 'fix-list-stream-privacy' into 'develop' lambda 2018-11-28 21:10:20 +0000
• 7049ed5936 Merge branch 'revert-02e43d44' into 'develop' kaniini 2018-11-27 23:20:12 +0000
• 4a019827b2 Revert "Merge branch 'chore/mix-lock-update' into 'develop'" kaniini 2018-11-27 23:19:30 +0000
• 02e43d44d3 Merge branch 'chore/mix-lock-update' into 'develop' kaniini 2018-11-27 22:59:01 +0000
• 0314f04c2a Add ex_doc & makeup_elixir to mix.lock Maxim Filippov 2018-11-28 01:12:06 +0300
• 87098d1676 Streamer: Don't send unwanted DMs to list streams KokaKiwi 2018-11-27 01:14:43 +0100
• e002858071 Fix ostatus test. lain 2018-11-27 18:37:46 +0100
• 3c61df6b9e Webfinger fixes. lain 2018-11-27 18:31:44 +0100
• 5bd3b3a215 More and more fixes. lain 2018-11-27 18:21:05 +0100
• badbe2656c More fixes. lain 2018-11-27 18:12:03 +0100
• 41ff86ca1d Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop' kaniini 2018-11-27 17:10:08 +0000
• b9bc83097d Merge branch 'ogg-theora-detection' into 'develop' kaniini 2018-11-27 16:55:56 +0000
• ec464ef20a HTTP sig fixes. lain 2018-11-27 17:42:45 +0100
• f983c1d0c6 Fix CommonApi tests. lain 2018-11-27 17:31:14 +0100
• 0d229613df Fix lint error rinpatch 2018-11-27 19:07:58 +0300
• 7f20a3cf1f Add Theora detection to upload.ex rinpatch 2018-11-27 14:34:29 +0300
• 5ae6088d37 Merge branch 'feature/mrf-user-allowlist' into 'develop' Haelwenn 2018-11-27 00:12:03 +0000
• a76058fc1d Merge branch 'fix/pleromafe-title' into 'develop' kaniini 2018-11-26 23:59:30 +0000
• 6979eeda34 config: document mrf_user_allowlist William Pitcock 2018-11-26 23:54:46 +0000
• 271f9f1335 nodeinfo: add mrf_user_allowlist data William Pitcock 2018-11-26 23:42:24 +0000
• 8c05d19c7f MRF: add user allowlist module William Pitcock 2018-11-26 23:23:43 +0000
• 6cc94404d7 Replace this hardcoded <title> Mark Felder 2018-11-26 22:51:25 +0000
• bdb0c6e418 Merge branch 'bugfix/csp-no-https' into 'develop' kaniini 2018-11-26 22:24:21 +0000
• 04daa0fa44
  Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https Haelwenn (lanodan) Monnier 2018-11-26 21:40:29 +0100
• 3370924b8b Merge branch 'add-manifest-src-to-csp' into 'develop' Haelwenn 2018-11-26 19:56:49 +0000
• 591b11eafc
  Add manifest-src to allow manifest.json shibayashi 2018-11-26 20:48:24 +0100
• 39a3b1724a Merge branch 'bugfix/public-mastoapi-websocket' into 'develop' kaniini 2018-11-25 02:54:54 +0000
• f70b20e499
  version string: force git abbrev size to 8 chars href 2018-11-24 14:38:34 +0100
• cc8952b45f
  Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket Haelwenn (lanodan) Monnier 2018-11-24 08:47:35 +0100
• ca029f0b69
  Web.Streamer: Get unauthenticated statuses representation Haelwenn (lanodan) Monnier 2018-11-24 08:45:45 +0100
• d388a99143
  Web.MastodonAPI.MastodonSocket: Put access_token at function-level Haelwenn (lanodan) Monnier 2018-11-24 06:43:03 +0100
• 5346fabf14
  Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints Haelwenn (lanodan) Monnier 2018-11-24 06:13:36 +0100
• 675653ceb7 Merge branch 'feature/admin-api' into 'develop' kaniini 2018-11-22 00:28:04 +0000
• 182e3e8da2 Merge branch 'feature/improve-version' into 'develop' kaniini 2018-11-21 16:53:38 +0000
• a591a044a9 Merge branch 'runtime-fixes' into 'develop' kaniini 2018-11-20 22:25:35 +0000
• 0bea0308f1 Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info lain 2018-11-20 20:16:16 +0100
• d3180e0ccc Raise on usage of old function. lain 2018-11-20 20:14:38 +0100
• 0896cf4c0f Fix most mastodon api bugs. lain 2018-11-20 20:12:39 +0100
• 5b3480d896 tests: fix up some more broken mastodon api testcases William Pitcock 2018-11-20 19:08:41 +0000
• c7d08bc1cf Merge branch 'feature/retry-queue' into 'develop' Haelwenn 2018-11-20 19:04:52 +0000
• 3456948cd1 mastodon api: fix up quite a few test failures William Pitcock 2018-11-20 19:02:23 +0000
• ef6c64a5d2 activitypub: fix restrict_blocked() William Pitcock 2018-11-20 18:58:08 +0000
• c196754b4d mastodon api: account view: fix tests William Pitcock 2018-11-20 18:54:48 +0000
• ece8656733 streamer: fix fetching the user's block list William Pitcock 2018-11-20 18:47:12 +0000
• 3356c7d1e9 oauth plug: fix deactivated check William Pitcock 2018-11-20 18:47:00 +0000
• 4ac849cb4a common api: fix moderator check when deleting posts William Pitcock 2018-11-20 18:42:28 +0000
• 312676f711 user: fix user.info lookup in User.locked?() William Pitcock 2018-11-20 18:41:44 +0000
• 6f0b9a5163 Fix Notification tests. lain 2018-11-20 19:15:28 +0100
• dbb483659a Merge branch 'fix/mediaproxy-empty-url' into 'develop' kaniini 2018-11-20 18:09:46 +0000
• 2887f4ff1d Fix formatter tests. lain 2018-11-20 19:07:01 +0100
• bc5cf2c192
  Improved version string href 2018-11-20 17:55:03 +0100
• 7f4c3a1e99
  mediaproxy: fix empty url & add some tests href 2018-11-20 17:46:54 +0100
• 689b46efc8 RetryQueue: tiny refractor, add tests eal 2018-11-19 18:08:41 +0200
• bcecdc3ab1
  Various runtime configuration fixes href 2018-11-16 21:35:08 +0100
• fbb70d25fe Several twitter api fixes. lain 2018-11-18 22:36:47 +0100
• 40d9d2098c Fix user updating from AP. lain 2018-11-18 22:15:03 +0100
• cafa15131a Mix format. lain 2018-11-18 21:41:35 +0100
• 4c918392c6 Fix most User tests. lain 2018-11-18 21:40:52 +0100
• e7cd6e9739 Fix setting of keys. lain 2018-11-18 19:33:43 +0100
• fc3bcf335e Fix following locked users. lain 2018-11-18 18:53:50 +0100
• d5af41b577 Fix note count update. lain 2018-11-18 18:52:21 +0100
• 6f90ceb2ed Fix follower count test. lain 2018-11-18 18:46:04 +0100
• 8e3d8bde04 Fix user deactivation test. lain 2018-11-18 18:40:58 +0100
• 812f5b058a Fix blocking. lain 2018-11-18 18:40:31 +0100
• fbc3f2893a Merge branch 'update/pleroma-fe-20181118' into 'develop' kaniini 2018-11-18 17:29:25 +0000
• db8f269cd3 update pleroma frontend William Pitcock 2018-11-18 17:27:48 +0000
• 756764266c Formatting. lain 2018-11-18 18:27:04 +0100
• b396dba425 Fix follower count setting. lain 2018-11-18 18:24:16 +0100
• 5c8f07f0a8 Fix note counting. lain 2018-11-18 18:17:56 +0100
• 47d883d3ab Fix User deactivation. lain 2018-11-18 18:06:02 +0100
• 50585d051b Add User.Info module lain 2018-11-18 18:04:42 +0100
• 62299be094 Federator: add retry queue. eal 2018-08-26 21:17:13 +0300
• 5143501426 Merge branch 'security/as2-object-render-hardening' into 'develop' lambda 2018-11-17 22:43:45 +0000
• f6be980f4f activitypub: object view: avoid leaking private details William Pitcock 2018-11-17 22:29:08 +0000
• b471344b63 Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop' lambda 2018-11-17 22:20:08 +0000
• 98795172a7 ostatus controller: respond with AS2 objects instead of activities to notice URIs William Pitcock 2018-11-17 22:10:15 +0000
• d73c7cc0ca Merge branch 'security/spoofing-hardening' into 'develop' lambda 2018-11-17 21:52:51 +0000
• e10f839e9b tests: federator: fix formatting William Pitcock 2018-11-17 21:41:08 +0000
• dfcfb184b1 activitypub: transmogrifier: make deletes secure William Pitcock 2018-11-17 21:22:30 +0000
• 52681f7fd0
  Web.AdminAPI.AdminAPIControllerTest: New Test Haelwenn (lanodan) Monnier 2018-11-17 22:11:18 +0100
• 0ca00b3a07
  Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit Haelwenn (lanodan) Monnier 2018-11-17 22:10:23 +0100
• 76bd80d462
  test/plugs/user_is_admin_plug_test: New test Haelwenn (lanodan) Monnier 2018-11-17 20:04:54 +0100
• 44b6200103
  lib/mix/tasks/relay*: Use a with block Haelwenn (lanodan) Monnier 2018-11-10 15:53:37 +0100
• 12ccf0c4f8
  Change Relay from `status` to `{status, message}` Haelwenn (lanodan) Monnier 2018-11-10 15:31:37 +0100
• 4634d99d0d
  Web.Router: Change right to permission group (except for function names) Haelwenn (lanodan) Monnier 2018-11-10 15:20:49 +0100