fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-24 07:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9187 commits 26 branches 107 tags 316 MiB
Commit graph

9187 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain 139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-20 12:37:17 +02:00
lain 970b74383b Credo fixes. 2020-04-20 12:29:19 +02:00
lain 5b6818b3e5 CommonAPI: Obey local limit for chat messages. 2020-04-20 12:08:47 +02:00
lain ce23673ca1 ChatMessageValidator: Don't validate messages that are too long. 2020-04-20 11:45:11 +02:00
rinpatch 918a8094fc Merge branch '1559-follow-request-notifications' into 'develop' 
[#1559] Support for "follow_request" notifications

Closes #1559

See merge request pleroma/pleroma!2354
 2020-04-19 21:45:20 +00:00
rinpatch 389fb36fb5 Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop' 
mix.exs: Do not bail out when .git doesn’t exists

See merge request pleroma/pleroma!2405
 2020-04-19 21:44:25 +00:00
Haelwenn (lanodan) Monnier c906ffc51a
mix.exs: Do not bail out when .git doesn’t exists 2020-04-19 20:24:32 +02:00
Haelwenn 79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' 
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403
 2020-04-18 06:59:23 +00:00
Haelwenn d698ecef9b Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs 2020-04-17 22:48:40 +00:00
Haelwenn 24f760c2f7 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex 2020-04-17 22:48:37 +00:00
Haelwenn (lanodan) Monnier eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo 2020-04-17 23:57:22 +02:00
rinpatch f1843db41d Merge branch '1682-basic-auth-permissions-fix' into 'develop' 
[#1682] Fixed Basic Auth permissions issue

Closes #1682

See merge request pleroma/pleroma!2401
 2020-04-17 20:47:43 +00:00
Haelwenn e303d80dcb Merge branch 'update/pleroma-fe-20200417' into 'develop' 
pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4

See merge request pleroma/pleroma!2402
 2020-04-17 19:21:34 +00:00
Mark Felder 24e0db6310 pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4 2020-04-17 13:22:25 -05:00
Ivan Tashkinov 66f55106bd [#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality. 2020-04-17 21:21:10 +03:00
lain c845820911 Notifications: Create a chat notification. 2020-04-17 16:55:01 +02:00
rinpatch e0d7847bc5 Merge branch 'sideeffects-test' into 'develop' 
SideEffects: Test for notification creation.

See merge request pleroma/pleroma!2399
 2020-04-17 14:03:04 +00:00
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-17 15:51:24 +02:00
lain 26d9c83316 SideEffects: Test for notification creation. 2020-04-17 15:50:15 +02:00
rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' 
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering

Closes #1695

See merge request pleroma/pleroma!2398
 2020-04-17 13:40:25 +00:00
lain 372614cfd3 ChatView: Add a mastodon api representation of the recipient. 2020-04-17 15:37:54 +02:00
Ivan Tashkinov 6e6f95c6ae Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications 
# Conflicts:
#	CHANGELOG.md
 2020-04-17 16:23:58 +03:00
Haelwenn (lanodan) Monnier 46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering 2020-04-17 14:32:15 +02:00
lain d45ae64858 ChatController: Use OAuth scopes. 2020-04-17 13:04:46 +02:00
Haelwenn 09bd1d12c1 Merge branch 'sync-changelog' into 'develop' 
Move changelog entries to unreleased section

See merge request pleroma/pleroma!2397
 2020-04-17 09:39:29 +00:00
Alexander Strizhakov 4d22b100b7
move changelogs entries to unreleased section 2020-04-17 12:33:11 +03:00
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop' 
Creating trusted app from adminFE & mix task

Closes #1584

See merge request pleroma/pleroma!2252
 2020-04-17 09:19:35 +00:00
Haelwenn d8142ee6fe Merge branch 'fix/1694-transfer-task-fix' into 'develop' 
Fix for logger configuration

Closes #1694

See merge request pleroma/pleroma!2396
 2020-04-17 09:02:10 +00:00
Haelwenn 9c76d70a47 Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' 
Added need_reboot endpoint to admin api

Closes #1677

See merge request pleroma/pleroma!2373
 2020-04-17 08:55:46 +00:00
Alexander Strizhakov 304ea09f4c
fix for logger configuration 2020-04-17 08:42:48 +03:00
rinpatch badd888ccb Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' 
Enforcement of OAuth scopes check for authenticated API endpoints

See merge request pleroma/pleroma!2349
 2020-04-16 21:58:57 +00:00
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop' 
Fix for use of `published` field from different entities

Closes #1691

See merge request pleroma/pleroma!2395
 2020-04-16 18:38:58 +00:00
rinpatch 0ddee13c83 Merge branch 'features/remove-user-source_data' into 'develop' 
User: remove source_data

Closes #820

See merge request pleroma/pleroma!2339
 2020-04-16 18:37:56 +00:00
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data 2020-04-16 21:28:52 +03:00
lain f8c3ae7a62 ChatController: Handle pagination. 2020-04-16 18:43:31 +02:00
lain e983f70884 ChatMessagesHandling: Strip HTML of incoming messages. 2020-04-16 17:50:24 +02:00
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities 2020-04-16 18:05:36 +03:00
rinpatch 252528a4b9 Merge branch 'refactor/remove-upgrade-changeset' into 'develop' 
Remove User.upgrade_changeset in favor of remote_user_creation

See merge request pleroma/pleroma!2368
 2020-04-16 14:59:11 +00:00
rinpatch 77ee64b993 user: remove blank? 2020-04-16 17:54:57 +03:00
lain 41fdcb7282 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-16 15:28:08 +02:00
lain ca598e9c27 AccountView: Return user ap_id. 2020-04-16 15:27:35 +02:00
lain e2ced04917 ChatMessages: Better validation. 2020-04-16 15:21:47 +02:00
Alexander Strizhakov 72ef6cc4f2
added need_reboot endpoint to admin api 2020-04-16 16:03:26 +03:00
lain 3d4eca5dd4 CommonAPI: Escape HTML for chat messages. 2020-04-16 12:56:29 +02:00
lain 2b57f73b77 Merge branch 'small-fix-rewrite_policy' into 'develop' 
small fix in the rewrite_policy example

See merge request pleroma/pleroma!2391
 2020-04-16 09:38:24 +00:00
Ivan Tashkinov bde1189c34 [#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests. 2020-04-15 21:19:16 +03:00
Ilja aa0a4a1e78 small fix in the rewrite_policy example 2020-04-15 19:03:27 +02:00
lain 6ace22b56a Chat: Add views, don't return them in timeline queries. 2020-04-15 18:23:16 +02:00
Ivan Tashkinov bedf92e064 Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement 2020-04-15 19:20:34 +03:00
Haelwenn b1c1d2e5e1 Merge branch 'fix/1659-rate-limiter' into 'develop' 
remote_ip plug adds remote_ip_found flag

Closes #1659

See merge request pleroma/pleroma!2390
 2020-04-15 15:26:55 +00:00