Commit Graph

  • 549a410fda Merge branch 'fix-for-new-isntances' into 'develop' lain 2019-06-16 10:01:15 +00:00
  • 7a4228be5a fix for new instances Alexander Strizhakov 2019-06-16 10:01:15 +00:00
  • 451593f45e no print version to the shell Alex S 2019-06-16 11:48:15 +08:00
  • 44de34d170 Credo fixes rinpatch 2019-06-16 01:35:45 +03:00
  • 641bcaa44e Sanitize HTML in ReportView rinpatch 2019-06-16 01:30:32 +03:00
  • e943905bd7 Add tests for report view rinpatch 2019-06-16 01:30:14 +03:00
  • 135c196769 Merge branch 'bugfix/980-polls-double-vote' into 'develop' lain 2019-06-15 15:13:48 +00:00
  • 37ee6c6e2c Merge branch 'update/phoenix-and-plug' into 'develop' lain 2019-06-15 15:09:14 +00:00
  • 52b1b0e45d Merge branch '963_oob_oauth_redirect_fix' into 'develop' kaniini 2019-06-15 13:45:50 +00:00
  • 9b908697dd OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f and this leftover artifact breaks compiling now. Mark Felder 2019-06-15 07:04:01 -05:00
  • 2ad5a8511d Update Phoenix to 1.4.8 Mark Felder 2019-06-15 07:03:26 -05:00
  • fb4af26d75 Merge branch 'feature/add-chat-token-to-masto-api' into 'develop' rinpatch 2019-06-15 09:56:01 +00:00
  • 0632ed2f87 Apply suggestion to CHANGELOG.md lain 2019-06-15 09:27:27 +00:00
  • 6745bc951c Documentation: Document chat token response. lain 2019-06-15 11:11:45 +02:00
  • 5ea6e26da0 Changelog: Document chat token. lain 2019-06-15 11:02:05 +02:00
  • a440cf856d Mastodon API: Return the token needed for the chat. lain 2019-06-15 10:59:35 +02:00
  • e02f22d779 bugfix Alex S 2019-06-15 16:36:13 +08:00
  • 501705438f little fix Alex S 2019-06-15 16:24:49 +08:00
  • baf58c1234 version generation Alex S 2019-06-15 12:02:21 +08:00
  • 62ffc00a5d Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' rinpatch 2019-06-14 16:49:28 +00:00
  • 270f09dbc2 Merge branch 'feature/905-dynamic-configuration-in-sql' into 'develop' kaniini 2019-06-14 15:45:05 +00:00
  • c2ca1f22a2 it is changed in compile time Alexander Strizhakov 2019-06-14 15:45:05 +00:00
  • b7fc722a2e Merge branch 'fix-rate-limit-test' into 'develop' rinpatch 2019-06-14 14:50:19 +00:00
  • ce823fa88e Fix rate limit test Egor Kislitsyn 2019-06-14 19:24:31 +07:00
  • 7f48b90bfb Merge branch 'fix/hashtag-rich-media' into 'develop' lain 2019-06-14 11:52:04 +00:00
  • a971b35785 Merge branch 'issues/948-account-search' into 'develop' lain 2019-06-14 11:39:57 +00:00
  • ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following) Maksim 2019-06-14 11:39:57 +00:00
  • d0ebc0edf3 Fix hashtags being picked up by rich media parser rinpatch 2019-06-14 14:34:42 +03:00
  • f045d1437c Merge branch 'patch-2' into 'develop' lain 2019-06-14 09:42:04 +00:00
  • 58a094b605 Add copyright info to containment.ex Egor 2019-06-14 09:26:36 +00:00
  • 28cb9edde9 Merge branch '986-document-how-to-disable-rate-limiting' into 'develop' lain 2019-06-14 09:26:26 +00:00
  • 774637a2f4 Mastodon API: Document changes. lain 2019-06-14 11:24:09 +02:00
  • eac298083f MastodonAPI: Add a way to update the background image. lain 2019-06-14 11:19:22 +02:00
  • b22b10d3aa Improve rate limiter documentation Egor Kislitsyn 2019-06-14 15:02:10 +07:00
  • 00cc4880ce Merge branch 'feature/ci-release-build' into 'develop' lain 2019-06-14 06:56:27 +00:00
  • a1bbeef55c Merge branch 'release-move-out-application-dir' into 'develop' lain 2019-06-14 06:40:04 +00:00
  • ac3d43e620 Set instance static/uploads to be outside of application directory in release config rinpatch 2019-06-14 01:38:32 +03:00
  • 8fbe1a3b92 remove the feature branch from only rinpatch 2019-06-13 22:31:15 +03:00
  • 10c067cc47 Merge branch 'fix/pleroma-ctl-shellcheck' into 'develop' rinpatch 2019-06-13 19:25:48 +00:00
  • 0876ac05ba pleroma_ctl: fix == instead of = and double quote the path to prevent globing rinpatch 2019-06-13 22:16:57 +03:00
  • bb6a421afc Merge branch 'develop' into feature/ci-release-build rinpatch 2019-06-13 21:37:56 +03:00
  • da4af72180 Merge branch 'remove-prometheus-nif' into 'develop' rinpatch 2019-06-13 18:37:12 +00:00
  • 315f090f59 Prometheus: Remove flaky process collection NIF. lain 2019-06-13 19:29:02 +02:00
  • fc4a8026d8 Remove a TODO rinpatch 2019-06-13 21:23:37 +03:00
  • 5965efb216 AccountView: Add user background. lain 2019-06-13 19:08:05 +02:00
  • 6426aefb16 Expire artifacts in 42 years rinpatch 2019-06-13 18:22:59 +03:00
  • 6f5a0cc14e Merge branch 'fix/ogp-title' into 'develop' lain 2019-06-13 13:26:39 +00:00
  • 163fa180f5 Merge branch 'feld/pleroma-fix/ogp-title' into 'fix/ogp-title' feld 2019-06-13 12:49:01 +00:00
  • e322c665e0 Merge branch 'develop' into feature/ci-release-build rinpatch 2019-06-13 13:54:24 +03:00
  • 8dff4c7194 CI: Add automatic release builds rinpatch 2019-06-13 13:53:59 +03:00
  • a2318e9dd6 Merge branch 'improve-410-handling' into 'develop' lain 2019-06-13 10:47:35 +00:00
  • 30e54fd7e2 Handle HTTP 404 response Egor Kislitsyn 2019-06-13 17:13:35 +07:00
  • afae3ada22 Handle HTTP "410 Gone" response Egor Kislitsyn 2019-06-13 16:34:03 +07:00
  • a12f8e13c8 Improve <title> fallback; Add a test Egor Kislitsyn 2019-06-13 15:02:46 +07:00
  • 7363a0ea8a Revert "Only run Floki if title is missing from the map" Mark Felder 2019-06-12 18:32:28 -05:00
  • 97d2b1a45a Only run Floki if title is missing from the map Mark Felder 2019-06-12 18:27:35 -05:00
  • 097fdf6a5d Attempt to use <title> from HTML as a fallback Mark Felder 2019-06-12 17:56:51 -05:00
  • 4b2c29016c [#963] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring. Ivan Tashkinov 2019-06-12 21:30:06 +03:00
  • 966543379d MastodonAPI Controller: Band-Aid double vote problem. lain 2019-06-12 16:36:23 +02:00
  • 822a9f28d0 Merge branch 'release-config-import' into 'develop' lain 2019-06-12 09:58:16 +00:00
  • 4265608097 Merge branch 'chore/tagpolicy_docs' into 'develop' lain 2019-06-12 09:52:55 +00:00
  • f46c628e6b Merge branch 'update_auto_linker' into 'develop' lain 2019-06-12 09:52:29 +00:00
  • c5acc023a7 Merge branch 'remove-search-result-order' into 'develop' lain 2019-06-12 09:51:54 +00:00
  • 817c66bc3e Remove search result order for non-RUM indexes Egor Kislitsyn 2019-06-12 16:22:56 +07:00
  • bf22ed5fbd Update auto_linker dependency Egor Kislitsyn 2019-06-12 15:53:33 +07:00
  • ced59be1ae Document TagPolicy in rewrite_policy section rinpatch 2019-06-11 22:15:28 +03:00
  • 23db6774cf Merge branch 'improve-local-content-limit' into 'develop' kaniini 2019-06-11 17:30:13 +00:00
  • f0d96534a4 Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing rinpatch 2019-06-11 18:55:55 +03:00
  • 6f29865d43 Add option to restrict all users to local content Egor Kislitsyn 2019-06-11 21:25:53 +07:00
  • 3235923276 Merge branch 'better-default-parameters-for-suggestion' into 'develop' lain 2019-06-11 11:34:23 +00:00
  • 5d5a9a3a35 Better default parameters for suggestion Hakaba Hitoyo 2019-06-11 11:34:22 +00:00
  • 63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop' lain 2019-06-11 11:32:01 +00:00
  • 3e3dcd223d Merge branch 'update-plug' into 'develop' lain 2019-06-11 10:24:01 +00:00
  • 581d8d3035 Update plug dependency Egor Kislitsyn 2019-06-11 16:50:35 +07:00
  • 7c063a898d Update ex_rated dependency Egor Kislitsyn 2019-06-11 16:25:47 +07:00
  • ad04d12de6 Replace MastodonAPIController.account_register/2 rate limiter Egor Kislitsyn 2019-06-11 16:06:03 +07:00
  • f26013cf2e Update CHANGELOG Egor Kislitsyn 2019-06-11 14:36:51 +07:00
  • bc8f059367 Add rate limiting for search endpoints Egor Kislitsyn 2019-06-11 14:28:39 +07:00
  • 2e5affce61 Add RateLimiter Egor Kislitsyn 2019-06-11 14:27:41 +07:00
  • e343e4ff91 Merge branch 'change-containment-default' into 'develop' kaniini 2019-06-11 02:38:13 +00:00
  • f2d72b1fe4 Merge branch 'preload-changes' into 'develop' kaniini 2019-06-11 02:37:08 +00:00
  • 70edcd1386 Merge branch 'fix/warnings-in-migration' into 'develop' lain 2019-06-10 13:20:37 +00:00
  • a7d956d383 Remove unused imports and aliases from migration Sergey Suprunenko 2019-06-10 13:20:37 +00:00
  • 8fd68b8039 Merge branch 'feature/releases' into 'develop' lain 2019-06-10 13:03:48 +00:00
  • dbe4c2b7c8 Update pleroma_ctl lain 2019-06-10 11:47:22 +00:00
  • 3d7bb47124 Merge branch 'issue/media-proxy-whitelist' into 'develop' lain 2019-06-10 11:34:11 +00:00
  • 365268d522 Add more tests for using media_proxy and whitelists Sergey Suprunenko 2019-06-10 11:34:11 +00:00
  • cfcc0c8776 Add a changelog entry for releases rinpatch 2019-06-09 13:56:41 +03:00
  • 3ecfe2a6d4 Merge branch 'develop' into feature/releases rinpatch 2019-06-09 13:55:32 +03:00
  • bf391569cf specify that a version is needed for rollback rinpatch 2019-06-09 13:34:58 +03:00
  • 2a659b35f1 Add migrate/rollback to release tasks rinpatch 2019-06-09 13:33:44 +03:00
  • b6d2db42a7 Fix wrong placement of serve_endpoints rinpatch 2019-06-08 21:26:00 +03:00
  • 7223c1b643 Use Mix.shell().yes? if available rinpatch 2019-06-08 20:10:25 +03:00
  • b9544d565d Merge branch 'prod-loglevel-warn' into 'develop' lain 2019-06-08 16:05:10 +00:00
  • 4f5149c93b Set default loglevel to warn in prod rinpatch 2019-06-08 18:02:57 +03:00
  • d7ec0898e5 Make mix tasks work in a release rinpatch 2019-06-08 17:40:40 +03:00
  • 4b98a7ce4e Set serve_endpoints to true in prod config as setting it in runtime config would cause issues with mix tasks rinpatch 2019-06-08 17:17:28 +03:00
  • c47dc0de2c Load ex_syslog and copy pleroma_ctl rinpatch 2019-06-08 17:17:10 +03:00
  • 3d374bf7df Basic release skeleton rinpatch 2019-06-08 17:15:49 +03:00
  • 1e0fa899b6 Merge branch 'fix/transmogrifier-inReplyTo' into 'develop' lain 2019-06-08 10:22:15 +00:00