Commit graph

379 commits

Author SHA1 Message Date
Henry Jameson
c8b2534245 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (302 commits)
  MRF: ensure that subdomain_match calls are case-insensitive
  Strip internal fields including likes from incoming and outgoing activities
  tests for Pleroma.Uploaders
  Mastodon API: Fix thread mute detection
  Uploader.S3 added support stream uploads
  Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled
  Return profile URL in MastodonAPI's `url` field
  Simplify logic to mention.js `url` field
  Return profile URL when available instead of actor URI for MastodonAPI mention URL
  Do not rembed the object after updating it
  OStatus tests: stop relying on embedded objects
  ActivityPub tests: remove assertions of embedded object being updated, because the objects are no longer supposed to be embedded
  OStatus Announce Representer: Do not depend on the object being embedded in the Create activity
  Stop depending on the embedded object in restrict_favorited_by
  [#1150] fixed parser TwitterCard
  tests for CommonApi/Utils
  Remove Reply-To from report emails
  Do not add the "next" key to likes.json if there is no more items
  Replace "impode" with "implode" for
  Remove longfox emoji set
  ...
2019-08-11 16:58:09 +03:00
Roman Chvanikov
9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
Sachin Joshi
242f5c585e add account confirmation email resend in mastodon api 2019-07-28 20:30:10 +00:00
Roman Chvanikov
36049f08ef Merge develop 2019-07-20 01:03:25 +03:00
kaniini
33729bbb28 Merge branch 'feature/richmedia-ttl' into 'develop'
add the rich media ttl based on image exp time

See merge request pleroma/pleroma!1438
2019-07-19 21:36:36 +00:00
Ariadne Conill
b2a8ccf37f config: add sign_object_fetches option 2019-07-17 21:38:06 +00:00
Alexander Strizhakov
10f82c88b8 mastoapi password reset
added rate limit to password reset

configure rate limit in runtime
2019-07-16 21:44:50 +00:00
Sachin Joshi
18234cc44e add the rich media ttl based on image exp time 2019-07-17 00:20:34 +05:45
Ivan Tashkinov
889dc17abd [#1094] Rate-limited follow & unfollow actions. 2019-07-16 19:18:30 +03:00
Roman Chvanikov
c729883936 Merge branch 'develop' into feature/digest-email 2019-07-14 21:43:30 +03:00
Alex S
f4447d82b8 parsers configurable 2019-07-14 09:21:56 +03:00
Ariadne Conill
80c46d6d8b nodeinfo: implement MRF transparency exclusions 2019-07-13 18:53:14 +00:00
kaniini
f4c001062e Merge branch '1041-status-actions-rate-limit' into 'develop'
Rate-limited status actions (per user and per user+status).

Closes #1041

See merge request pleroma/pleroma!1410
2019-07-13 14:17:17 +00:00
Ivan Tashkinov
369e9bb42f [#1041] Rate-limited status actions (per user and per user+status). 2019-07-13 14:49:39 +03:00
rinpatch
fa7e0c4262 Workaround for remote server certificate chain issues 2019-07-12 23:53:21 +03:00
Roman Chvanikov
eae991b06a merge develop 2019-07-12 18:08:27 +03:00
Alex S
59e16fc45a enable synchronization by default 2019-07-10 18:55:11 +03:00
Alex S
beba7bbc85 removing synchronization worker 2019-07-10 17:42:18 +03:00
Maksim
12b1454245 [#1062] added option to disable send email 2019-07-10 05:34:21 +00:00
Roman Chvanikov
371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
Alexander Strizhakov
d6b0fce6e9 Fix/1019 correct count remote users 2019-07-09 17:36:35 +00:00
Haelwenn
1ab4e35f27 Merge branch 'enable-ogp-by-default' into 'develop'
Do not crash if metadata fails to render and enable OGP and TwitterCard by default

Closes #1034

See merge request pleroma/pleroma!1388
2019-07-09 16:07:20 +00:00
rinpatch
682f1897b7 Enable OpenGraph and TwitterCard by default
Closes #1034
2019-07-08 13:00:45 +03:00
Henry Jameson
ae4d15503b Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (159 commits)
  [#1043] fix search accounts.
  tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
  Expose `skip_thread_containment` in nodeinfo
  Split alters rather than work with indexes
  Use fallback values for search queries
  Fix migration
  [#1048] Fixed version parsing in pleroma_ctl. Closes #1036.
  [#1048] Resolved violations of SemVer version format. Refactoring.
  Add fallback value to the admin report view.
  Move changelog entries
  [#1033] Fix database migrations
  Update changelog and admin API docs with tags, display_name, avatar additions
  OTP Release install docs: Remove --dry-run in cron certbot command
  Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
  [#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text
  Fix not being able to pin unlisted posts
  Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
  Add a caveat for docker deployment in the config docs
  Revert "Build releases only on tags or develop"
  Build releases only on tags or develop
  ...
2019-07-06 21:54:28 +03:00
Ivan Tashkinov
2b9d914089 [#161] Refactoring, documentation. 2019-06-30 15:58:50 +03:00
Roman Chvanikov
657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
Mark Felder
f8ec3e129f In my experience syslog tags are usually lowercase 2019-06-27 13:00:22 -05:00
kaniini
9f8e645dce Merge branch 'feature/configurable-pack-extensions' into 'develop'
Make default pack extensions configurable and default to png and gif

See merge request pleroma/pleroma!1338
2019-06-26 05:34:02 +00:00
rinpatch
41e4752950 Make default pack extensions configurable and default to png and gif 2019-06-26 06:48:59 +03:00
Maksim Pechnikov
4ad15ad2a9 add ignore hosts and TLDs for rich_media 2019-06-25 22:25:37 +03:00
rinpatch
875100de01 Bind to 127.0.0.1 instead of 0.0.0.0 by default 2019-06-23 09:31:39 +03:00
rinpatch
f30a3241d2 Deps: Update auto_linker 2019-06-18 16:08:18 +03:00
Henry Jameson
2faac1cc48 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (36 commits)
  [#570] add user:notification stream
  fix for new instances
  no print version to the shell
  OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f and this leftover artifact breaks compiling now.
  Update Phoenix to 1.4.8
  Apply suggestion to CHANGELOG.md
  Documentation: Document chat token response.
  Changelog: Document chat token.
  Mastodon API: Return the token needed for the chat.
  bugfix
  little fix
  version generation
  it is changed in compile time
  Fix rate limit test
  [#948] /api/v1/account_search added optional parameters (limit, offset, following)
  Fix hashtags being picked up by rich media parser
  Add copyright info to containment.ex
  Mastodon API: Document changes.
  MastodonAPI: Add a way to update the background image.
  Improve rate limiter documentation
  ...
2019-06-16 14:25:39 +03:00
Alexander Strizhakov
c2ca1f22a2 it is changed in compile time
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
Henry Jameson
f0e2fb1609 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (193 commits)
  Remove search result order for non-RUM indexes
  Update `auto_linker` dependency
  Document TagPolicy in `rewrite_policy` section
  Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing
  Add option to restrict all users to local content
  Better default parameters for suggestion
  Update `plug` dependency
  Update `ex_rated` dependency
  Replace `MastodonAPIController.account_register/2` rate limiter
  Update CHANGELOG
  Add rate limiting for search endpoints
  Add RateLimiter
  Remove unused imports and aliases from migration
  Update pleroma_ctl
  Add more tests for using media_proxy and whitelists
  Add a changelog entry for releases
  specify that a version is needed for rollback
  Add migrate/rollback to release tasks
  Fix wrong placement of serve_endpoints
  Use Mix.shell().yes? if available
  ...
2019-06-12 22:20:20 +03:00
Egor Kislitsyn
6f29865d43 Add option to restrict all users to local content 2019-06-11 21:25:53 +07:00
Hakaba Hitoyo
5d5a9a3a35 Better default parameters for suggestion 2019-06-11 11:34:22 +00:00
lain
63ab3c30eb Merge branch 'feature/rate-limiter' into 'develop'
Feature/Rate Limiter

Closes #943

See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
Egor Kislitsyn
ad04d12de6 Replace MastodonAPIController.account_register/2 rate limiter 2019-06-11 16:06:03 +07:00
Egor Kislitsyn
bc8f059367 Add rate limiting for search endpoints 2019-06-11 14:28:39 +07:00
lain
593b8b1e6a Configuration: Skip thread containment by default
In my tests the interaction between thread containment and other restrictions
makes postgresql create some very bad query plans. This caused direct messages
to time out on soykaf, for example.
2019-06-07 14:28:14 +02:00
Roman Chvanikov
c0fa000147 Set default config for digest to false 2019-06-07 01:22:35 +03:00
Roman Chvanikov
01fe5abad1 Resolve conflicts 2019-06-07 01:20:50 +03:00
rinpatch
92213fb87c Replace Mix.env with Pleroma.Config.get(:env)
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
2019-06-06 23:59:51 +03:00
Egor
f82382de22 [#943] Make the unauthenticated users limitation optional 2019-06-06 12:17:49 +00:00
Roman Chvanikov
b1b1a270e8 Fix conflict 2019-06-05 02:45:21 +03:00
Maksim Pechnikov
4f2e359687 Merge branch 'develop' into issue/941 2019-06-04 09:49:08 +03:00
kaniini
9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy

See merge request pleroma/pleroma!1233
2019-06-04 05:49:54 +00:00
kaniini
a536f515dd Merge branch 'ueberauth_config_extension' into 'develop'
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification

See merge request pleroma/pleroma!1234
2019-06-04 05:42:49 +00:00
Mark Felder
6ef145b4fc Merge branch 'develop' into feature/digest-email 2019-06-03 15:29:53 -05:00