Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,389 Commits 1 Branch 0 Tags 222 MiB
decaa64f75
Commit Graph

9389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain
c30b3b2dc5 Merge branch 'reply-filtering-refactor' into 'develop' 
Reply filtering refactor

See merge request pleroma/pleroma!2424
 2020-04-24 16:32:13 +00:00
lain
d89cd0a197 Reply Filtering: Refactor. 2020-04-24 18:25:26 +02:00
lain
d862c7156a Merge branch 'openapi-improvements' into 'develop' 
Support validation for inline OpenAPI schema and automatic tests for examples

Closes #1696

See merge request pleroma/pleroma!2421
 2020-04-24 16:10:43 +00:00
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration 2020-04-24 18:37:58 +04:00
Ivan Tashkinov
00e62161f6 [#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints. 2020-04-24 16:52:38 +03:00
lain
e2f3030c86
Apply suggestion to CHANGELOG.md 2020-04-24 15:43:54 +03:00
lain
8480f84615
Update differences_in_mastoapi_responses.md 2020-04-24 15:43:54 +03:00
Alexander Strizhakov
375ab05234
bench sync 2020-04-24 15:43:54 +03:00
Alexander Strizhakov
1a75ef63b2
updating benchmarks 2020-04-24 15:43:54 +03:00
Alexander
be34672d67
formatting 2020-04-24 15:43:54 +03:00
Alexander
6e625a427c
reply filtering 2020-04-24 15:43:49 +03:00
lain
cb12585098 Announcements: Prevent race condition. 2020-04-24 14:37:53 +02:00
lain
2430b9bf90 Merge branch 'feature/remove-unused-like-code' into 'develop' 
ActivitPub: Remove `like` function.

See merge request pleroma/pleroma!2422
 2020-04-24 12:09:15 +00:00
lain
1df6af2a4c Credo fixes. 2020-04-24 13:59:48 +02:00
lain
bbf8554c97 ActivitPub: Remove like function. 
We don't need another way to build likes.
 2020-04-24 13:48:13 +02:00
Egor Kislitsyn
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples 2020-04-24 15:16:15 +04:00
Ivan Tashkinov
89f38d94c7 [#2409] Fixed before-action callback results persistence. 2020-04-23 21:47:33 +03:00
rinpatch
1b5f8d19ee Merge branch 'bugfix/repeating-announce' into 'develop' 
CommonAPI: Don't make repeating announces possible

See merge request pleroma/pleroma!2418
 2020-04-23 12:40:38 +00:00
lain
7d38197894 CommonAPI: Don't make repeating announces possible 2020-04-23 13:33:30 +02:00
rinpatch
25eec6d72d Merge branch 'bugfix/null-scheduled-at' into 'develop' 
StatusController: Ignore nil scheduled_at parameters.

Closes #1699

See merge request pleroma/pleroma!2412
 2020-04-23 11:22:30 +00:00
lain
850377a7b8 Merge branch 'bugfix/1629-fav-race-condition' into 'develop' 
SideEffects: Run in transaction.

Closes #1629

See merge request pleroma/pleroma!2417
 2020-04-22 19:26:32 +00:00
lain
1bcbdc7a9f SideEffects: Use less cryptic syntax. 2020-04-22 21:21:21 +02:00
Haelwenn
af27e4dffd Merge branch 'bugfix/1670-user-count' into 'develop' 
Stats: Ignore internal users for user count.

Closes #1670

See merge request pleroma/pleroma!2414
 2020-04-22 17:37:09 +00:00
lain
f5bda09de6 Stats: Use invisible property for filtering. 2020-04-22 19:02:22 +02:00
Ivan Tashkinov
e7fb593d13 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users 
# Conflicts:
#	CHANGELOG.md
 2020-04-22 20:00:51 +03:00
lain
e62173dfc8 SideEffects: Run in transaction. 
This fixes race conditions.
 2020-04-22 18:40:53 +02:00
Egor Kislitsyn
1b06a27746
Update Flake ID description 2020-04-22 20:20:19 +04:00
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account 2020-04-22 20:18:12 +04:00
Ivan Tashkinov
0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks 
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
 2020-04-22 18:51:59 +03:00
Ivan Tashkinov
2958a7d246 Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped. 2020-04-22 18:50:25 +03:00
Haelwenn
28f8fcf8b0 Merge branch 'fix/follow-and-blocks-import' into 'develop' 
Fix follower/blocks import when nicknames starts with @

Closes #1698

See merge request pleroma/pleroma!2416
 2020-04-22 15:46:04 +00:00
Haelwenn
468cc977be Merge branch 'bugfix/following-fix-status-code' into 'develop' 
AccountController: Use code 400 for self-follow.

Closes #1674

See merge request pleroma/pleroma!2413
 2020-04-22 15:33:04 +00:00
Haelwenn
238058ecae Merge branch 'bugfix/1543-streaming-boosts' into 'develop' 
Streamer: Stream boosts to the boosting user.

Closes #1543

See merge request pleroma/pleroma!2415
 2020-04-22 15:31:51 +00:00
Ivan Tashkinov
b03aeae8b9 Apply suggestion to lib/pleroma/notification.ex 2020-04-22 15:31:41 +00:00
Egor Kislitsyn
771c1ad735
Update CHANGELOG 2020-04-22 19:31:03 +04:00
Egor Kislitsyn
6db52c3b36 Fix Oban warning 
Warning example:

     [warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received:  [error: "not found @user@server.party", error: "not found "]  The job will be considered a success.
 2020-04-22 19:27:28 +04:00
Egor Kislitsyn
e7771424a8 Fix blocks import 2020-04-22 19:27:28 +04:00
Egor Kislitsyn
88b82e5c3e Fix follow import 2020-04-22 19:27:28 +04:00
lain
7a3a88a13e Streamer: Stream boosts to the boosting user. 2020-04-22 17:21:13 +02:00
Haelwenn
1855c597c2 Merge branch 'feature/voters-count' into 'develop' 
Polls: Persist and show voters' count

Closes #1702

See merge request pleroma/pleroma!2411
 2020-04-22 15:12:19 +00:00
Haelwenn
2e73c19edc Merge branch 'worker-messages' into 'develop' 
Worker messages

Closes #1705

See merge request pleroma/pleroma!2410
 2020-04-22 15:09:10 +00:00
lain
1cd38dfffa Merge branch 'microformats' into 'develop' 
static_fe: Add microformats2 classes

See merge request pleroma/pleroma!2215
 2020-04-22 14:10:55 +00:00
Karol Kosek
452072ec95
static_fe: Add microformats2 classes 2020-04-22 16:02:40 +02:00
lain
8b88e2a6e2 Stats: Ignore internal users for user count. 2020-04-22 15:31:37 +02:00
lain
5b39526198 AccountController: Use code 400 for self-follow. 2020-04-22 15:04:26 +02:00
lain
69ecc39038 Merge branch 'fix/1689-fix-migrate-to-db' into 'develop' 
Fix migrate to db config

Closes #1689

See merge request pleroma/pleroma!2394
 2020-04-22 12:41:31 +00:00
lain
c10485db16 StatusController: Ignore nil scheduled_at parameters. 2020-04-22 14:26:19 +02:00
lain
c466e739b6 Merge branch 'docs/debian-packages' into 'develop' 
debian_based_*.md: Use erlang-nox metapackage

See merge request pleroma/pleroma!2268
 2020-04-22 12:10:27 +00:00
lain
568f48435e Apply suggestion to docs/installation/debian_based_en.md 2020-04-22 12:10:20 +00:00
lain
5102468d0f Polls: Persist and show voters' count 2020-04-22 14:06:39 +02:00