Commit graph

10670 commits

Author SHA1 Message Date
Ivan Tashkinov
cf3f8cb72a [#1940] Reinstated OAuth-less admin_token authentication. Refactored UserIsAdminPlug (freed from checking admin scopes presence). 2020-07-19 21:35:57 +03:00
5d215fd81f Merge branch 'config-behaviours-runtime' into 'develop'
Config/Docs: Expand behaviour suggestions modules at runtime

Closes #1941

See merge request pleroma/pleroma!2755
2020-07-13 15:45:25 +00:00
8f9ee694ed Merge branch 'features/profile-fields-emojo' into 'develop'
user: Add support for custom emojis in profile fields

See merge request pleroma/pleroma!2741
2020-07-13 15:43:46 +00:00
63fef0c0fb Merge branch 'chore/improve-database-config-docs' into 'develop'
Improve database config migration and add documentation

See merge request pleroma/pleroma!2756
2020-07-13 15:42:20 +00:00
db529d454e Merge branch 'fix/mediaproxy-cache-settings-types' into 'develop'
Update types for :headers and :options settings in Pleroma.Web.MediaProxy.Invalidation.Http

See merge request pleroma/pleroma!2735
2020-07-13 15:38:56 +00:00
Mark Felder
d1cd3f4ec0 Lint 2020-07-13 10:32:17 -05:00
Mark Felder
442fe3cd45 Show examples for both OTP and source 2020-07-13 09:56:05 -05:00
Mark Felder
e1908a5270 Pick up env for both source and OTP installs 2020-07-13 08:39:56 -05:00
Haelwenn
f918b6f86d Merge branch '1937-renaming' into 'develop'
ActivityPub: Don't rename a clashing nickname with the same ap id.

Closes #1937

See merge request pleroma/pleroma!2748
2020-07-13 12:06:43 +00:00
Mark Felder
46b123cded Still allow passing the arg, but fallback to MIX_ENV 2020-07-12 10:59:12 -05:00
Mark Felder
0871e8b8fe Make the query more precise 2020-07-12 10:43:24 -05:00
Mark Felder
133004e22d Improve database config migration and add documentation 2020-07-12 10:38:07 -05:00
href
4347d2de5e Config/Docs: Expand behaviour suggestions at runtime 2020-07-12 17:23:33 +02:00
Angelina Filippova
0eeeaa37e8 Update types in MRF Keyword group 2020-07-12 01:38:16 +03:00
lain
11dd29ef3f Merge branch 'feature/upload-filter-exiftool' into 'develop'
Add Pleroma.Upload.Filter.Exiftool

Closes #1935

See merge request pleroma/pleroma!2744
2020-07-11 11:31:44 +00:00
lain
c409a064ba 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
2020-07-11 11:30:02 +00:00
d885540590 docs: API: fix update_credentials endpoints path, clarify update/verify_credentials endpoints paths 2020-07-11 11:02:13 +00:00
Angelina Filippova
98c56ff477 Remove :regex from types 2020-07-11 04:32:44 +03:00
Angelina Filippova
02b2747d42 Update types for :params, :match_actor and :replace settings 2020-07-11 04:17:21 +03:00
Mark Felder
b329f05ed6 Remove unused @types 2020-07-10 17:08:54 -05:00
Mark Felder
9e45672674 Add a moduledoc 2020-07-10 17:07:28 -05:00
Mark Felder
6167593881 Support Exiftool for stripping EXIF data
We really only want to strip location data anyway, and mogrify strips color profiles.
2020-07-10 16:46:26 -05:00
d6f67fa91b Merge branch 'issue/1790-updated-oban' into 'develop'
[#1790] updated oban to 2.0.0

See merge request pleroma/pleroma!2674
2020-07-10 17:39:46 +00:00
167a619432 Merge branch 'fix/1924-s3-descriptions' into 'develop'
docs and descriptions for s3 settings

Closes #1924

See merge request pleroma/pleroma!2745
2020-07-10 16:42:35 +00:00
76f5f61713 Merge branch 'chore/should-document-that' into 'develop'
Probably worth documenting the MediaProxy fix

See merge request pleroma/pleroma!2750
2020-07-10 16:38:05 +00:00
Mark Felder
3c0c1fd2ef Merge branch 'develop' into issue/1790-updated-oban 2020-07-10 11:34:53 -05:00
Mark Felder
d7a37fddd1 Switch to the official Oban 2.0.0 release 2020-07-10 11:33:08 -05:00
Mark Felder
0517d3252e Probably worth documenting the MediaProxy fix 2020-07-10 11:22:29 -05:00
ce9514000d 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
2020-07-10 16:18:28 +00:00
Mark Felder
72b3dbf4d1 Credo line length complaint 2020-07-10 11:04:19 -05:00
href
a1dace088c ReverseProxy: Streaming and disable encoding if Range
Fixes #1823
Fixes #1860
2020-07-10 17:23:11 +02:00
lain
93e494ec21 ActivityPub: Don't rename a clashing nickname with the same ap id. 2020-07-10 14:10:44 +02:00
lain
fba1ee7d7b 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
2020-07-10 10:37:42 +00:00
lain
b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information 2020-07-10 12:26:53 +02:00
lain
8aa7143f46 Merge branch 'bump-fe-2020-07-10' into 'develop'
Update frontend

See merge request pleroma/pleroma!2747
2020-07-10 09:45:10 +00:00
lain
328062308a Update frontend 2020-07-10 11:41:10 +02:00
Haelwenn
31a0ed5d01 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
2020-07-10 09:22:14 +00:00
lain
48f98a2748 Merge branch 'mix-tasks-improvement' into 'develop'
Mix tasks improvement

See merge request pleroma/pleroma!2723
2020-07-10 08:58:44 +00:00
lain
4d809144d8 Merge branch 'cluster-test-ci' into 'develop'
RE-enable cluster tests on CI

See merge request pleroma/pleroma!2743
2020-07-10 08:56:12 +00:00
Haelwenn
4ac6e6283f Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
#   CHANGELOG.md
2020-07-10 08:55:15 +00:00
Haelwenn
5ea6387572 Merge branch 'user-search-nickname-rank-boost' into 'develop'
Improved search results for localized nickname match

See merge request pleroma/pleroma!2733
2020-07-10 08:49:14 +00:00
Haelwenn
8743df5193 Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma!2739
2020-07-10 08:45:39 +00:00
Ben Is
b6de9b1987 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/
2020-07-10 08:27:50 +00:00
Ben Is
11c9654a32 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/
2020-07-10 08:27:50 +00:00
Haelwenn
77c4c60e55 Merge branch 'prometheus-update' into 'develop'
prometheus update for OTP 23

See merge request pleroma/pleroma!2746
2020-07-10 08:27:41 +00:00
Alexander Strizhakov
b6688030fa
prometheus update for OTP 23 2020-07-10 10:35:59 +03:00
Alexander Strizhakov
b1b8f5f11a
docs and descriptions for s3 settings 2020-07-10 09:16:53 +03:00
Angelina Filippova
ac9f18de11 Update type for :replace settings 2020-07-10 03:32:53 +03:00
Angelina Filippova
6b9210e886 Update type for :groups setting 2020-07-10 03:07:55 +03:00
stwf
08211eff22 Re-enable the federated tests, increase timeout 2020-07-09 13:49:30 -04:00