lain [Fri, 17 May 2019 09:30:35 +0000 (11:30 +0200)]
Configuration: disable migration lock.
lain [Fri, 17 May 2019 09:19:30 +0000 (11:19 +0200)]
Dependencies: Update ecto sql once more.
lain [Wed, 15 May 2019 14:45:26 +0000 (16:45 +0200)]
Dependencies: Update Ecto SQL.
rinpatch [Wed, 15 May 2019 10:56:19 +0000 (10:56 +0000)]
Merge branch 'legacy-fe-config' into 'develop'
remove deprecated PleromaFE configuration
See merge request pleroma/pleroma!1152
Sachin Joshi [Tue, 14 May 2019 17:52:08 +0000 (23:37 +0545)]
remove deprecated PleromaFE configuration
lambda [Tue, 14 May 2019 20:33:35 +0000 (20:33 +0000)]
Merge branch 'fix/raise-registration-api-ratelimit' into 'develop'
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
See merge request pleroma/pleroma!1154
rinpatch [Tue, 14 May 2019 20:16:34 +0000 (23:16 +0300)]
Fix rate-limiting tests
rinpatch [Tue, 14 May 2019 19:47:23 +0000 (22:47 +0300)]
Make rate limiting for Mastodon Registration API less agressive and enable it by default.
As discussed on irc. Unlike Mastodon our web interface for registrations
is using the same APIs regular apps would be using, so 5 requests per 30
minutes per IP could hurt valid use-cases when Pleroma-FE switches to
it. Also enable the endpoint by default, it makes no sense to
have it disabled when
1. TwitterAPI endpoint is there and always enabled
2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there)
Also in this commit: minor changelog improvements.
lambda [Tue, 14 May 2019 17:40:08 +0000 (17:40 +0000)]
Merge branch 'fix-the-build' into 'develop'
Group def perform() together to fix the build
See merge request pleroma/pleroma!1151
Mark Felder [Tue, 14 May 2019 17:33:03 +0000 (12:33 -0500)]
Group def perform() together to fix the build
lambda [Tue, 14 May 2019 15:41:37 +0000 (15:41 +0000)]
Merge branch 'fix/gopher' into 'develop'
gopher: fix rendering of post content (closes #895)
Closes #895
See merge request pleroma/pleroma!1150
William Pitcock [Tue, 14 May 2019 15:35:06 +0000 (15:35 +0000)]
gopher: fix rendering of post content (closes #895)
lambda [Tue, 14 May 2019 15:27:34 +0000 (15:27 +0000)]
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
William Pitcock [Tue, 14 May 2019 15:07:38 +0000 (15:07 +0000)]
clean up follow/block imports a little
kaniini [Tue, 14 May 2019 14:58:45 +0000 (14:58 +0000)]
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
lambda [Tue, 14 May 2019 14:49:45 +0000 (14:49 +0000)]
Merge branch 'refactor/oauth_controller_response' into 'develop'
Refactoring oauth response.
See merge request pleroma/pleroma!1149
Maksim [Tue, 14 May 2019 14:49:45 +0000 (14:49 +0000)]
Refactoring oauth response.
kaniini [Tue, 14 May 2019 12:06:08 +0000 (12:06 +0000)]
Merge branch 'feature/disable-account' into 'develop'
[#694] allow users to disable their own account
See merge request pleroma/pleroma!895
Egor Kislitsyn [Tue, 14 May 2019 11:40:21 +0000 (18:40 +0700)]
Update CHANGELOG
Egor Kislitsyn [Tue, 14 May 2019 11:29:10 +0000 (18:29 +0700)]
Reuse query from User.restrict_deactivated/1
Egor Kislitsyn [Tue, 14 May 2019 11:15:56 +0000 (18:15 +0700)]
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Aaron Tinio [Mon, 13 May 2019 22:40:59 +0000 (06:40 +0800)]
Fix Pleroma.Config.get!/1 raising an error when value is false
rinpatch [Mon, 13 May 2019 21:27:07 +0000 (21:27 +0000)]
Merge branch 'changelog/adminfe' into 'develop'
Document AdminFE in changelog
See merge request pleroma/pleroma!1147
Mark Felder [Mon, 13 May 2019 21:11:06 +0000 (16:11 -0500)]
Document AdminFE in changelog
kaniini [Mon, 13 May 2019 21:07:50 +0000 (21:07 +0000)]
Merge branch 'bump-mastoapi' into 'develop'
Bump Mastodon API level
See merge request pleroma/pleroma!1146
Mark Felder [Mon, 13 May 2019 20:52:16 +0000 (15:52 -0500)]
Bump Mastodon API level
kaniini [Mon, 13 May 2019 20:47:26 +0000 (20:47 +0000)]
Merge branch 'refactor/jason' into 'develop'
Switch to Jason over Poison
See merge request pleroma/pleroma!1145
Mark Felder [Mon, 13 May 2019 20:37:38 +0000 (15:37 -0500)]
Switch to Jason over Poison
William Pitcock [Mon, 13 May 2019 02:09:28 +0000 (02:09 +0000)]
user: migrate follow/blocks import to job queue
William Pitcock [Mon, 13 May 2019 02:02:00 +0000 (02:02 +0000)]
activitypub: move post rich media fetching to job queue
William Pitcock [Mon, 13 May 2019 01:58:30 +0000 (01:58 +0000)]
user: move initial post fetching to job queue
lambda [Mon, 13 May 2019 18:58:04 +0000 (18:58 +0000)]
Merge branch 'feature/federator-behaviours' into 'develop'
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
kaniini [Mon, 13 May 2019 18:35:45 +0000 (18:35 +0000)]
Merge branch 'features/mastoapi/2.7.0-registration' into 'develop'
Features/mastoapi/2.7.0 registration
Closes #773
See merge request pleroma/pleroma!1134
Alexander Strizhakov [Mon, 13 May 2019 18:35:45 +0000 (18:35 +0000)]
differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
kaniini [Mon, 13 May 2019 18:34:52 +0000 (18:34 +0000)]
Merge branch 'filter-irreversible' into 'develop'
Make irreversible field, default to false in filters
See merge request pleroma/pleroma!1144
Sachin Joshi [Mon, 13 May 2019 18:05:33 +0000 (23:50 +0545)]
Make irreversible field default to false in filters
lambda [Mon, 13 May 2019 15:52:05 +0000 (15:52 +0000)]
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
See merge request pleroma/pleroma!1139
rinpatch [Mon, 13 May 2019 07:39:12 +0000 (07:39 +0000)]
Merge branch 'fix/unfollows-not-working' into 'develop'
Normalize the object in `create_or_bump_for` only after ensuring the activity type is Create
Closes #874
See merge request pleroma/pleroma!1138
rinpatch [Mon, 13 May 2019 07:32:04 +0000 (10:32 +0300)]
Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
William Pitcock [Sun, 12 May 2019 19:15:29 +0000 (19:15 +0000)]
nodeinfo: gather supported protocol names from federation modules
William Pitcock [Sun, 12 May 2019 19:05:03 +0000 (19:05 +0000)]
webfinger: build the response based on enabled federation modules
William Pitcock [Sun, 12 May 2019 19:04:37 +0000 (19:04 +0000)]
xml builder: properly escape quotes
William Pitcock [Sun, 12 May 2019 14:38:40 +0000 (14:38 +0000)]
tests: fix AP test failures
William Pitcock [Sun, 12 May 2019 14:35:38 +0000 (14:35 +0000)]
tests: fix salmon tests
rinpatch [Sun, 12 May 2019 13:22:13 +0000 (13:22 +0000)]
Merge branch 'update-changelog' into 'develop'
Update changelog
See merge request pleroma/pleroma!1141
Sachin Joshi [Sun, 12 May 2019 07:05:23 +0000 (12:50 +0545)]
update changelog
William Pitcock [Sun, 12 May 2019 04:08:41 +0000 (04:08 +0000)]
tests: chase federator publish_single_foo removals
William Pitcock [Sun, 12 May 2019 05:01:15 +0000 (05:01 +0000)]
federator: websub removal
William Pitcock [Sun, 12 May 2019 05:01:00 +0000 (05:01 +0000)]
activitypub: publisher: fixups
William Pitcock [Sun, 12 May 2019 04:34:55 +0000 (04:34 +0000)]
websub: adapt to work as a federator publishing module
William Pitcock [Sun, 12 May 2019 04:27:01 +0000 (04:27 +0000)]
salmon: refactor to work as a federator publishing module
William Pitcock [Sun, 12 May 2019 04:17:17 +0000 (04:17 +0000)]
federator: publisher: only attempt publishing if we know the activity is representable
William Pitcock [Sun, 12 May 2019 04:04:50 +0000 (04:04 +0000)]
ostatus: only as:Public activities are representable
William Pitcock [Sun, 12 May 2019 04:00:55 +0000 (04:00 +0000)]
federator: move activitypub relaying to the AP publisher module
William Pitcock [Sun, 12 May 2019 03:57:10 +0000 (03:57 +0000)]
federator: hook up Publisher.publish()
William Pitcock [Sun, 12 May 2019 03:56:49 +0000 (03:56 +0000)]
federator: remove no longer used :publish_single_ap
William Pitcock [Sun, 12 May 2019 03:55:17 +0000 (03:55 +0000)]
federator: publisher: add publish() wrapper
William Pitcock [Sun, 12 May 2019 03:43:53 +0000 (03:43 +0000)]
federator: publisher: integrate job queue, simplify publish_one logic
William Pitcock [Sun, 12 May 2019 03:09:05 +0000 (03:09 +0000)]
activitypub: split out outgoing federation into a federation module
Haelwenn (lanodan) Monnier [Sun, 12 May 2019 02:35:50 +0000 (04:35 +0200)]
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
Commissioned by https://shitposter.club/users/moonman and
drawn by https://shpposter.club/users/Nightingalle
Intended to be used when mastofe crashes out and allows to report a bug
among other things.
Should require a bit of modification on mastofe to use the image as it's more
of a vanilla flavour thing.
William Pitcock [Sun, 12 May 2019 02:41:34 +0000 (02:41 +0000)]
federator: add publisher module defining a contract for publishing behaviours
rinpatch [Sun, 12 May 2019 00:01:42 +0000 (03:01 +0300)]
Normalize the object only after ensuring the activity type is Create
kaniini [Sat, 11 May 2019 16:52:26 +0000 (16:52 +0000)]
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
kaniini [Sat, 11 May 2019 16:51:47 +0000 (16:51 +0000)]
Merge branch 'fix/readme-release' into 'develop'
Update release info in README.md
See merge request pleroma/pleroma!1133
kaniini [Sat, 11 May 2019 16:51:23 +0000 (16:51 +0000)]
Merge branch 'uniform-admin-api-url' into 'develop'
make user related url uniform in admin api
See merge request pleroma/pleroma!1135
Sachin Joshi [Sat, 11 May 2019 08:32:04 +0000 (14:17 +0545)]
make url uniform in admin api
Francis Dinh [Sat, 11 May 2019 06:55:12 +0000 (02:55 -0400)]
Update release info in README.md
Removed mention that there is no release of Pleroma (there actually has
been a few the last couple of months).
Haelwenn [Sat, 11 May 2019 01:34:17 +0000 (01:34 +0000)]
Merge branch 'feature/adminfe' into 'develop'
Feature/adminfe
See merge request pleroma/pleroma!1116
feld [Sat, 11 May 2019 01:34:17 +0000 (01:34 +0000)]
Initial bundle of basic AdminFE
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
rinpatch [Fri, 10 May 2019 10:49:34 +0000 (13:49 +0300)]
Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
lambda [Fri, 10 May 2019 09:49:46 +0000 (09:49 +0000)]
Merge branch 'fix/retweet-language' into 'develop'
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
Closes pleroma-fe#533
See merge request pleroma/pleroma!1130
Francis Dinh [Thu, 9 May 2019 23:48:41 +0000 (19:48 -0400)]
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
rinpatch [Thu, 9 May 2019 19:27:00 +0000 (22:27 +0300)]
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
Haelwenn [Thu, 9 May 2019 17:03:37 +0000 (17:03 +0000)]
Merge branch 'improve/gitignore' into 'develop'
Prevent committing code coverage results to the repo
See merge request pleroma/pleroma!1128
Mark Felder [Thu, 9 May 2019 15:53:43 +0000 (10:53 -0500)]
Prevent committing code coverage results to the repo
kaniini [Wed, 8 May 2019 14:34:36 +0000 (14:34 +0000)]
Merge branch 'feature/761-add-users-filtration' into 'develop'
Feature/761 add users filtration
Closes #761
See merge request pleroma/pleroma!1117
Alexander Strizhakov [Wed, 8 May 2019 14:34:36 +0000 (14:34 +0000)]
Merge develop
Merge conflict in lib/pleroma/activity.ex
lambda [Wed, 8 May 2019 13:13:59 +0000 (13:13 +0000)]
Merge branch 'fix/851-emoji-redirect-follow' into 'develop'
emoji dowload follow redirects
Closes #851
See merge request pleroma/pleroma!1126
Alex S [Wed, 8 May 2019 12:05:25 +0000 (19:05 +0700)]
emoji dowload follow redirects
lambda [Wed, 8 May 2019 10:52:14 +0000 (10:52 +0000)]
Merge branch 'refactor/oauth_scopes' into 'develop'
Refactoring functions for dealing with oauth scopes.
See merge request pleroma/pleroma!1125
Maksim [Wed, 8 May 2019 10:52:13 +0000 (10:52 +0000)]
Refactoring functions for dealing with oauth scopes.
kaniini [Tue, 7 May 2019 19:37:41 +0000 (19:37 +0000)]
Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'
Optimize bookmarks by preloading them with activities
Closes #861
See merge request pleroma/pleroma!1121
William Pitcock [Tue, 7 May 2019 19:30:51 +0000 (19:30 +0000)]
twitterapi: use order constraint to force descending order
William Pitcock [Tue, 7 May 2019 19:30:27 +0000 (19:30 +0000)]
activitypub: add optional order constraint to timeline query builder
rinpatch [Tue, 7 May 2019 15:00:50 +0000 (18:00 +0300)]
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
rinpatch [Sat, 4 May 2019 10:50:39 +0000 (13:50 +0300)]
Use with_preloaded_bookmark in create_by_object_ap_id_with_object
rinpatch [Sat, 4 May 2019 10:42:54 +0000 (13:42 +0300)]
- Actually use preloaded bookmarks in views
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
rinpatch [Sat, 4 May 2019 09:46:42 +0000 (12:46 +0300)]
Preload bookmarks wherever the object is preloaded
rinpatch [Fri, 3 May 2019 19:15:47 +0000 (22:15 +0300)]
Remove bookmarks assoc
kaniini [Tue, 7 May 2019 16:15:27 +0000 (16:15 +0000)]
Merge branch 'docs/MRF-modules' into 'develop'
Documentation: MRF Modules
See merge request pleroma/pleroma!1122
William Pitcock [Tue, 7 May 2019 16:11:10 +0000 (16:11 +0000)]
containment: remove pointless moduledoc line
lambda [Tue, 7 May 2019 14:43:21 +0000 (14:43 +0000)]
Merge branch 'conversations_three' into 'develop'
Conversations once more.
See merge request pleroma/pleroma!1119
Egor Kislitsyn [Tue, 7 May 2019 09:51:11 +0000 (16:51 +0700)]
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
rinpatch [Tue, 7 May 2019 02:35:31 +0000 (02:35 +0000)]
Merge branch 'unused-config-parameter' into 'develop'
unused config paramater
See merge request pleroma/pleroma!1124
Alex S [Tue, 7 May 2019 02:07:06 +0000 (09:07 +0700)]
unused config paramater
rinpatch [Tue, 7 May 2019 00:32:07 +0000 (00:32 +0000)]
Merge branch 'fix/ex_doc-source-links' into 'develop'
Fix/ex_doc source links
See merge request pleroma/pleroma!1123
xse [Tue, 7 May 2019 00:32:07 +0000 (00:32 +0000)]
Fix/ex_doc source links
lambda [Mon, 6 May 2019 17:51:03 +0000 (17:51 +0000)]
Merge branch 'issue_800' into 'develop'
[#800] added ability renew access_token by refresh_token
See merge request pleroma/pleroma!1045
Maksim [Mon, 6 May 2019 17:51:03 +0000 (17:51 +0000)]
fix format
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
lambda [Mon, 6 May 2019 17:17:03 +0000 (17:17 +0000)]
Merge branch 'feature/bbs' into 'develop'
BBS / SSH
See merge request pleroma/pleroma!997
projects / akkoma / log