Alexander Strizhakov
ef5b0510eb
updating timex
2021-03-20 08:29:02 +03:00
Alexander Strizhakov
d7e51206a2
respect content-type header in finger request
2021-03-19 18:53:55 +03:00
rinpatch
a9bc652ab9
Merge branch 'mediaproxy-decode' into 'develop'
...
Simple way to decode mediaproxy URLs
See merge request pleroma/pleroma!3364
2021-03-19 08:52:12 +00:00
rinpatch
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
2021-03-19 08:48:22 +00:00
rinpatch
67bde35e71
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
...
Add support for actor icon being a list (Bridgy)
See merge request pleroma/pleroma!3372
2021-03-19 08:36:26 +00:00
Haelwenn
a2aa309496
Merge branch 'update_open_api_spex' into 'develop'
...
Update OpenApiSpex dependency
See merge request pleroma/pleroma!3362
2021-03-16 01:54:43 +00:00
rinpatch
8194622a72
Merge branch 'feature/object-hashtags-rework' into 'develop'
...
Hashtags extraction from objects. Background migration infrastructure.
Closes #1840 and #2455
See merge request pleroma/pleroma!3213
2021-03-15 09:35:46 +00:00
Haelwenn (lanodan) Monnier
b1d4b2b81e
Add support for actor icon being a list (Bridgy)
2021-03-15 06:44:05 +01:00
Haelwenn
19fbe5b860
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3370
2021-03-14 08:09:22 +00:00
b80f868c6b
Prefer naming this function build_image_url/2
2021-03-13 12:27:15 -06:00
Ben Is
2408363e2a
Translated using Weblate (Italian)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
2021-03-13 09:40:56 +00:00
Ivan Tashkinov
cb73456609
[ #3213 ] Code formatting fix.
2021-03-12 12:25:18 +03:00
Ivan Tashkinov
3edf45021e
[ #3213 ] Background migration infrastructure refactoring.
...
Extracted BaseMigrator and BaseMigratorState.
2021-03-12 12:18:11 +03:00
Ivan Tashkinov
fbcddd8126
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-12 08:49:25 +03:00
rinpatch
9de2a5024e
Merge branch 'improve-gitlab-ci' into 'develop'
...
Execute mix deps.get earlier and avoid duplicate invocations if possible
See merge request pleroma/pleroma!3369
2021-03-11 19:14:59 +00:00
884584772b
Execute mix deps.get earlier and avoid duplicate invocations if possible
2021-03-11 09:42:04 -06:00
029ff65389
Leverage function pattern matching instead
2021-03-11 09:20:29 -06:00
8246db2a96
Workaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771
...
If we avoid URI.merge unless we know we need it we reduce the edge cases we could encounter.
The site would need to both have "//" in the %URI{:path} and the image needs to be a relative URL.
2021-03-10 17:15:31 -06:00
8e09a3cfa0
Merge branch 'fix/spec-build' into 'develop'
...
Ensure we fetch deps during spec-build stage
See merge request pleroma/pleroma!3368
2021-03-10 23:14:46 +00:00
fa75f11ca1
Revert "See if switching to same image as releases fixes the build"
...
This reverts commit 502d166b7e
2021-03-10 16:37:24 -06:00
502d166b7e
See if switching to same image as releases fixes the build
2021-03-10 16:19:18 -06:00
8feeb672c8
Ensure we fetch deps during spec-build stage
2021-03-10 13:03:14 -06:00
Ivan Tashkinov
946e0aab49
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-10 07:48:50 +03:00
Haelwenn
7f413139fb
Merge branch 'openapi/admin/user' into 'develop'
...
Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355
2021-03-10 03:24:40 +00:00
Ivan Tashkinov
92526e0230
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-03-07 11:34:39 +03:00
Ivan Tashkinov
7f8785fd9b
[ #3213 ] Performance optimization of filtering by hashtags ("any" condition).
2021-03-07 11:33:21 +03:00
eaaa20e0f1
Make tests use it
2021-03-05 13:21:22 -06:00
e97b34f65d
Add simple way to decode fully qualified mediaproxy URLs
2021-03-05 13:18:37 -06:00
Egor Kislitsyn
92ab72dbbb
Update OpenApiSpex dependency
2021-03-05 15:51:29 +04:00
Egor Kislitsyn
9876fa8e90
Add UserOperation to Redoc
2021-03-04 21:13:53 +04:00
Ivan Tashkinov
5856f51717
[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.
2021-03-03 23:09:30 +03:00
lain
13aa98d689
Merge branch 'mergeback/2.3.0' into 'develop'
...
Mergeback/2.3.0
See merge request pleroma/pleroma!3360
2021-03-03 15:07:50 +00:00
lain
10f402af6d
Changelog: Re-add application support
2021-03-03 15:35:25 +01:00
lain
2e296c079f
Revert "StatusController: Deactivate application support for now."
...
This reverts commit 024c11c18d
2021-03-03 15:33:06 +01:00
lain
c5352e90be
Changelog, mix: merge in stable
2021-03-03 13:56:40 +01:00
Haelwenn
49afbcda5f
Merge branch 'fix-migration' into 'develop'
...
Fix migration in cases where database name has a hyphen
See merge request pleroma/pleroma!3359
2021-03-03 00:57:39 +00:00
5b8cceba09
Fix migration in cases where database name has a hyphen
2021-03-02 18:17:32 -06:00
Haelwenn
37c37090fa
Merge branch 'fix/inconsistent-reference' into 'develop'
...
MastoAPI Status View: make consistently named object references
See merge request pleroma/pleroma!3358
2021-03-02 20:48:40 +00:00
Haelwenn
81e9c5196f
Merge branch 'fix/useless-header' into 'develop'
...
Test: remove useless header on the get request
See merge request pleroma/pleroma!3357
2021-03-02 20:47:21 +00:00
8d601d3b23
Make the object reference in both render("show.json", _) functions consistently named
2021-03-02 14:14:38 -06:00
913d53b7d7
Remove useless header on the get request
2021-03-02 14:04:50 -06:00
lain
b221d77a6d
Merge branch 'release/2.3.0' into 'stable'
...
Release/2.3.0
See merge request pleroma/pleroma!3354
2021-03-02 19:54:30 +00:00
210aa42f74
Merge branch 'application-to-generator' into 'develop'
...
Status application field: test improvements
See merge request pleroma/pleroma!3356
2021-03-02 18:40:35 +00:00
ccbf162088
Actually test viewing status after ingestion
2021-03-02 12:33:32 -06:00
f0208980e4
Test both ingestion of post in the status controller and the correct response during the view
2021-03-02 12:29:16 -06:00
85b2387f66
Fix build_application/1 match
2021-03-02 11:37:37 -06:00
Egor Kislitsyn
3aae5231b2
Add OpenAPI spec for AdminAPI.UserController
2021-03-02 20:49:17 +04:00
lain
0a589c887b
Mix: Update linkify.
2021-03-02 17:03:14 +01:00
lain
7dac83eb6e
Linting.
2021-03-02 15:03:16 +01:00
lain
7d790bb27b
Changelog: Remove application support line.
2021-03-02 14:42:11 +01:00
