tim/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
10772 commits 3 branches 74 tags 292 MiB
Commit graph

10772 commits

This branch
This branch
All branches
Author SHA1 Message Date
Guy Sheffer
0c4e855663 Add checksum to docker buildx, add aarch/arm64 to the list of platforms 2020-08-06 09:50:10 +03:00
Guy Sheffer
f9e8a94106 Add multiarch support to docker container, fixes https://git.pleroma.social/pleroma/pleroma-docker-compose/-/issues/2 2020-07-22 17:26:36 +03: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
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
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
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
Mark Felder
34d1d3e93e Update FE bundle 2020-07-15 09:38:56 -05:00
Mark Felder
9d30bacace Merge branch 'develop' into refactor/notification_settings 2020-07-15 09:30:23 -05:00
rinpatch
0fe36b311c Merge branch 'features/mrf-reasons' into 'develop' 
Add rejection reason to our MRFs

See merge request pleroma/pleroma!2759
 2020-07-15 14:00:22 +00:00
rinpatch
2ce141fb0e Merge branch 'fix/oban-pruning' into 'develop' 
Bring back oban job pruning

Closes #1945

See merge request pleroma/pleroma!2768
 2020-07-15 13:52:01 +00:00
feld
a2f9bc77b6 Merge branch 'issue/sign-authority' into 'develop' 
Include port in host for signatures

See merge request pleroma/pleroma!2766
 2020-07-15 13:44:52 +00:00
Haelwenn (lanodan) Monnier
d29b8997f4
MastoAPI: fix & test giving MRF reject reasons 2020-07-15 15:25:33 +02:00
rinpatch
c413649a8d Bring back oban job pruning 
Closes #1945
 2020-07-15 16:20:17 +03:00
rinpatch
7115c5f82e ConnectionPool.Worker: do not stop with an error when there is a timeout 
This produced error log messages about GenServer termination
every time the connection was not open due to a timeout.

Instead we stop with `{:shutdown, <gun_error>}` since shutting down
when the connection can't be established is normal behavior.
 2020-07-15 15:58:08 +03:00
Maksim Pechnikov
3f8bff8d6b Merge branch 'develop' into issue/sign-authority 2020-07-15 15:49:46 +03:00
href
6d583bcc3b Set a default timeout for Gun adapter timeout 2020-07-15 15:26:35 +03:00
href
e499275076 Don't test tls_options in adapter helper test. 2020-07-15 15:26:35 +03:00
href
afd378f84c host is now useless 2020-07-15 15:26:35 +03:00
href
ce1a42bd04 Simplify TLS opts 
- `verify_fun` is not useful now
- use `customize_check_hostname` (OTP 20+ so OK)
- `partial_chain` is useless as of OTP 21.1 (wasn't there, but hackney/..
uses it)
 2020-07-15 15:26:35 +03:00
href
ebfa591689 Go back to upstream Tesla 2020-07-15 15:26:35 +03:00
href
6b1f6a1cf7 Bump gun 2020-07-15 15:26:35 +03:00
href
53ba6815b1 parentheses... 2020-07-15 15:26:35 +03:00