nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
10793 commits 2 branches 0 tags 272 MiB
Commit graph

10793 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain 76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop' 
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting

Closes #1973

See merge request pleroma/pleroma!2791
 2020-07-23 12:52:02 +00:00
Ivan Tashkinov 9ea51a6de5 [#2791] AccountView: renamed :force option to :skip_visibility_check. 2020-07-23 15:08:30 +03:00
lain b2ba70eec4 Merge branch 'bugfix/mrf-reject-logging' into 'develop' 
Fix #783: Make MRF reject log as info level instead of error

Closes #783

See merge request pleroma/pleroma!2758
 2020-07-23 11:08:29 +00:00
lain 250e0369c7 Merge branch 'issue/1878' into 'develop' 
[#1878] fix reset confirmation email in admin section

See merge request pleroma/pleroma!2751
 2020-07-23 10:56:33 +00:00
lain a81581472f Merge branch 'linkify' into 'develop' 
Fix Linkify

See merge request pleroma/pleroma!2792
 2020-07-23 10:28:52 +00:00
Alex Gleason b6488a4db4
Update linkify migration tests to use config from ConfigDB 2020-07-22 16:11:53 -05:00
Alex Gleason c7a0016f9f
Migration to fix malformed Pleroma.Formatter config 2020-07-22 14:32:45 -05:00
Alex Gleason b87a1f8eaf
Refactor require_migration/1 into a test helper function 2020-07-22 14:32:44 -05:00
Alex Gleason 67389b77af
Add AutolinkerToLinkify migration test 2020-07-22 14:32:24 -05:00
Alex Gleason 7045db5a50
Fix linkify ConfigDB migration 2020-07-22 11:38:55 -05:00
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. 
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
 2020-07-22 19:06:00 +03:00
lain 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop' 
Fix /api/pleroma/emoji/packs index endpoint.

See merge request pleroma/pleroma!2777
 2020-07-22 15:09:32 +00:00
lain 96f023be5c Merge branch 'bugfix/limiter_git_url' into 'develop' 
mix.exs: Append .git to git repo URLs

Closes #1980

See merge request pleroma/pleroma!2787
 2020-07-22 11:22:34 +00:00
Haelwenn (lanodan) Monnier c8fe0321b0
mix.exs: Append .git to git repo URLs 
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1980
 2020-07-22 12:00:07 +02:00
Mark Felder b157b7dab3 Document the emoji packs API fix 2020-07-21 17:29:11 -05:00
Mark Felder 109836306c Test that Emoji Packs can be listed when instance is not public 2020-07-21 17:27:13 -05:00
Mark Felder 341a8f3500 Skip the correct plug 2020-07-21 17:26:59 -05:00
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" 
This reverts merge request !2784
 2020-07-21 22:18:17 +00:00
lain c36113cdf5 Merge branch 'revert-2b5d9eb1' into 'develop' 
Revert "Merge branch 'linkify' into 'develop'"

See merge request pleroma/pleroma!2784
 2020-07-21 22:18:02 +00:00
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'" 
This reverts merge request !2677
 2020-07-21 22:17:34 +00:00
Mark Felder 97c60b6a43 Merge branch 'develop' into fix/pleroma-api-emoji-packs 2020-07-21 16:25:45 -05:00
lain 2b5d9eb105 Merge branch 'linkify' into 'develop' 
AutoLinker --> Linkify, update to latest version

See merge request pleroma/pleroma!2677
 2020-07-21 19:35:43 +00:00
lain fa2421dd7e Merge branch 'gopher-fix' into 'develop' 
Gopher: using atom keys in search params

See merge request pleroma/pleroma!2775
 2020-07-21 19:31:03 +00:00
Alexander Strizhakov 6afc6717d6
copy tmp file if test depends on it 2020-07-21 10:31:58 +03:00
Alex Gleason 204dddcfaa
Pleroma.Formatter can have partial updates 2020-07-20 13:45:05 -05:00
Alex Gleason 5d263dfdb3
Update linkify to latest release 2020-07-20 09:29:03 -05:00
Haelwenn 1b82b7eac9 Merge branch 'patch-1' into 'develop' 
fix markdown rendering withing <details>; typo parent**s**_visible

See merge request pleroma/pleroma!2781
 2020-07-20 13:52:56 +00:00
Dym Sohin 531c3ab9f3 fix markdown rendering withing <details>; typo parent**s**_visible 2020-07-20 11:41:43 +00:00
Alex Gleason ae74c52e22
Test angry face in formatter D:< #1968 2020-07-18 15:26:23 -05:00
feld f0d13fc3f7 Merge branch 'fix/followredirects-hackney' into 'develop' 
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used

Closes #1966 and #1961

See merge request pleroma/pleroma!2778
 2020-07-18 16:49:30 +00:00
href 4bac25e6f5 Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used 2020-07-18 13:17:38 +02:00
KokaKiwi 7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint. 2020-07-18 12:55:04 +02:00
Haelwenn 10d46235cf Merge branch 'fix-1958' into 'develop' 
OpenAPI: Add :id to follower/following endpoints, fixes #1958

Closes #1958

See merge request pleroma/pleroma!2772
 2020-07-17 18:54:30 +00:00
Alex Gleason 48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958 2020-07-17 12:35:28 -05:00
Haelwenn b782739ffe Merge branch 'feature/expose-post-formats' into 'develop' 
Expose the post formats in /api/v1/instance

See merge request pleroma/pleroma!2776
 2020-07-17 16:52:59 +00:00
Mark Felder 20a496d2cb Expose the post formats in /api/v1/instance 2020-07-17 10:45:41 -05:00
Alexander Strizhakov af376cbffb
using atom keys in search params 2020-07-17 18:06:05 +03:00
feld 64b4de4af1 Merge branch 'feature/totp-input-improvements' into 'develop' 
Improve TOTP token and recovery input fields in OAuth login

See merge request pleroma/pleroma!2769
 2020-07-17 14:36:38 +00:00
Mark Felder 62438530e2 TOTP length is configurable, so we can't hardcode this here. 2020-07-17 08:19:49 -05:00
rinpatch a3fdd1446f Merge branch 'chore/issue-template-remove-tasks' into 'develop' 
Bug issue template: remove choice in "Installation type"

See merge request pleroma/pleroma!2774
 2020-07-17 08:05:16 +00:00
rinpatch 2a3bb23091 Bug issue template: remove choice in "Installation type" 
It made gitlab display "1 of 2 tasks completed" when one is chosen,
which is totally not what this was used for.
 2020-07-17 11:03:47 +03:00
Alex Gleason 613e096389
Migrate :auto_linker --> Pleroma.Formatter in ConfigDB 2020-07-16 16:35:03 -05:00
Alex Gleason 880301985b
Formatter: Test link with local mention 2020-07-16 16:34:43 -05:00
Alex Gleason 5701840d30
Use updated Linkify from git 2020-07-16 15:01:13 -05:00
Alex Gleason 6fdaee7cae
description.exs typofixes 2020-07-16 14:52:48 -05:00
Alex Gleason 38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify 2020-07-16 14:51:36 -05:00
Mark Felder 3be64556db Improve TOTP token and recovery input fields in OAuth login 2020-07-16 13:11:03 -05:00
feld 3a2b2cb6f2 Merge branch 'refactor/gun-pool-registry' into 'develop' 
Refactor gun pooling and simplify adapter option insertion

Closes #1834, #1700, and #1680

See merge request pleroma/pleroma!2479
 2020-07-15 23:10:52 +00:00
Mark Felder b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry 2020-07-15 13:34:27 -05:00
feld 00f9b53f07 Merge branch 'refactor/notification_settings' into 'develop' 
Refactor notification settings

See merge request pleroma/pleroma!2602
 2020-07-15 15:22:39 +00:00