Commit Graph

  • 712055612f
    don't run tests which change env in async Alexander Strizhakov 2020-05-11 15:07:05 +03:00
  • 4ba913d641
    {:error, :enoent} s3 fix Alexander Strizhakov 2020-05-08 18:51:16 +03:00
  • a5ccb5b0b1 Merge branch 'release/2.0.5' into 'stable' v2.0.5 lain 2020-05-13 08:12:09 +00:00
  • 3210e939bf Merge branch 'upgrade-comeonin' into 'develop' lain 2020-05-13 07:45:35 +00:00
  • b46811a074
    Upgrade Comeonin to v5 https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md Alex Gleason 2020-05-12 16:42:24 -05:00
  • 79ad12064d
    Fix format Egor Kislitsyn 2020-05-13 01:59:17 +04:00
  • 2906cbbd40 mix.exs: bump to 2.0.5 rinpatch 2020-05-13 00:08:36 +03:00
  • 6430df851d CHANGELOG.md: add 2.0.5 entry rinpatch 2020-05-13 00:08:07 +03:00
  • 3f13437a9c User: Truncate bios when updating a remote user. lain 2020-05-11 12:50:25 +02:00
  • 3a63f84c45 pleroma-fe bundle: update to 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7 rinpatch 2020-05-12 23:09:44 +03:00
  • a8abf1ada6 ActivityPub: Fix non-federating blocks. lain 2020-05-12 10:52:46 +02:00
  • cb1a3e196c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:23:43 +00:00
  • 5a2333925c Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:23:36 +00:00
  • 822e9c09aa Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:23:21 +00:00
  • 40646a7e0e Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:14:52 +00:00
  • 0bb164a3e1 Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:12:22 +00:00
  • 648cc0d72d Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex minibikini 2020-05-12 21:09:26 +00:00
  • 7803a85d2c
    Add OpenAPI spec for StatusController Egor Kislitsyn 2020-05-12 23:59:26 +04:00
  • c74018e6a7 Merge branch 'fix/eldap-required' into 'develop' rinpatch 2020-05-12 20:20:19 +00:00
  • a2fcfc78c9
    Filter config descriptions by config whitelist Stephanie Wilde-Hobbs 2020-05-12 21:07:33 +01:00
  • ec5e057802 Transmogrifier: On incoming follow accept, update follow counts. lain 2020-05-12 12:29:37 +02:00
  • b5b675fa14 fix eldap being required for non-OTP releases rinpatch 2020-05-12 23:03:21 +03:00
  • da2fe8920d fix eldap being required for non-OTP releases rinpatch 2020-05-12 23:03:21 +03:00
  • 40d0775c7f Reorder alias href 2020-05-12 21:27:54 +02:00
  • 37c2deb3dd Expand and authorize streams in Streamer directly (backport from !2519) href 2020-05-12 21:06:23 +02:00
  • 9f8fe51ea1 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-12 13:01:08 -05:00
  • bfb48e3db6 [#2456] OpenAPI: added embed_relationships param definition. Ivan Tashkinov 2020-05-12 20:55:01 +03:00
  • 2b18b8a263 Merge branch 'streamer-get-topic' into 'develop' rinpatch 2020-05-12 17:02:57 +00:00
  • 68cca29dcf Fix typo in test href 2020-05-12 18:51:10 +02:00
  • 24c8c13640 Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop' rinpatch 2020-05-12 16:45:46 +00:00
  • 4cc71aad65 Merge branch '1748-remote-following-follower-count' into 'develop' rinpatch 2020-05-12 16:44:58 +00:00
  • 63a1a82f38 [#2456] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching. Ivan Tashkinov 2020-05-12 19:14:35 +03:00
  • 620247a015
    Add database configuration whitelist Stephanie Wilde-Hobbs 2020-05-12 17:12:27 +01:00
  • e6d8cacf2d Expand and authorize streams in Streamer directly href 2020-05-12 18:04:47 +02:00
  • c02ad253c9 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-12 10:02:11 -05:00
  • fdc9ac8897 Merge branch 'otp-version-update-suggestion' into 'develop' lain 2020-05-12 14:53:26 +00:00
  • c0ea5c60e4 ChatController: Don't return chats for user you've blocked. lain 2020-05-12 16:43:04 +02:00
  • be5d0a9bde Merge branch '1020-honk-announces' into 'develop' lain 2020-05-12 14:35:51 +00:00
  • 8308611279 Startup: suggest updating OTP when the version is too low for gun rinpatch 2020-05-12 17:30:39 +03:00
  • 1462fa4906 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-12 08:46:09 -05:00
  • d17040e997 Merge branch 'giving-up' into 'develop' rinpatch 2020-05-12 13:23:40 +00:00
  • 2f2e5fea34 Give up for now and make gitlab retry failed jobs. lain 2020-05-12 15:02:37 +02:00
  • e44166b510 Credo fixes. lain 2020-05-12 14:44:11 +02:00
  • a61120f497 Documention: Add chat message deletion docs lain 2020-05-12 13:25:25 +02:00
  • ec72cba43e Chat Controller: Add basic error handling. lain 2020-05-12 13:23:09 +02:00
  • dcb5cda324 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-12 13:13:43 +02:00
  • b5aa204eb8 ChatController: Support deletion of chat messages. lain 2020-05-12 13:13:03 +02:00
  • dfb90a1fd6 Transmogrifier: Add tests for certain announces lain 2020-05-12 12:50:48 +02:00
  • ca31af473c Transmogrifier: On incoming follow accept, update follow counts. lain 2020-05-12 12:29:37 +02:00
  • d0ba1844b0 ActivityPub: Fix non-federating blocks. lain 2020-05-12 10:52:46 +02:00
  • 63477d07ad unsubscribes of friends when user deactivated Maksim Pechnikov 2020-05-12 06:44:33 +03:00
  • f8190aea5e Merge branch 'fix/issue-1676' into 'develop' rinpatch 2020-05-11 22:30:36 +00:00
  • 2ead4e108a Merge branch 'migration-fix-markers' into 'develop' rinpatch 2020-05-11 22:13:08 +00:00
  • 9b33cab06e Merge branch 'chore/gettext-update' into 'develop' rinpatch 2020-05-11 21:52:57 +00:00
  • 952c6b29a1 Gettext: remove english messages and update the pot file rinpatch 2020-05-12 00:40:13 +03:00
  • 1b23acf164 [#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments. Ivan Tashkinov 2020-05-11 23:21:53 +03:00
  • f6aa0b4a07 Migration: Fix typo lain 2020-05-11 22:03:29 +02:00
  • f71376e30e Migration: Enum.chunk is deprecated. lain 2020-05-11 22:00:01 +02:00
  • d8dd945a03 Markers migration: Fix migration for very large list of markers lain 2020-05-11 21:52:47 +02:00
  • 8d963c67de Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-05-11 13:23:33 -05:00
  • 768c18facb Merge branch 'fix/streamer-timeout' into 'develop' rinpatch 2020-05-11 17:07:55 +00:00
  • f28ed36b4d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-11 17:14:58 +02:00
  • e2b15e8ad3 Fix streamer timeout (closes #1753). href 2020-05-11 16:28:53 +02:00
  • e432314105 Merge branch '1439-favorite-deletion' into 'develop' lain 2020-05-11 13:58:18 +00:00
  • 679afb2de4 SideEffects test: Add test for favorite deletion. lain 2020-05-11 15:38:19 +02:00
  • 79cd723a1e Merge branch '1204-object-pruning-deletion' into 'develop' rinpatch 2020-05-11 13:31:11 +00:00
  • 5367a00257 Deletion: Handle the case of pruned objects. lain 2020-05-11 15:06:23 +02:00
  • 3bde0fa3f6
    Add OpenAPI spec for TimelineController Egor Kislitsyn 2020-05-11 15:24:59 +04:00
  • f01abaff37 User: Truncate bios when updating a remote user. 1754-bio-length-stable lain 2020-05-11 12:50:25 +02:00
  • fdb98715b8 Chat: Fix wrong query. lain 2020-05-11 10:58:14 +02:00
  • 84bb116ae3 Merge branch 'descriptions-fix' into 'develop' lain 2020-05-11 08:03:09 +00:00
  • da6a38d205
    copy/paste fix for descriptions Alexander Strizhakov 2020-05-11 09:35:20 +03:00
  • a6283bbae1 Merge branch 'release/2.0.4' into 'stable' v2.0.4 rinpatch 2020-05-10 17:13:03 +00:00
  • 489201d5d5 CHANGELOG.md: mention AP C2S change rinpatch 2020-05-10 19:54:37 +03:00
  • 9c23955879 mix.exs: bump version to 2.0.4 rinpatch 2020-05-10 02:37:36 +03:00
  • 69e1f23dd3 CHANGELOG.md: Add 2.0.4 entry rinpatch 2020-05-10 02:36:32 +03:00
  • 1b1dfb54eb Credo fixes. lain 2020-05-10 13:28:05 +02:00
  • 8cc8d960af Documentation: Add GET /chats/:id lain 2020-05-10 13:27:40 +02:00
  • 8d5597ff68 ChatController: Add GET /chats/:id lain 2020-05-10 13:26:14 +02:00
  • 172d9b1193 Chat: Add last_message to schema. lain 2020-05-10 13:08:01 +02:00
  • 17be3ff669 Documentation: Add last_message to chat docs. lain 2020-05-10 13:01:20 +02:00
  • f335e1404a ChatView: Add the last message to the view. lain 2020-05-10 13:00:01 +02:00
  • e297d8c649 Documentation: Add attachment docs lain 2020-05-10 12:34:12 +02:00
  • c272669909 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-10 12:32:57 +02:00
  • 1054e89762 ChatOperation: Add media id to example lain 2020-05-10 12:30:24 +02:00
  • 7ca83e71a9 Merge branch 'shortening-modules-name' into 'develop' lain 2020-05-10 09:05:22 +00:00
  • b960a9430d [#2456] credo fix. Ivan Tashkinov 2020-05-10 09:35:12 +03:00
  • b0d0d8f91b Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding Ivan Tashkinov 2020-05-10 09:17:16 +03:00
  • aee88d11be [#2456] Removed support for embedded relationships in account view. Ivan Tashkinov 2020-05-10 09:16:48 +03:00
  • f3f8ed9e19 Set sum types in query Roman Chvanikov 2020-05-10 09:13:24 +03:00
  • 3d9a7cf0cc healthcheck: report real amount of memory allocated by beam rinpatch 2020-05-08 23:51:59 +03:00
  • f7c28ae544 Webfinger: Request account info with the acct scheme lain 2020-05-03 13:48:01 +02:00
  • dd7bf4aece Fix inconsistency in language for activating settings Angelina Filippova 2020-05-04 22:41:14 +03:00
  • 45df70e691 AP C2S: Restrict creation to Notes for now. lain 2020-05-05 10:12:37 +02:00
  • 797dd3f581 Increase tests on AP C2S Haelwenn (lanodan) Monnier 2020-04-30 18:55:25 +02:00
  • 38541d99ea apache chain issue fix Alexander Strizhakov 2020-05-06 16:20:47 +03:00
  • a74c31ff63 include eldap in OTP releases rinpatch 2020-05-09 14:49:46 +03:00
  • 2ff79f9aae insert skeletons migration: fix for non-local locals rinpatch 2020-05-09 18:51:20 +03:00
  • b3e6953d23 Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop' rinpatch 2020-05-09 21:52:00 +00:00
  • 0ad89762a1 insert skeletons migration: fix for non-local locals rinpatch 2020-05-09 18:51:20 +03:00