lain [Thu, 7 Jan 2021 10:08:02 +0000 (10:08 +0000)]
Merge branch 'adminapi-user-email' into 'develop'
AdminAPI: return user email
See merge request pleroma/pleroma!3240
lain [Thu, 7 Jan 2021 10:06:39 +0000 (10:06 +0000)]
Merge branch 'upstream/remote-emoji-support' into 'develop'
Upstream external emoji support
See merge request pleroma/pleroma!3238
Alex Gleason [Wed, 6 Jan 2021 17:43:07 +0000 (11:43 -0600)]
Add AdminAPI.AccountViewTest
Alex Gleason [Wed, 6 Jan 2021 17:30:32 +0000 (11:30 -0600)]
AdminAPI: return user email
Roger Braun [Wed, 6 Feb 2019 17:05:34 +0000 (18:05 +0100)]
allow external emoji
feld [Tue, 5 Jan 2021 21:16:33 +0000 (21:16 +0000)]
Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'
Fix proxy and mediaproxy description.exs
See merge request pleroma/pleroma!3219
lain [Tue, 5 Jan 2021 20:09:29 +0000 (20:09 +0000)]
Merge branch 'fix/emoji-encoding' into 'develop'
URI.encode custom emojis
Closes #2381
See merge request pleroma/pleroma!3235
Mark Felder [Tue, 5 Jan 2021 19:58:49 +0000 (13:58 -0600)]
Add test to validate URLs to custom emojis are properly encoded
Mark Felder [Tue, 5 Jan 2021 19:25:14 +0000 (13:25 -0600)]
Add dinosaur gif from https://gifs.cc
"Our animations are free to be used to enhance your website."
Mark Felder [Tue, 5 Jan 2021 18:25:30 +0000 (12:25 -0600)]
URI.encode custom emojis
lain [Tue, 5 Jan 2021 12:40:45 +0000 (12:40 +0000)]
Merge branch 'fix/pagination-regression' into 'develop'
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
lain [Tue, 5 Jan 2021 12:31:33 +0000 (12:31 +0000)]
Merge branch '1526-account-aliases' into 'develop'
Resolve "account move from mastodon to pleroma"
Closes #1526
See merge request pleroma/pleroma!3233
lain [Tue, 5 Jan 2021 12:10:14 +0000 (13:10 +0100)]
User: Use ObjectID type to validate also-known-as field
lain [Tue, 5 Jan 2021 11:42:30 +0000 (12:42 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
lain [Tue, 5 Jan 2021 11:36:57 +0000 (11:36 +0000)]
Merge branch 'pleroma-moderation-log-stuff' into 'develop'
AdminAPI: return id for moderation log entries
See merge request pleroma/pleroma!3232
lain [Tue, 5 Jan 2021 11:19:39 +0000 (12:19 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
lain [Tue, 5 Jan 2021 10:48:40 +0000 (11:48 +0100)]
AccountControllerTest: Fix test logic
Haelwenn [Tue, 5 Jan 2021 00:01:44 +0000 (00:01 +0000)]
Merge branch '2391-async-bugs' into 'develop'
SideEffects.DeleteTest: asyncify.
Closes #2391
See merge request pleroma/pleroma!3231
lain [Mon, 4 Jan 2021 17:40:59 +0000 (18:40 +0100)]
SideEffects.DeleteTest: asyncify.
Replace Mock with Mox, mock out Logger.
Mark Felder [Mon, 4 Jan 2021 17:04:58 +0000 (11:04 -0600)]
Add test to validate profile pagination works with keyset
Mark Felder [Mon, 4 Jan 2021 16:13:17 +0000 (10:13 -0600)]
Do not try to guess which pagination we need by the existence of an :offset param.
Require explicit request to get offset pagination.
Alex Gleason [Fri, 1 Jan 2021 17:58:42 +0000 (11:58 -0600)]
AdminAPI: return id for moderation log entries
feld [Thu, 31 Dec 2020 19:24:49 +0000 (19:24 +0000)]
Merge branch 'fix/reports-ordering' into 'develop'
Do not reverse order of reports. We want newest ones sorted to the top.
Closes #2364
See merge request pleroma/pleroma!3225
Mark Felder [Thu, 31 Dec 2020 19:15:44 +0000 (13:15 -0600)]
Document reports ordering change
Alex Gleason [Thu, 31 Dec 2020 18:53:28 +0000 (12:53 -0600)]
Aliases: refactor validate_also_known_as/1
Alex Gleason [Thu, 31 Dec 2020 18:51:57 +0000 (18:51 +0000)]
Apply 2 suggestion(s) to 1 file(s)
Mark Felder [Thu, 31 Dec 2020 16:53:18 +0000 (10:53 -0600)]
Ensure newest report is returned first in the list
feld [Thu, 31 Dec 2020 16:04:42 +0000 (16:04 +0000)]
Merge branch 'fix/adminapi-user-status-pagination' into 'develop'
Support pagination in AdminAPI for user statuses
See merge request pleroma/pleroma!3226
feld [Thu, 31 Dec 2020 15:55:44 +0000 (15:55 +0000)]
Apply 1 suggestion(s) to 1 file(s)
Alex Gleason [Thu, 31 Dec 2020 00:53:27 +0000 (18:53 -0600)]
Render AKAs in Actor endpoints
Alex Gleason [Wed, 30 Dec 2020 23:10:02 +0000 (17:10 -0600)]
Merge remote-tracking branch 'upstream/develop' into aliases
Mark Felder [Wed, 30 Dec 2020 22:37:04 +0000 (16:37 -0600)]
Make pagination type conditional
Mark Felder [Wed, 30 Dec 2020 22:10:10 +0000 (16:10 -0600)]
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
Mark Felder [Wed, 30 Dec 2020 20:36:04 +0000 (14:36 -0600)]
Support pagination in AdminAPI for user statuses
Mark Felder [Wed, 30 Dec 2020 20:22:48 +0000 (14:22 -0600)]
Do not reverse order of reports. We want newest ones sorted to the top.
lain [Wed, 30 Dec 2020 14:04:10 +0000 (14:04 +0000)]
Merge branch 'deps/crypt-local-fork' into 'develop'
Switch to local fork of crypt until upstream fixes ability to build on aarch64
See merge request pleroma/pleroma!3224
Mark Felder [Mon, 28 Dec 2020 23:52:18 +0000 (17:52 -0600)]
Switch to local fork of crypt until upstream fixes ability to build on aarch64
https://github.com/msantos/crypt/pull/8
Haelwenn [Mon, 28 Dec 2020 12:12:19 +0000 (12:12 +0000)]
Merge branch 'revert-
b122b6ff' into 'develop'
Revert "Merge branch 'features/hashtag-column' into 'develop'"
See merge request pleroma/pleroma!3222
Haelwenn [Mon, 28 Dec 2020 12:02:16 +0000 (12:02 +0000)]
Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
Haelwenn [Mon, 28 Dec 2020 10:14:58 +0000 (10:14 +0000)]
Merge branch 'features/hashtag-column' into 'develop'
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
Haelwenn (lanodan) Monnier [Tue, 22 Dec 2020 04:11:19 +0000 (05:11 +0100)]
pleroma.database fill_old_hashtags: Add month_limit argument
Haelwenn (lanodan) Monnier [Mon, 28 Dec 2020 09:33:28 +0000 (10:33 +0100)]
Pleroma.Object/1: take %Object{} as argument instead
lain [Sat, 26 Dec 2020 10:26:35 +0000 (10:26 +0000)]
Merge branch 'cachex-test' into 'develop'
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
Mark Felder [Wed, 23 Dec 2020 23:41:15 +0000 (17:41 -0600)]
Revert, this is useful in an edge case
Mark Felder [Wed, 23 Dec 2020 23:41:10 +0000 (17:41 -0600)]
Formatting
Mark Felder [Wed, 23 Dec 2020 23:38:33 +0000 (17:38 -0600)]
Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFE
Mark Felder [Wed, 23 Dec 2020 23:01:11 +0000 (17:01 -0600)]
Remove Proxy settings that were not meant to exist under Pleroma.Upload
Mark Felder [Wed, 23 Dec 2020 20:09:22 +0000 (14:09 -0600)]
Add test/instance to .gitignore
lain [Wed, 23 Dec 2020 15:58:20 +0000 (15:58 +0000)]
Merge branch 'update/linkify' into 'develop'
Update Linkify to 0.4.1
See merge request pleroma/pleroma!3217
Mark Felder [Wed, 23 Dec 2020 15:03:16 +0000 (09:03 -0600)]
Update Linkify to 0.4.1
Fixes false positive detection of IPv4 addresses
lain [Wed, 23 Dec 2020 14:08:08 +0000 (14:08 +0000)]
Merge branch 'mergeback/2.2.1' into 'develop'
Mergeback/2.2.1
See merge request pleroma/pleroma!3215
lain [Wed, 23 Dec 2020 13:56:57 +0000 (14:56 +0100)]
Align changelog
lain [Wed, 23 Dec 2020 13:41:04 +0000 (14:41 +0100)]
Merge branch 'stable' into mergeback/2.2.1
lain [Wed, 23 Dec 2020 13:35:41 +0000 (13:35 +0000)]
Merge branch 'release/2.2.1' into 'stable'
Release/2.2.1
See merge request pleroma/pleroma!3214
lain [Wed, 23 Dec 2020 10:56:08 +0000 (11:56 +0100)]
Fixtures: Add application actor fixture.
lain [Wed, 23 Dec 2020 10:40:34 +0000 (11:40 +0100)]
Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
lain [Wed, 23 Dec 2020 10:39:19 +0000 (11:39 +0100)]
Update changelog
lain [Wed, 23 Dec 2020 10:35:41 +0000 (10:35 +0000)]
Apply 1 suggestion(s) to 1 file(s)
lain [Wed, 23 Dec 2020 10:16:13 +0000 (11:16 +0100)]
Linting
lain [Wed, 23 Dec 2020 08:35:19 +0000 (09:35 +0100)]
Update frontend
lain [Tue, 22 Dec 2020 20:59:37 +0000 (21:59 +0100)]
Mix: Update version.
lain [Tue, 22 Dec 2020 20:54:31 +0000 (21:54 +0100)]
Update changelog
lain [Tue, 22 Dec 2020 20:32:11 +0000 (21:32 +0100)]
Report fixes.
lain [Tue, 22 Dec 2020 20:22:48 +0000 (21:22 +0100)]
Mix: Update linkify to 0.4.1
Ivan Tashkinov [Thu, 19 Nov 2020 15:08:22 +0000 (18:08 +0300)]
[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.
Alexander Strizhakov [Tue, 24 Nov 2020 15:44:48 +0000 (18:44 +0300)]
fix for elixir 1.11
load runtime configs in releases with config provider
lain [Wed, 2 Dec 2020 13:48:11 +0000 (14:48 +0100)]
SideEffects: fix test
lain [Wed, 2 Dec 2020 12:39:29 +0000 (13:39 +0100)]
User: Remove left-over (wrong) fix.
lain [Wed, 2 Dec 2020 11:18:43 +0000 (12:18 +0100)]
User: Don't allow local users in remote changesets
Mark Felder [Sat, 12 Dec 2020 19:01:30 +0000 (13:01 -0600)]
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
lain [Tue, 22 Dec 2020 20:05:12 +0000 (21:05 +0100)]
Update changelog
lain [Thu, 19 Nov 2020 15:29:31 +0000 (16:29 +0100)]
Search: Only skip ordering the rum index.
lain [Thu, 19 Nov 2020 12:20:58 +0000 (13:20 +0100)]
Activity search: Fix order of results
Greatly speeds up the search for RUM.
Mark Felder [Tue, 17 Nov 2020 15:28:46 +0000 (15:28 +0000)]
Document fixing the pleroma.user delete_activities mix task
Mark Felder [Tue, 17 Nov 2020 15:15:53 +0000 (15:15 +0000)]
Need to start web_resp cache or mix task fails
Mark Felder [Mon, 16 Nov 2020 19:54:02 +0000 (19:54 +0000)]
Document S3 and Elixir 1.11 compat fix
Mark Felder [Mon, 16 Nov 2020 19:51:44 +0000 (19:51 +0000)]
Fix S3 uploads with Elixir 1.11
Haelwenn (lanodan) Monnier [Sat, 14 Nov 2020 21:27:13 +0000 (22:27 +0100)]
pleroma.instance: Fix Exiftool module name
Alexander Strizhakov [Fri, 13 Nov 2020 06:07:08 +0000 (09:07 +0300)]
remove PurgeExpiredActivity from Oban db config
feld [Tue, 22 Dec 2020 14:53:04 +0000 (14:53 +0000)]
Merge branch 'update-elixir-make' into 'develop'
Update for retired elixir_make package version
See merge request pleroma/pleroma!3211
Alexander Strizhakov [Tue, 22 Dec 2020 14:42:23 +0000 (17:42 +0300)]
update for retired elixir_make package version
rinpatch [Tue, 22 Dec 2020 11:31:06 +0000 (11:31 +0000)]
Merge branch 'update/instance-gen-template' into 'develop'
Update instance.gen template
See merge request pleroma/pleroma!3210
Haelwenn (lanodan) Monnier [Tue, 22 Dec 2020 02:54:57 +0000 (03:54 +0100)]
Create Object.hashtags/1 wrapper
Haelwenn (lanodan) Monnier [Fri, 31 Jul 2020 14:46:35 +0000 (16:46 +0200)]
Insert text representation of hashtags into object["hashtags"]
Includes a new mix task: pleroma.database fill_old_hashtags
Mark Felder [Mon, 21 Dec 2020 21:19:24 +0000 (15:19 -0600)]
Do not include pool_size in the template. It encourages unwanted fiddling :)
lain [Mon, 21 Dec 2020 17:13:52 +0000 (17:13 +0000)]
Merge branch 'develop' into 'develop'
WebFinger: add subscribe_address in return data of JSON responses
See merge request pleroma/pleroma!3206
lain [Wed, 16 Dec 2020 19:41:35 +0000 (20:41 +0100)]
Linting
lain [Mon, 21 Dec 2020 15:38:34 +0000 (16:38 +0100)]
Tests: Stub the pipeline in all tests.
Restores the old un-moxed behavior.
lain [Wed, 16 Dec 2020 16:51:48 +0000 (17:51 +0100)]
Pipeline test: Switch from Mock to Mox.
Speeds up the test and makes it possible to run async.
lain [Wed, 16 Dec 2020 09:39:36 +0000 (10:39 +0100)]
Tests: Add a helper method to reduce sleeping times in test.
This will 'time travel', i.e. change the inserted_at and update_at
fields of the object in question. This is used to backdate things
were we used sleeping before to ensure time differences.
lain [Mon, 21 Dec 2020 15:22:36 +0000 (16:22 +0100)]
Linting
lain [Mon, 21 Dec 2020 14:05:56 +0000 (15:05 +0100)]
Test: More async/sync tweaks.
lain [Mon, 21 Dec 2020 11:59:11 +0000 (12:59 +0100)]
Tests: More test fixes.
lain [Mon, 21 Dec 2020 11:35:04 +0000 (12:35 +0100)]
XMLBuidlder test: Make async.
lain [Mon, 21 Dec 2020 11:31:12 +0000 (12:31 +0100)]
Test config: Raise pool size for postgres.
Given all the async tests, this can become a bottleneck.
lain [Mon, 21 Dec 2020 11:21:40 +0000 (12:21 +0100)]
Tests: Make as many tests as possible async.
In general, tests that match these criteria can be made async:
- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer.
lain [Mon, 21 Dec 2020 11:03:58 +0000 (12:03 +0100)]
Cachex: Unify arity of callback function
lain [Mon, 21 Dec 2020 10:42:53 +0000 (11:42 +0100)]
Caching: Add caching behavior, add null implementation.
Kaizhe Huang [Sun, 20 Dec 2020 13:54:15 +0000 (00:54 +1100)]
Fix trailing whitespaces in lib/pleroma/web/web_finger.ex
lain [Sun, 20 Dec 2020 13:40:08 +0000 (13:40 +0000)]
Merge branch 'fix/remove-sharelock-warning-oban-configdb' into 'develop'
config/description.exs: Remove outdated information about Oban
See merge request pleroma/pleroma!3208
projects / akkoma / log