Mark Felder [Mon, 13 Jul 2020 13:39:56 +0000 (08:39 -0500)]
Pick up env for both source and OTP installs
Mark Felder [Sun, 12 Jul 2020 15:59:12 +0000 (10:59 -0500)]
Still allow passing the arg, but fallback to MIX_ENV
Mark Felder [Sun, 12 Jul 2020 15:43:24 +0000 (10:43 -0500)]
Make the query more precise
Mark Felder [Sun, 12 Jul 2020 15:38:07 +0000 (10:38 -0500)]
Improve database config migration and add documentation
lain [Sat, 11 Jul 2020 11:31:44 +0000 (11:31 +0000)]
Merge branch 'feature/upload-filter-exiftool' into 'develop'
Add Pleroma.Upload.Filter.Exiftool
Closes #1935
See merge request pleroma/pleroma!2744
lain [Sat, 11 Jul 2020 11:30:02 +0000 (11:30 +0000)]
Merge branch 'patch-3' into 'develop'
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths
See merge request pleroma/pleroma!2752
Alibek Omarov [Sat, 11 Jul 2020 11:02:13 +0000 (11:02 +0000)]
docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths
Mark Felder [Fri, 10 Jul 2020 22:08:54 +0000 (17:08 -0500)]
Remove unused @types
Mark Felder [Fri, 10 Jul 2020 22:07:28 +0000 (17:07 -0500)]
Add a moduledoc
Mark Felder [Fri, 10 Jul 2020 21:46:26 +0000 (16:46 -0500)]
Support Exiftool for stripping EXIF data
We really only want to strip location data anyway, and mogrify strips color profiles.
feld [Fri, 10 Jul 2020 17:39:46 +0000 (17:39 +0000)]
Merge branch 'issue/1790-updated-oban' into 'develop'
[#1790] updated oban to 2.0.0
See merge request pleroma/pleroma!2674
feld [Fri, 10 Jul 2020 16:42:35 +0000 (16:42 +0000)]
Merge branch 'fix/1924-s3-descriptions' into 'develop'
docs and descriptions for s3 settings
Closes #1924
See merge request pleroma/pleroma!2745
feld [Fri, 10 Jul 2020 16:38:05 +0000 (16:38 +0000)]
Merge branch 'chore/should-document-that' into 'develop'
Probably worth documenting the MediaProxy fix
See merge request pleroma/pleroma!2750
Mark Felder [Fri, 10 Jul 2020 16:34:53 +0000 (11:34 -0500)]
Merge branch 'develop' into issue/1790-updated-oban
Mark Felder [Fri, 10 Jul 2020 16:33:08 +0000 (11:33 -0500)]
Switch to the official Oban 2.0.0 release
Mark Felder [Fri, 10 Jul 2020 16:22:29 +0000 (11:22 -0500)]
Probably worth documenting the MediaProxy fix
feld [Fri, 10 Jul 2020 16:18:28 +0000 (16:18 +0000)]
Merge branch 'proxy-range-and-chunk' into 'develop'
ReverseProxy: Streaming and disable encoding if Range
Closes #1860 and #1823
See merge request pleroma/pleroma!2749
Mark Felder [Fri, 10 Jul 2020 16:04:19 +0000 (11:04 -0500)]
Credo line length complaint
href [Fri, 10 Jul 2020 15:10:48 +0000 (17:10 +0200)]
ReverseProxy: Streaming and disable encoding if Range
Fixes #1823
Fixes #1860
lain [Fri, 10 Jul 2020 10:37:42 +0000 (10:37 +0000)]
Merge branch 'chat-federation-information' into 'develop'
Add an `accepts_chat_messages` to user, expose in api and federation
See merge request pleroma/pleroma!2716
lain [Fri, 10 Jul 2020 10:26:53 +0000 (12:26 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
lain [Fri, 10 Jul 2020 09:45:10 +0000 (09:45 +0000)]
Merge branch 'bump-fe-2020-07-10' into 'develop'
Update frontend
See merge request pleroma/pleroma!2747
lain [Fri, 10 Jul 2020 09:41:10 +0000 (11:41 +0200)]
Update frontend
Haelwenn [Fri, 10 Jul 2020 09:22:14 +0000 (09:22 +0000)]
Merge branch 'admin-api-user-credentials-for-remote-users-fix' into 'develop'
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
Closes admin-fe#107 and #1788
See merge request pleroma/pleroma!2554
lain [Fri, 10 Jul 2020 08:58:44 +0000 (08:58 +0000)]
Merge branch 'mix-tasks-improvement' into 'develop'
Mix tasks improvement
See merge request pleroma/pleroma!2723
lain [Fri, 10 Jul 2020 08:56:12 +0000 (08:56 +0000)]
Merge branch 'cluster-test-ci' into 'develop'
RE-enable cluster tests on CI
See merge request pleroma/pleroma!2743
Haelwenn [Fri, 10 Jul 2020 08:55:15 +0000 (08:55 +0000)]
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
Haelwenn [Fri, 10 Jul 2020 08:49:14 +0000 (08:49 +0000)]
Merge branch 'user-search-nickname-rank-boost' into 'develop'
Improved search results for localized nickname match
See merge request pleroma/pleroma!2733
Haelwenn [Fri, 10 Jul 2020 08:45:39 +0000 (08:45 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2739
Ben Is [Wed, 8 Jul 2020 00:00:40 +0000 (00:00 +0000)]
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/
Ben Is [Wed, 8 Jul 2020 22:51:39 +0000 (22:51 +0000)]
Translated using Weblate (Polish)
Currently translated at 66.0% (70 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
Haelwenn [Fri, 10 Jul 2020 08:27:41 +0000 (08:27 +0000)]
Merge branch 'prometheus-update' into 'develop'
prometheus update for OTP 23
See merge request pleroma/pleroma!2746
Alexander Strizhakov [Fri, 10 Jul 2020 07:35:59 +0000 (10:35 +0300)]
prometheus update for OTP 23
Alexander Strizhakov [Fri, 10 Jul 2020 06:16:53 +0000 (09:16 +0300)]
docs and descriptions for s3 settings
stwf [Wed, 8 Jul 2020 19:56:03 +0000 (15:56 -0400)]
Re-enable the federated tests, increase timeout
feld [Thu, 9 Jul 2020 17:23:15 +0000 (17:23 +0000)]
Merge branch 'feature/add-adminfe-url-to-report-mails' into 'develop'
Add AdminFE reports URL to report emails
Closes #1926
See merge request pleroma/pleroma!2742
Mark Felder [Thu, 9 Jul 2020 16:55:40 +0000 (11:55 -0500)]
Add AdminFE reports URL to report emails
Alexander Strizhakov [Thu, 9 Jul 2020 16:13:16 +0000 (19:13 +0300)]
cleap up
feld [Thu, 9 Jul 2020 16:08:34 +0000 (16:08 +0000)]
Merge branch 'chore/use-the-alias' into 'develop'
Use the Pleroma.Config alias
See merge request pleroma/pleroma!2740
Alexander Strizhakov [Thu, 9 Jul 2020 15:59:48 +0000 (18:59 +0300)]
fix for info after tag/untag user
Alexander Strizhakov [Thu, 9 Jul 2020 15:59:15 +0000 (18:59 +0300)]
fix for user revoke invite task
Mark Felder [Thu, 9 Jul 2020 15:53:51 +0000 (10:53 -0500)]
Use the Pleroma.Config alias
feld [Thu, 9 Jul 2020 14:33:24 +0000 (14:33 +0000)]
Merge branch 'fix/csp-for-captcha' into 'develop'
Add Captcha endpoint to CSP headers when MediaProxy is enabled.
See merge request pleroma/pleroma!2718
Mark Felder [Thu, 9 Jul 2020 14:08:59 +0000 (09:08 -0500)]
Merge branch 'develop' into fix/csp-for-captcha
lain [Thu, 9 Jul 2020 13:10:05 +0000 (13:10 +0000)]
Merge branch '1723-token-fixes' into 'develop'
AccountController: Return scope in proper format.
Closes #1723
See merge request pleroma/pleroma!2694
lain [Thu, 9 Jul 2020 13:09:31 +0000 (13:09 +0000)]
Merge branch 'features/favicons' into 'develop'
Add support for remote favicons
See merge request pleroma/pleroma!2261
Haelwenn [Thu, 9 Jul 2020 12:10:26 +0000 (12:10 +0000)]
Merge branch '1925-muting-reblogs' into 'develop'
AccountController: Fix muting / unmuting reblogs.
Closes #1925
See merge request pleroma/pleroma!2732
eugenijm [Mon, 18 May 2020 19:56:09 +0000 (22:56 +0300)]
Admin API: fix `GET /api/pleroma/admin/users/:nickname/credentials` returning 404 when getting the credentials of a remote user while `:instance, :limit_to_local_content` is set to `:unauthenticated`
Haelwenn [Thu, 9 Jul 2020 10:32:24 +0000 (10:32 +0000)]
Merge branch 'follow-pipeline' into 'develop'
Handle `Follow` activities with the pipeline
See merge request pleroma/pleroma!2734
Haelwenn [Thu, 9 Jul 2020 09:50:08 +0000 (09:50 +0000)]
Merge branch 'patch-2' into 'develop'
fix wide2x emojis within nicknames
See merge request pleroma/pleroma!2737
lain [Thu, 9 Jul 2020 09:42:39 +0000 (09:42 +0000)]
Merge branch 'patch-1' into 'develop'
added link to changelog, removed repetition
See merge request pleroma/pleroma!2736
lain [Thu, 9 Jul 2020 09:37:52 +0000 (09:37 +0000)]
Merge branch 'bugfix/status-deletion' into 'develop'
#1920 fix activity deletion
See merge request pleroma/pleroma!2721
Dym Sohin [Thu, 9 Jul 2020 09:37:50 +0000 (09:37 +0000)]
[static-fe] limit according to- and within- existing ruleset
lain [Thu, 9 Jul 2020 09:31:15 +0000 (09:31 +0000)]
Merge branch 'issue/1880' into 'develop'
[#1880] fixed delete `Like` activity in remove user
See merge request pleroma/pleroma!2725
lain [Thu, 9 Jul 2020 09:30:15 +0000 (09:30 +0000)]
Update static-fe.css
lain [Thu, 9 Jul 2020 09:25:10 +0000 (09:25 +0000)]
Merge branch 'patch-3' into 'develop'
missed `:` (colon) before mrf_steal_emoji
See merge request pleroma/pleroma!2738
Dym Sohin [Thu, 9 Jul 2020 09:23:21 +0000 (09:23 +0000)]
missed `:` (colon) before mrf_steal_emoji
Dym Sohin [Thu, 9 Jul 2020 09:03:24 +0000 (09:03 +0000)]
fix wide2x emojis within nicknames
Alexander Strizhakov [Thu, 9 Jul 2020 08:17:43 +0000 (11:17 +0300)]
load default config in mix tasks
Maksim Pechnikov [Thu, 9 Jul 2020 04:16:52 +0000 (07:16 +0300)]
fix test
Dym Sohin [Thu, 9 Jul 2020 03:15:51 +0000 (03:15 +0000)]
added link to changelog, removed repetition
Ivan Tashkinov [Wed, 8 Jul 2020 19:50:15 +0000 (22:50 +0300)]
Removed unused trigram index on `users`. Fixed `users_fts_index` usage.
stwf [Wed, 8 Jul 2020 15:32:04 +0000 (11:32 -0400)]
re-enable federation tests
lain [Wed, 8 Jul 2020 15:07:24 +0000 (17:07 +0200)]
ActivityPub: Remove `follow` and fix issues.
lain [Wed, 8 Jul 2020 13:40:56 +0000 (15:40 +0200)]
CommonAPI: Switch to pipeline for following.
Alexander Strizhakov [Fri, 3 Jul 2020 17:12:00 +0000 (20:12 +0300)]
don't restart pleroma in mix tasks
Alexander Strizhakov [Fri, 3 Jul 2020 16:18:08 +0000 (19:18 +0300)]
don't fully start pleroma in mix tasks
lain [Wed, 8 Jul 2020 12:30:53 +0000 (14:30 +0200)]
Transmogrifier: Move following to the pipeline.
lain [Wed, 8 Jul 2020 12:29:29 +0000 (14:29 +0200)]
Notification: For follows, notify the followed.
lain [Wed, 8 Jul 2020 11:23:07 +0000 (13:23 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
lain [Wed, 8 Jul 2020 11:21:58 +0000 (13:21 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
lain [Wed, 8 Jul 2020 10:55:03 +0000 (10:55 +0000)]
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
Ivan Tashkinov [Wed, 8 Jul 2020 10:14:18 +0000 (13:14 +0300)]
Improved search results for localized nickname match. Tweaked user search to rank nickname matches higher than name matches.
Ivan Tashkinov [Wed, 8 Jul 2020 09:54:23 +0000 (12:54 +0300)]
[#1895] credo fix.
lain [Wed, 8 Jul 2020 09:52:29 +0000 (11:52 +0200)]
AccountController: Fix muting / unmuting reblogs.
Ivan Tashkinov [Wed, 8 Jul 2020 09:36:44 +0000 (12:36 +0300)]
[#1895] Applied code review suggestion.
Maksim Pechnikov [Tue, 7 Jul 2020 06:10:02 +0000 (09:10 +0300)]
fixed delete `Like` activity in remove user
Haelwenn (lanodan) Monnier [Wed, 8 Jul 2020 04:09:39 +0000 (06:09 +0200)]
Add changelog and documentation
Haelwenn (lanodan) Monnier [Wed, 8 Jul 2020 03:56:24 +0000 (05:56 +0200)]
Add [:instances_favicons, :enabled] setting, defaults to false
Haelwenn (lanodan) Monnier [Tue, 7 Jul 2020 10:07:30 +0000 (12:07 +0200)]
instance: Prevent loop of updates
Haelwenn (lanodan) Monnier [Tue, 7 Jul 2020 09:13:38 +0000 (11:13 +0200)]
Use instances table instead of Cachex
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 04:38:25 +0000 (05:38 +0100)]
Move get_favicon to Pleroma.Instances, use /
Haelwenn (lanodan) Monnier [Sun, 1 Mar 2020 08:48:32 +0000 (09:48 +0100)]
Add support for remote favicons
Haelwenn [Wed, 8 Jul 2020 03:25:30 +0000 (03:25 +0000)]
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
Haelwenn [Wed, 8 Jul 2020 03:05:20 +0000 (03:05 +0000)]
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
lain [Tue, 7 Jul 2020 18:26:07 +0000 (18:26 +0000)]
Merge branch 'remove-twitter-api' into 'develop'
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
Ivan Tashkinov [Tue, 7 Jul 2020 17:44:16 +0000 (20:44 +0300)]
[#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting.
Ivan Tashkinov [Tue, 7 Jul 2020 17:37:11 +0000 (20:37 +0300)]
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
Mark Felder [Tue, 7 Jul 2020 16:21:05 +0000 (11:21 -0500)]
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
lain [Tue, 7 Jul 2020 15:13:23 +0000 (17:13 +0200)]
Update frontend
lain [Tue, 7 Jul 2020 14:51:44 +0000 (16:51 +0200)]
Changelog: Add info about avatar removal
lain [Tue, 7 Jul 2020 14:48:47 +0000 (16:48 +0200)]
AccountController: Remove unused `update_?` routes.
These were not documented and are also not used anymore.
lain [Tue, 7 Jul 2020 14:26:57 +0000 (16:26 +0200)]
Docs: Document resetting of images
lain [Tue, 7 Jul 2020 14:20:50 +0000 (16:20 +0200)]
AccountController: Allow removal / reset of user images.
lain [Tue, 7 Jul 2020 11:41:56 +0000 (11:41 +0000)]
Merge branch 'develop' into 'develop'
added hyper:// to default protocols
See merge request pleroma/pleroma!2727
lain [Tue, 7 Jul 2020 09:14:50 +0000 (09:14 +0000)]
Merge branch 'bugfix/peertube-videos' into 'develop'
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
Haelwenn [Tue, 7 Jul 2020 08:23:49 +0000 (08:23 +0000)]
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
Haelwenn (lanodan) Monnier [Mon, 25 May 2020 11:13:42 +0000 (13:13 +0200)]
Fix getting videos from peertube
DYM [Tue, 7 Jul 2020 07:05:54 +0000 (09:05 +0200)]
added hyper:// to default protocols
Haelwenn [Tue, 7 Jul 2020 03:00:52 +0000 (03:00 +0000)]
Merge branch 'description-limits' into 'develop'
Add limits to image descriptions
See merge request pleroma/pleroma!2724
projects / akkoma / log