fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-01 14:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
10358 commits 26 branches 107 tags 316 MiB
Commit graph

10358 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
lain 923513b641 Federator: Return proper values for jobs 2020-04-22 13:28:52 +02:00
lain f719a5b23a WebPush: Return proper values for jobs. 2020-04-22 13:28:34 +02:00
lain 1d6338f2d3 Litepub: Add ChatMessage. 2020-04-22 12:52:39 +02:00
lain 2e62a63749 ChatMessageValidator: Validation changes 
Don't validate if the recipient is blocking the actor.
 2020-04-22 12:48:52 +02:00
Egor Kislitsyn 11433cd38d
Add OpenAPI schema for FlakeID 2020-04-21 23:54:45 +04:00
Egor Kislitsyn f0238d010a
Improve OpenAPI schema 
- Removes unneeded wrapping in examples
- Adds `:format` attributes
 2020-04-21 23:30:24 +04:00
lain 6c8390fa4d ChatControllerTest: Credo fixes. 2020-04-21 18:32:30 +02:00
lain 66c2eb670b ChatController: Validate parameters. 2020-04-21 18:23:00 +02:00
lain 97ad0c4597 Chats: Add API specs. 2020-04-21 17:51:06 +02:00
Ivan Tashkinov f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring. 2020-04-21 16:29:19 +03:00
lain a185b5455f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-21 14:24:27 +02:00
lain 3c828016d9 Merge branch 'openapi/custom-emojis' into 'develop' 
Add OpenAPI spec for CustomEmojiController

See merge request pleroma/pleroma!2375
 2020-04-21 10:13:50 +00:00
lain 5165287ff4 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-21 12:00:33 +02:00
Ivan Tashkinov bb5d0eafa4 Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users 
# Conflicts:
#	CHANGELOG.md
 2020-04-21 08:20:50 +03:00
rinpatch e57c1b60e4 Merge branch 'accept-deletes' into 'develop' 
Always accept deletions through SimplePolicy, add :reject_deletes group

See merge request pleroma/pleroma!2371
 2020-04-20 18:30:01 +00:00
rinpatch 7e456ac7f6 Merge branch 'router-cleanup' into 'develop' 
Cleanup and DRY the Router

See merge request pleroma/pleroma!2406
 2020-04-20 18:29:03 +00:00
Egor Kislitsyn 364eecc49f
Merge branch 'develop' into global-status-expiration 2020-04-20 20:37:56 +04:00
Alex Gleason bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes 2020-04-20 10:15:40 -05:00
Alex Gleason b54c8813d6
Add :reject_deletes option to SimplePolicy 2020-04-20 10:11:06 -05:00
Egor Kislitsyn ed3974af24 Add OpenAPI spec for AccountController.identity_proofs operation 2020-04-20 18:40:02 +04:00
Egor Kislitsyn 736fead494 Merge branch 'develop' into openapi/account 2020-04-20 18:40:02 +04:00
lain 28165dad3a Merge branch 'cleanup-subscription-controller' into 'develop' 
Cleanup SubscriptionController

See merge request pleroma/pleroma!2393
 2020-04-20 13:01:17 +00:00
lain baeb9fb451 Merge branch 'fix-object_age_policy' into 'develop' 
Fix ObjectAgePolicy

See merge request pleroma/pleroma!2404
 2020-04-20 12:59:16 +00:00
Ilja 8b4de61d64 Fix ObjectAgePolicyTest 
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
 2020-04-20 12:59:16 +00:00
lain 617a9f6208 Merge branch 'mrf-docs-update' into 'develop' 
Expand MRF SimplePolicy docs

See merge request pleroma/pleroma!2370
 2020-04-20 12:57:45 +00:00
Egor Kislitsyn 258d897579 Cleanup and DRY the Router 2020-04-20 16:39:20 +04:00