Commit Graph

  • 5ca643b80d Merge branch 'fix/admin-api-docs' into 'develop' kaniini 2019-09-13 03:31:16 +00:00
  • 528a88a686 Fix admin api docs for creating users Angelina Filippova 2019-09-13 03:31:16 +00:00
  • a697f0d791 Emoji: Add function to detect if a character is an emoji lain 2019-09-13 02:11:02 +02:00
  • 51609217c2 Merge branch 'fix/error-log-double-quotes' into 'develop' Haelwenn 2019-09-12 20:21:56 +00:00
  • b0e6058021 Parse http signature for request to objects/activities rinpatch 2019-09-12 22:40:53 +03:00
  • 936951826e Merge branch 'develop' into test/activity_pub/transmogrifier.ex Maksim Pechnikov 2019-09-12 22:15:43 +03:00
  • dabc4a00f5 Put the cache with the right key when using a tracking function rinpatch 2019-09-12 22:10:15 +03:00
  • 769fb778d4 Track object/create activity fetches rinpatch 2019-09-12 21:37:36 +03:00
  • 102eb4455c Fix associated test as well Mark Felder 2019-09-12 12:29:08 -05:00
  • 8d4b661ecb Transmogrifier: Strip internal emoji reaction fields. lain 2019-09-12 18:59:13 +02:00
  • 05e9776517 PleromaAPIController: Add endpoint to fetch emoji reactions. lain 2019-09-12 18:48:25 +02:00
  • 4f548cb2b7 added test for Ostatus Maksim Pechnikov 2019-09-12 09:59:34 +03:00
  • 74e4c72c4a Fix double quotes in error logs Mark Felder 2019-09-11 16:16:09 -05:00
  • 50269e9cac Merge branch 'feature/jason-view-render' into 'develop' kaniini 2019-09-11 20:47:25 +00:00
  • 007e0c1ce1 added tests Maksim Pechnikov 2019-09-11 23:19:06 +03:00
  • 56828abf6d Use Jason for rendering responses rinpatch 2019-09-11 23:04:01 +03:00
  • 46ae62d159 Merge branch 'patch-5' into 'develop' Haelwenn 2019-09-11 17:47:19 +00:00
  • fb7332aec7 Merge branch 'fix/oom-parallel-rendering' into 'develop' lain 2019-09-11 11:21:03 +00:00
  • 5a76d5d239 Add extended benchmark rinpatch 2019-09-10 23:08:15 +03:00
  • e47089cf55 web_cache_ttl description Alex S 2019-09-11 09:32:58 +03:00
  • 38b29779c3 refactoring Alex S 2019-09-03 20:11:32 +03:00
  • be32d90a0c little refactor Alex S 2019-09-03 20:06:22 +03:00
  • 5ff12e7df1 some changes Alex S 2019-09-03 19:22:25 +03:00
  • aa7fb22008 placeholder for config.md Alex S 2019-09-03 12:32:00 +03:00
  • 57dc59d98d little fix Alex S 2019-09-03 12:31:43 +03:00
  • 6b0e8b73df bump ex_doc version Alex S 2019-09-03 12:30:44 +03:00
  • 10827eecad formatting Alex S 2019-09-03 11:56:21 +03:00
  • 35757b6d0e don't add behaviour to suggestions Alex S 2019-09-03 09:45:54 +03:00
  • 5db2920644 Apply suggestion to config/description.exs Alexander Strizhakov 2019-09-03 06:45:16 +00:00
  • 65bc9e66ad Apply suggestion to config/description.exs Alexander Strizhakov 2019-09-03 06:45:02 +00:00
  • 0624e06a9c little fix Alex S 2019-08-30 20:14:18 +03:00
  • 8f5ee7db06 typo fix Alex S 2019-08-30 19:59:13 +03:00
  • 6721301086 some changes Alex S 2019-08-30 19:14:01 +03:00
  • 0559c82bdb fix Alex S 2019-08-30 14:27:55 +03:00
  • 68e45a327f changelog Alex S 2019-08-30 14:09:07 +03:00
  • a1f2dfb10a expanding regex sigils to use modifiers Alex S 2019-08-30 14:04:21 +03:00
  • 511d93fa54 mix docs generates config.md Alex S 2019-08-30 13:22:21 +03:00
  • 67e4300931 description formatters Alex S 2019-08-30 13:21:48 +03:00
  • 171cefd889 description.exs Alex S 2019-08-30 13:20:09 +03:00
  • ab4960cc7f deleting old config.md file Alex S 2019-08-30 12:00:36 +03:00
  • fcf604fa43 added tests Maksim Pechnikov 2019-09-11 07:23:33 +03:00
  • 43f02dfe38 Revert "Parallelize template rendering" rinpatch 2019-09-10 22:01:45 +03:00
  • 69800055f1 Merge branch 'fix/tests' into 'develop' lain 2019-09-10 18:53:41 +00:00
  • 3d12e05f43 Fix Activity.all_by_ids_with_object/1 test Egor Kislitsyn 2019-09-11 01:08:37 +07:00
  • d8b76c79f2 Merge branch 'statuses-by-ids' into 'develop' lain 2019-09-10 17:04:12 +00:00
  • a31af93e1d added tests /activity_pub/transmogrifier.ex Maksim Pechnikov 2019-09-10 16:43:10 +03:00
  • 30f0cec49a Add note about limit to the doc Egor Kislitsyn 2019-09-03 16:58:33 +07:00
  • b40b10b53d Add an endpoint to get multiple statuses by IDs Egor Kislitsyn 2019-09-03 16:23:03 +07:00
  • d1abf7a358 Merge branch 'develop' into feature/moderation-log-filters Maxim Filippov 2019-09-10 01:23:20 +03:00
  • ceb2e09126 Merge branch 'cache-plug' into 'develop' feld 2019-09-09 18:53:09 +00:00
  • 11e12b5761 Add Pleroma.Plugs.Cache minibikini 2019-09-09 18:53:08 +00:00
  • bce16f4557 Merge branch 'update-changelog' into 'develop' feld 2019-09-09 18:39:44 +00:00
  • e34de00052 Update CHANGELOG (add a note about !1649) Egor Kislitsyn 2019-09-10 01:30:02 +07:00
  • edbaf78176 Merge branch 'fix/read-inbox' into 'develop' feld 2019-09-09 18:21:29 +00:00
  • e0f84d0043 Fix ActivityPubController.read_inbox/2 Egor Kislitsyn 2019-09-10 01:11:57 +07:00
  • b63faf9819 [#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP). Ivan Tashkinov 2019-09-08 15:00:03 +03:00
  • c3f00447af Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-08 08:41:10 +03:00
  • e5c6bf3673 Mastodon API: URI encode hashtag name in generated URLs shadowfacts 2019-09-07 19:50:45 +00:00
  • 8c6cdff3cc Merge branch 'develop' into issue/1218 Maksim Pechnikov 2019-09-07 22:17:32 +03:00
  • 39f99dc6cd Merge branch 'develop' into support/tests Maksim Pechnikov 2019-09-07 22:13:43 +03:00
  • c45013df8e Merge branch 'chore/query-optimization' into 'develop' kaniini 2019-09-06 23:25:30 +00:00
  • 40a61532ca activity: when restricting deactivated users, precalculate the user list Ariadne Conill 2019-09-06 23:14:29 +00:00
  • 5effb2cbca activitypub: help ecto build a better query for thread mute filtering Ariadne Conill 2019-09-06 23:11:26 +00:00
  • ab2f21e470 tests for mastodon_api_controller.ex Maksim Pechnikov 2019-09-06 21:50:00 +03:00
  • b3f6f6a409 generating remote users Alex S 2019-09-06 20:14:02 +03:00
  • 130bc8e0d5 Merge branch 'chore/changelog-prioritize-twitterapi-removal' into 'develop' rinpatch 2019-09-06 15:29:03 +00:00
  • f92dc82dda Prioritize the removal of TwitterAPI and :accept_blocks in the changelog rinpatch 2019-09-06 18:28:01 +03:00
  • 252e5db45c docs fixes Alex S 2019-09-06 16:37:18 +03:00
  • eb74c3d5c7 Merge branch 'develop' into issue/1218 Maksim Pechnikov 2019-09-06 14:01:07 +03:00
  • ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-06 13:26:05 +03:00
  • 40b3289c26 Refactor add_link_headers/7 -> add_link_headers/3 Egor Kislitsyn 2019-09-06 17:08:47 +07:00
  • 896ffabe37 Merge branch 'so-long-twitterapi' into 'develop' rinpatch 2019-09-06 08:43:38 +00:00
  • d0e0f2380d Merge branch 'update-frontend-e75ac9dd' into 'develop' rinpatch 2019-09-06 08:41:30 +00:00
  • 16e6be340d Update frontend bundle to e75ac9dd rinpatch 2019-09-06 11:31:44 +03:00
  • 592ce8a74f Merge branch 'hotifx/emoji-trailing' into 'develop' rinpatch 2019-09-05 19:23:52 +00:00
  • 3523bdcf26 Call TrailingFormatPlug for /api/pleroma/emoji rinpatch 2019-09-05 22:21:20 +03:00
  • 736165c082 Reverse reports list Maxim Filippov 2019-09-05 16:54:34 +03:00
  • a1125bd564 generatoin and fetching Alex S 2019-09-05 16:01:52 +03:00
  • 79dde58044 one more temp commit Alex S 2019-09-04 20:18:11 +03:00
  • db690bede9 temp commit Alex S 2019-08-02 21:33:12 +03:00
  • fe7cf44c40 Merge branch 'feature/mastoapi-accounts-external' into 'develop' Haelwenn 2019-09-05 12:48:27 +00:00
  • 26fe6f70c9 Move checking for restrict_local to User.get_cached_by_id_or_nickname rinpatch 2019-09-05 15:33:49 +03:00
  • 9d4fc9aa35 Merge branch 'fix/endless-poll-handling' into 'develop' rinpatch 2019-09-05 09:11:16 +00:00
  • b312ca3d52 Mastodon API Poll view: Fix handling of polls without an end date rinpatch 2019-09-05 11:58:02 +03:00
  • 79cf629e1a Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue Ivan Tashkinov 2019-09-05 11:30:41 +03:00
  • 3e30f6e198 Merge branch 'fix/safe-render-notifications' into 'develop' rinpatch 2019-09-05 05:47:06 +00:00
  • 558969a0fd Do not crash if one notification failed to render rinpatch 2019-09-05 08:32:49 +03:00
  • 3b8d64ee24 Merge branch 'dockerfile-touchups' into 'develop' rinpatch 2019-09-04 20:22:41 +00:00
  • 053b17f57e Switch to alpine:3.9 to avoid dlsym errors Ashlynn Anderson 2019-09-04 14:56:26 -04:00
  • ae506ca997 fix formatting Maksim Pechnikov 2019-09-04 21:40:53 +03:00
  • e2011a667c Apply suggestion to lib/pleroma/web/activity_pub/utils.ex Maksim 2019-09-04 18:35:01 +00:00
  • 8306078de1 Apply suggestion to lib/pleroma/web/activity_pub/utils.ex Maksim 2019-09-04 17:31:14 +00:00
  • 99ea990a16 PleromaAPIController: Add emoji reactions. lain 2019-09-04 12:20:35 -05:00
  • af746fa4a8 Return total for reports Maxim Filippov 2019-09-04 20:08:13 +03:00
  • 3542ca6702 Merge branch 'develop' into feature/moderation-log-filters Maxim Filippov 2019-09-04 19:40:07 +03:00
  • cb99cfcc65 don't try to truncate non-strings Sadposter 2019-09-04 15:57:42 +01:00
  • 2975da284b truncate remote user bio/display name Sadposter 2019-09-04 15:45:40 +01:00
  • a890451187 fetch_announcements -> take_announcements Maksim Pechnikov 2019-09-04 17:42:27 +03:00
  • 8cbad5500c add tests for activity_pub/utils.ex Maksim Pechnikov 2019-09-04 15:25:12 +03:00
  • e72531bfac Merge branch 'feat/mastoapi-status-threadmuted' into 'develop' Haelwenn 2019-09-04 11:26:34 +00:00