Commit Graph

  • 4aaffe3a10
    log capture Alexander Strizhakov 2020-11-18 16:36:24 +0300
  • 8a8c154b4e
    test fixes Alexander Strizhakov 2020-11-18 10:03:48 +0300
  • 44f3795b8e
    changelog entries for fixes Alexander Strizhakov 2020-11-17 20:03:28 +0300
  • be0b874e1d
    fix for mastodon forwarded reports Alexander Strizhakov 2020-11-17 19:57:57 +0300
  • a840aefda8
    formatting Alexander Strizhakov 2020-11-16 19:41:03 +0300
  • e2bf6b1f7e
    fix for forwarded reports Alexander Strizhakov 2020-11-16 19:22:32 +0300
  • 8a7ee9fe74 Merge branch 'revert-da4660d2' into 'develop' feld 2020-11-18 21:16:12 +0000
  • 3e7642b123 Update AdminFE build to pleroma/admin-fe@c18f167a12 Mark Felder 2020-11-18 14:42:16 -0600
  • 42ff5ea95e Revert "Merge branch 'use-https-in-dockerfile' into 'develop'" feld 2020-11-18 20:32:30 +0000
  • 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions' minibikini 2020-11-18 20:22:40 +0000
  • 1d03ba4ffb Fixed emoji reactions not being filtered from blocked and muted accounts Mark Felder 2020-11-18 20:13:25 +0000
  • a1056aace1 Merge branch 'fix/mix-task-user-delete_activities' into 'develop' feld 2020-11-18 18:57:47 +0000
  • aae669d05e Merge branch 'fix/webpush-and-emojireact' into 'develop' lain 2020-11-18 18:33:48 +0000
  • 1b63aa0b4f Apply 1 suggestion(s) to 1 file(s) lain 2020-11-18 18:27:30 +0000
  • 6b32e1de23 Merge branch 'frontend-admin-api' into 'develop' lain 2020-11-18 17:51:57 +0000
  • d7b63272b8 Changelog: Move api info to api heading. lain 2020-11-18 18:32:13 +0100
  • 9c5d1cb9ed fix tests Maksim Pechnikov 2020-11-18 09:58:51 +0300
  • 3c00af82dc Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:37 +0000
  • 137b7f9e28 Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:30 +0000
  • e91e2399ee Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:22 +0000
  • ce11f0bc33 Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:09 +0000
  • 25eb222bed Apply 1 suggestion(s) to 1 file(s) Maksim 2020-11-18 05:19:01 +0000
  • fe7008ee39 Merge branch 'update/admin-fe-20201117' into 'develop' feld 2020-11-17 23:16:17 +0000
  • ad7fc35252 Update AdminFE build to pleroma/admin-fe@5b38aea279 Mark Felder 2020-11-17 17:01:34 -0600
  • 415481a4d9 Add test for POST when push is disabled Mark Felder 2020-11-17 22:18:22 +0000
  • 3eaa5335c9 Revert adding extra alert types here Mark Felder 2020-11-17 21:37:17 +0000
  • d9732fb7d3 Fix incorrect test description Mark Felder 2020-11-17 21:34:18 +0000
  • ccddedb504 Credo Mark Felder 2020-11-17 20:33:30 +0000
  • ff7a4b6aa2 Test that we ignore invalid subscription alert types separately. Mark Felder 2020-11-17 20:18:51 +0000
  • 30f140e570 Ensure all supported push notification subscription alert types are tested Mark Felder 2020-11-17 20:14:38 +0000
  • 499faa82f6 Synchronize reaction notification text with PleromaFE's style Mark Felder 2020-11-17 19:51:37 +0000
  • 5d0bc5e028 Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription Mark Felder 2020-11-17 20:21:48 +0000
  • 67a6abd071 Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions Mark Felder 2020-11-17 19:15:11 +0000
  • 80e21903d4 Spelling Mark Felder 2020-11-17 19:06:30 +0000
  • 1433d3c59c Document the API extensions for push subscriptions Mark Felder 2020-11-17 19:05:36 +0000
  • 83ec2f1384 Allow subscribing for pleroma:emoji_reaction push notifications Mark Felder 2020-11-17 18:33:40 +0000
  • 3ce11b830e Add capability for emoji reaction push notifications Mark Felder 2020-11-13 17:01:53 -0600
  • e6d4d62f85 Docs: Add info about frontend install error response lain 2020-11-17 16:44:20 +0100
  • bb9650f3c2 FrontendController: Return error on installation error. lain 2020-11-17 16:43:07 +0100
  • 56d95203b5 Document fixing the pleroma.user delete_activities mix task Mark Felder 2020-11-17 15:28:46 +0000
  • 97201f7e37 Need to start web_resp cache or mix task fails Mark Felder 2020-11-17 15:15:53 +0000
  • d33b9e7b33 Merge branch 'remove/fedsockets' into 'develop' feld 2020-11-17 14:58:33 +0000
  • cf99b1c1fd Merge branch 'release/just-a-test-for-arm32-on-arm64' into 'develop' rinpatch 2020-11-17 14:52:08 +0000
  • f69fe36ebf
    Merge branch 'develop' into frontend-admin-api Egor Kislitsyn 2020-11-17 18:34:04 +0400
  • d48dbfab2b
    Merge remote-tracking branch 'origin/develop' into hide-muted-reactions Egor Kislitsyn 2020-11-17 18:30:10 +0400
  • 79d2d3f609
    Merge branch 'develop' into hide-muted-reactions Egor Kislitsyn 2020-11-17 18:29:52 +0400
  • 2c55f7d7cb Remove FedSockets rinpatch 2020-11-17 17:28:30 +0300
  • 61f86774d1 Merge branch 'chores/note-handling-move' into 'develop' lain 2020-11-17 14:16:53 +0000
  • fbd6217ed9 Merge branch 'feature/local-only-scope' into 'develop' lain 2020-11-17 14:08:45 +0000
  • fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope lain 2020-11-17 15:01:38 +0100
  • 9b9afe6b3f Merge branch 'fix/debian-install-libmagic-typo' into 'develop' rinpatch 2020-11-17 13:24:01 +0000
  • f711a41933 Debian installation guide: fix libmagic header package name rinpatch 2020-11-17 16:11:37 +0300
  • c7536f16cb Merge branch 'feat/add-bundles-to-gitattributes' into 'develop' rinpatch 2020-11-17 12:55:09 +0000
  • 83ec4aadd6 Merge branch 'chores/tesla_1.4.0' into 'develop' rinpatch 2020-11-17 12:42:51 +0000
  • 6c3273892f Merge branch 'sync-stable/2.2.0' into 'develop' rinpatch 2020-11-17 12:40:42 +0000
  • 9960383925 .gitattributes: Treat js/css/source maps as binary files rinpatch 2020-11-17 15:38:28 +0300
  • 11d8fefa7b CHANGELOG.md: Use a period after every bullet point for unreleased sections rinpatch 2020-11-17 15:21:46 +0300
  • ba214f3f16 CHANGELOG.md: Add back an entry for S3 fix rinpatch 2020-11-17 15:20:57 +0300
  • 651fade275 Merge branch 'weblate-pleroma-pleroma' into 'develop' Haelwenn 2020-11-17 12:16:54 +0000
  • b1fc9fe951 mix.exs: bump development version to 2.2.50 after 2.2.0 release rinpatch 2020-11-17 15:14:35 +0300
  • 77c239f309 Import stable commits into develop after releasing 2.2.0 rinpatch 2020-11-17 15:10:58 +0300
  • 81293e5aad ActivityPubController: Don't return local only objects lain 2020-11-17 13:11:39 +0100
  • 3f69680ed9
    mix.exs: Update tesla to 1.4.0 Haelwenn (lanodan) Monnier 2020-11-17 13:09:56 +0100
  • ffc2bb70ff Gitlab CI: Specify image architecture for arm64 images lain 2020-11-17 12:42:55 +0100
  • 26b74f4c58 Added translation using Weblate (Hebrew) Guy Sheffer 2020-11-10 13:39:17 +0000
  • a81f0a4a7d Merge branch 'fix/s3-uploads-elixir-1.11' into 'develop' lain 2020-11-17 11:14:50 +0000
  • 9d4797f61b Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop' lain 2020-11-17 11:12:20 +0000
  • b1466661eb Use absolute URLs to thumbnail and background in /api/v1/instance Mark Felder 2020-11-16 21:29:15 +0000
  • 5cbaa76fd6 Document S3 and Elixir 1.11 compat fix Mark Felder 2020-11-16 19:54:02 +0000
  • eea962fc10 Fix S3 uploads with Elixir 1.11 Mark Felder 2020-11-16 19:51:44 +0000
  • e4b202d905 added test Maksim Pechnikov 2020-11-16 22:23:28 +0300
  • fb41bd1a85 Hide reactions from muted and blocked users Egor Kislitsyn 2020-11-16 22:23:25 +0400
  • e1d25bad0c fix tests Maksim Pechnikov 2020-11-16 21:45:37 +0300
  • 9546c1444c
    Merge remote-tracking branch 'upstream/develop' into registration-workflow Alex Gleason 2020-11-14 19:48:47 -0600
  • 28da36975d Merge branch 'bugfix/instance-gen_exiftool' into 'develop' Haelwenn 2020-11-14 21:43:07 +0000
  • e2f573d68b
    pleroma.instance: Fix Exiftool module name Haelwenn (lanodan) Monnier 2020-11-14 22:27:13 +0100
  • 36ec604521 added test Maksim Pechnikov 2020-11-14 08:30:22 +0300
  • fcb1e7b750 Gitlab CI: Change tags bag to arm32 lain 2020-11-13 16:19:09 +0100
  • 27108acd0f Gitlab CI: Alpine is alpine lain 2020-11-13 14:48:40 +0100
  • 0d149502fe Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' lain 2020-11-13 13:35:47 +0000
  • 70e4b86250 Make notifs view work for reports Ilja 2020-11-13 13:35:46 +0000
  • 0597571fca Merge branch 'docs/otp-tuning' into 'develop' lain 2020-11-13 13:31:46 +0000
  • 1d3f916991 Gitlab CI: Specify arm32v7 image for arm32 builds lain 2020-11-13 14:23:24 +0100
  • 1830b6aae5 added error messages for posix error code Maksim Pechnikov 2020-11-13 15:13:14 +0300
  • 157e32a39c Merge branch 'fix/oban-in-database-config' into 'develop' rinpatch 2020-11-13 10:32:16 +0000
  • 10528344c7
    remove PurgeExpiredActivity from Oban db config Alexander Strizhakov 2020-11-13 09:07:08 +0300
  • 74179e6ac3 Merge branch 'majic-dep' into 'develop' feld 2020-11-12 22:41:00 +0000
  • c09813193a Install file-dev in Dockerfile build stage Michael Walker 2020-11-12 22:20:17 +0000
  • 6e7963cca1 Merge branch 'build-release/fix-release-builds' into 'stable' rinpatch 2020-11-12 14:38:49 +0000
  • 3a6aa103d3 .gitlab-ci.yml: Add libmagic to installed packages for OTP releases rinpatch 2020-11-12 16:14:15 +0300
  • 1172844ed1 Merge branch 'release/2.2.0' into 'stable' rinpatch 2020-11-12 12:34:48 +0000
  • 6ca709816f Fix object spoofing vulnerability in attachments rinpatch 2020-10-28 18:08:23 +0300
  • 99bc175f02 Merge branch 'title-injection-change' into 'develop' Haelwenn 2020-11-12 08:50:26 +0000
  • ccec59047b Merge branch 'feature/ingest-blurhash' into 'develop' feld 2020-11-11 22:37:16 +0000
  • 966663c3f8 Fix tests for other attachment types Mark Felder 2020-11-11 16:17:35 -0600
  • b4c6b262d6 pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983ad rinpatch 2020-11-11 23:28:15 +0300
  • 99edfba3da Polish the changelog a bit and specify release date rinpatch 2020-11-11 23:12:52 +0300
  • 2156de2fee Ingest blurhash field during transmogrification Mark Felder 2020-11-11 13:39:02 -0600
  • 2254e5e595 Render blurhashes in Mastodon API Mark Felder 2020-11-11 12:51:13 -0600
  • 6fd72e9e85 Ingest blurhash for attachments if they were federated Mark Felder 2020-11-11 12:27:51 -0600