Commit graph

  • 544bdbfb90 Merge branch 'fix/email-task-otp' into 'develop' rinpatch 2020-02-09 12:05:32 +0000
  • 6ea3c06d8d [#1505] Minor refactoring. Ivan Tashkinov 2020-02-09 14:09:01 +0300
  • 06fec99e1d mix.exs: bump version to 1.1.9 rinpatch 2020-02-09 12:19:47 +0300
  • 7c3991f59e [#1505] Fixed replies serialization (included objects' ids instead of activities' ids). Ivan Tashkinov 2020-02-09 10:17:21 +0300
  • 8fda6303ba Fix email mix task on OTP releases rinpatch 2020-02-09 03:27:29 +0300
  • 01396a11f2 changelog: add entry for 1.1.9 rinpatch 2020-02-09 01:22:56 +0300
  • 1e3dda9b1d Actually fix upload limit on OTP releases rinpatch 2020-02-07 19:21:55 +0300
  • be3cdde9db deps: update plug to 1.9 rinpatch 2020-02-09 01:06:58 +0300
  • 31dc669de6 fix not being able to pin polls rinpatch 2020-02-02 14:55:06 +0300
  • 1e74bbc495 Merge branch 'fix-streaming-reblog' into 'develop' Haelwenn 2020-01-29 20:21:32 +0000
  • 40727b28a7 Merge branch 'fix/truncate-remote-user-fields' into 'develop' rinpatch 2019-09-14 16:39:42 +0000
  • f486556346 fixed Metadata.Utils.scrub_html_and_truncate Maksim Pechnikov 2020-01-03 16:21:52 +0300
  • a87843693b Fix never matching clause rinpatch 2019-12-08 16:36:22 +0300
  • 4e6bbdc7b5 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation Ivan Tashkinov 2020-02-08 19:59:37 +0300
  • d458f4fdca [#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation. Ivan Tashkinov 2020-02-08 19:58:02 +0300
  • 964b4d82a0 Merge branch 'fix/upload-limit-otp' into 'develop' lain 2020-02-08 14:02:36 +0000
  • dad23e3766
    need_reboot flag Alexander Strizhakov 2020-02-08 12:55:37 +0300
  • 815f659ed8
    Fix MRF documentation Egor Kislitsyn 2020-02-07 22:17:08 +0400
  • 15ea75cd2a Actually fix upload limit on OTP releases rinpatch 2020-02-07 19:21:55 +0300
  • 1262357ddb Merge branch 'cancel-follow-request' into 'develop' Haelwenn 2020-02-07 16:10:43 +0000
  • 8d01aaa702 Merge branch 'questions-timezone' into 'develop' rinpatch 2020-02-07 16:04:40 +0000
  • d85bcc8627 Questions: Add timezone to closed property Lain Soykaf 2020-02-07 16:57:46 +0100
  • f57cea17bc deps: update plug to 1.9 rinpatch 2020-02-07 18:38:36 +0300
  • 57098713c0 Apply suggestion to docs/API/pleroma_api.md lain 2020-02-07 15:18:05 +0000
  • 713645d5c5 Apply suggestion to docs/API/pleroma_api.md lain 2020-02-07 15:17:42 +0000
  • 4538a1ee01 EmojiReactions: Remove old API endpoints Lain Soykaf 2020-02-07 15:01:45 +0100
  • ce95882009 EmojiReactions: Add docs and Changelog Lain Soykaf 2020-02-07 14:59:26 +0100
  • f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response Lain Soykaf 2020-02-07 14:52:13 +0100
  • bc2e98b200
    Add User.get_follow_state/2 Egor Kislitsyn 2020-02-07 16:17:34 +0400
  • f13b7878b4 Merge branch 'rename_emoji_reactios' into 'develop' rinpatch 2020-02-07 10:35:37 +0000
  • 1b51390e4c Merge branch 'docs-fix' into 'develop' rinpatch 2020-02-07 10:10:34 +0000
  • 01da001da1
    fix Alexander Strizhakov 2020-02-07 10:48:10 +0300
  • 8a79f20c21 EmojiReactions: Rename to EmojiReacts Lain Soykaf 2020-02-06 18:09:57 +0100
  • 5b1ef335de Merge branch 'update/fe-bundle-20200206' into 'develop' rinpatch 2020-02-06 17:00:46 +0000
  • fed9b0d1e0 Update FE bundle Mark Felder 2020-02-06 10:59:41 -0600
  • df0b00b32d Merge branch 'mastoapi-non-html-strings' into 'develop' feld 2020-02-06 16:08:23 +0000
  • e12bf05f23 Merge branch 'fix/dymamic-docs' into 'develop' feld 2020-02-06 16:03:29 +0000
  • 5499f172b2 Merge branch 'config-changes' into 'develop' feld 2020-02-06 16:02:46 +0000
  • 2cc4fbab96
    Update CHANGELOG Egor Kislitsyn 2020-02-06 18:03:53 +0400
  • 8b9742ecf5 Cancellation of a follow request for a remote user Egor Kislitsyn 2020-02-06 16:47:15 +0400
  • 6769ecd948 Merge branch 'develop' into fix/dymamic-docs rinpatch 2020-02-06 15:04:21 +0300
  • 6722dade42 Simplify in-database config docs rinpatch 2020-02-06 15:00:33 +0300
  • 7a2e153a8d
    description change Alexander Strizhakov 2020-02-06 13:15:23 +0300
  • bdf0a87be9
    dropdown type Alexander Strizhakov 2020-02-05 19:05:20 +0300
  • c85aa6e87f
    removing confusing error Alexander Strizhakov 2020-02-05 17:06:01 +0300
  • 15cb1f6804 Merge branch 'fix/unpinnable-polls' into 'develop' rinpatch 2020-02-05 21:04:16 +0000
  • 72d767998c Merge branch 'removing-admin-api-endpoint' into 'develop' rinpatch 2020-02-05 21:03:56 +0000
  • b21e59da5f Merge branch 'remove-linker-scheme-option' into 'develop' feld 2020-02-05 20:32:45 +0000
  • 2a3e06eb70 Apply suggestion to CHANGELOG.md Alexander Strizhakov 2020-02-05 18:28:05 +0000
  • 5db6ac8ee4
    removing migrate_from_db endpoint from admin api Alexander Strizhakov 2020-02-05 20:36:21 +0300
  • 3909b5b7b3
    Remove AutoLinker scheme option from the config Egor Kislitsyn 2020-02-05 21:13:56 +0400
  • 49e80a1537 Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' rinpatch 2020-02-05 16:59:21 +0000
  • 8c71f7e11a Add support for cancellation of a follow request Egor Kislitsyn 2020-02-04 20:35:32 +0400
  • e84fee5b86 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation Ivan Tashkinov 2020-02-05 07:56:36 +0300
  • a56db78935 Merge branch 'feature/make_attachments_cleanup_optional' into 'develop' lain 2020-02-04 15:29:26 +0000
  • 90b862e7ab Add cheatsheet entry Lain Soykaf 2020-02-04 16:22:13 +0100
  • 2c40c8b4a2 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-02-03 21:42:36 +0300
  • 50f5a92021 fix not being able to pin polls rinpatch 2020-02-02 14:55:06 +0300
  • 983a87175e mastodon API: do not sanitize html in non-html fields rinpatch 2020-01-30 19:47:57 +0300
  • 8057157ee3 Make attachments cleanup optional Roman Chvanikov 2020-01-31 01:20:37 +0300
  • c27d1d65bf Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop' rinpatch 2020-01-30 19:24:04 +0000
  • 5b62acf6e9 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost rinpatch 2020-01-30 22:16:55 +0300
  • 774cba84f5 Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop' lain 2020-01-30 18:47:44 +0000
  • 01537cc1d6 Apply suggestion to docs/configuration/cheatsheet.md lain 2020-01-30 18:28:28 +0000
  • e52e78a937 Merge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop' lain 2020-01-30 18:27:13 +0000
  • 01fb4dbeae Emoji Reactions: Add fixtures lain 2020-01-30 16:26:45 +0100
  • a0d9d42eaa Emoji Reactions: Actually use the validation. lain 2020-01-30 16:07:37 +0100
  • e2f2602fdc Merge branch 'emoji-api-errors' into 'develop' feld 2020-01-30 14:13:40 +0000
  • df200ea7a4 Merge branch 'http-security-warning' into 'develop' feld 2020-01-30 14:11:29 +0000
  • b3e9c87724 Update emoji_api_controller.ex feld 2020-01-30 14:09:41 +0000
  • 36becd5573 Update http_security_plug.ex feld 2020-01-30 14:07:41 +0000
  • ff4bef140a Apply suggestion to docs/configuration/cheatsheet.md rinpatch 2020-01-30 13:24:24 +0000
  • 263abe3ba5 Merge branch 'emoji-reactions-reacted' into 'develop' rinpatch 2020-01-30 13:16:04 +0000
  • 889965141a RemoteIp: only trust X-Forwarded-For rinpatch 2020-01-29 23:59:27 +0300
  • f5cb2af85a cheatsheet: improve rate limiter docs and add new limiters rinpatch 2020-01-29 23:59:00 +0300
  • 7499805abf config.exs: Re-enable rate limiter and enable remote ip rinpatch 2020-01-29 23:58:15 +0300
  • 946de2299c Merge branch 'fix-streaming-reblog' into 'develop' Haelwenn 2020-01-29 20:21:32 +0000
  • 505234d975 Merge branch 'changelog-update' into 'develop' lain 2020-01-29 16:32:06 +0000
  • f5f7a0f9c1 Update confusing changelog message for attachments cleanup Roman Chvanikov 2020-01-29 18:53:25 +0300
  • e07e7888d7
    Fix credo warning Egor Kislitsyn 2020-01-29 18:53:43 +0400
  • 2bd4d6289b
    Make the warning more scarier Egor Kislitsyn 2020-01-29 18:43:23 +0400
  • e7fee0d6fa
    emoji api error on not writable dir Alexander Strizhakov 2020-01-29 13:51:17 +0300
  • 646016c403 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-01-29 11:05:19 +0000
  • ff552c5151 FE sadposter 2020-01-29 10:56:34 +0000
  • 7a60cd91ff Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog lain 2020-01-29 11:52:24 +0100
  • e2e9299b8e Streamer Tests: code readability improvements lain 2020-01-29 11:50:49 +0100
  • b3a877d6c9 Emoji Reactions: Correctly handle deleted users lain 2020-01-29 11:43:36 +0100
  • d378550d2d Emoji Reactions: Document changes lain 2020-01-29 11:40:57 +0100
  • a802e07241 Emoji Reactions: Add reacted field to emoji reactions lain 2020-01-29 11:39:06 +0100
  • 9e0c2413b4 Merge branch 'meta-tags-parser' into 'develop' lain 2020-01-29 10:07:26 +0000
  • 1f4fbe9d98
    title parse improvement Alexander Strizhakov 2020-01-29 11:13:34 +0300
  • ba5e8a6444 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-01-28 21:11:13 +0300
  • f1d5c0f079 Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop' lain 2020-01-28 17:39:32 +0000
  • 21a2a05407 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2020-01-28 20:34:13 +0300
  • f5bfb29d3b Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9 lain 2020-01-28 18:37:03 +0100
  • cedee2793d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect lain 2020-01-28 17:52:42 +0100
  • e8f22451da Merge branch 'linkify-test-expansion' into 'develop' lain 2020-01-28 16:51:29 +0000
  • 12b6fcdb8c Merge branch 'features/task-test-email' into 'develop' lain 2020-01-28 16:42:57 +0000
  • 2c121b2623 Merge branch 'fix/1524-link_preview' into 'develop' lain 2020-01-28 16:38:14 +0000
  • 7bd4c14581
    meta tag parser respect first title header Alexander Strizhakov 2020-01-28 19:29:27 +0300