moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,646 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

10646 Commits

Author SHA1 Message Date
Mark Felder 777a7edc6b Lint and fix test to match new log message 2020-07-14 13:15:37 -05:00
Mark Felder 37297a8482 Improve error messages 2020-07-14 13:12:16 -05:00
Maksim Pechnikov 62fc8eab0d fix reset confirmation email in admin section 2020-07-11 07:20:35 +03:00
feld 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
feld 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
feld 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
feld 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 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
stwf 08211eff22 Re-enable the federated tests, increase timeout 2020-07-09 13:49:30 -04:00
feld 4301ae3861 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
 2020-07-09 17:23:15 +00:00
Mark Felder 2b979cc90c Add AdminFE reports URL to report emails 2020-07-09 11:55:40 -05:00
Alexander Strizhakov 79707e879d
cleap up 2020-07-09 19:13:16 +03:00
feld 4db6678429 Merge branch 'chore/use-the-alias' into 'develop' 
Use the Pleroma.Config alias

See merge request pleroma/pleroma!2740
 2020-07-09 16:08:34 +00:00
Alexander Strizhakov d5fcec8315
fix for info after tag/untag user 2020-07-09 18:59:48 +03:00
Alexander Strizhakov c2edfd16e0
fix for user revoke invite task 2020-07-09 18:59:15 +03:00
Mark Felder d23804f191 Use the Pleroma.Config alias 2020-07-09 10:53:51 -05:00
feld 6b14f0c514 Merge branch 'fix/csp-for-captcha' into 'develop' 
Add Captcha endpoint to CSP headers when MediaProxy is enabled.

See merge request pleroma/pleroma!2718
 2020-07-09 14:33:24 +00:00
Mark Felder 49c4e24953 Merge branch 'develop' into fix/csp-for-captcha 2020-07-09 09:08:59 -05:00
lain 8ca1f3e8c6 Merge branch '1723-token-fixes' into 'develop' 
AccountController: Return scope in proper format.

Closes #1723

See merge request pleroma/pleroma!2694
 2020-07-09 13:10:05 +00:00
lain f4469dc741 Merge branch 'features/favicons' into 'develop' 
Add support for remote favicons

See merge request pleroma/pleroma!2261
 2020-07-09 13:09:31 +00:00
Haelwenn bdc7b60610 Merge branch '1925-muting-reblogs' into 'develop' 
AccountController: Fix muting / unmuting reblogs.

Closes #1925

See merge request pleroma/pleroma!2732
 2020-07-09 12:10:26 +00:00
eugenijm c2be0da79f 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` 2020-07-09 14:57:40 +03:00
Haelwenn 68036f5a3b Merge branch 'follow-pipeline' into 'develop' 
Handle `Follow` activities with the pipeline

See merge request pleroma/pleroma!2734
 2020-07-09 10:32:24 +00:00
Haelwenn 34d6009d82 Merge branch 'patch-2' into 'develop' 
fix wide2x emojis within nicknames

See merge request pleroma/pleroma!2737
 2020-07-09 09:50:08 +00:00
lain 393a588265 Merge branch 'patch-1' into 'develop' 
added link to changelog, removed repetition

See merge request pleroma/pleroma!2736
 2020-07-09 09:42:39 +00:00
lain 6d688f14fa Merge branch 'bugfix/status-deletion' into 'develop' 
#1920 fix activity deletion

See merge request pleroma/pleroma!2721
 2020-07-09 09:37:52 +00:00
Dym Sohin ab773fa5c9 [static-fe] limit according to- and within- existing ruleset 2020-07-09 09:37:50 +00:00
lain 8be0c04b40 Merge branch 'issue/1880' into 'develop' 
[#1880] fixed delete `Like` activity in remove user

See merge request pleroma/pleroma!2725
 2020-07-09 09:31:15 +00:00
lain 8594181597 Update static-fe.css 2020-07-09 09:30:15 +00:00
lain 6854c5ba2f Merge branch 'patch-3' into 'develop' 
missed `:` (colon) before mrf_steal_emoji

See merge request pleroma/pleroma!2738
 2020-07-09 09:25:10 +00:00
Dym Sohin 6465257e1f missed `:` (colon) before mrf_steal_emoji 2020-07-09 09:23:21 +00:00