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

4681 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Chvanikov 64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
Roman Chvanikov 73407f4eea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-19 23:27:13 +07:00
Roman Chvanikov bc7862106d Fix tests 2019-04-19 23:26:41 +07:00
Roman Chvanikov 8add119444 Add User.list_inactive_users_query/1 2019-04-19 22:19:00 +07:00
Roman Chvanikov aeafa0b2ef Add Notification.for_user_since/2 2019-04-19 22:16:17 +07:00
lambda cc93775ebf Merge branch 'feature/805-server-rendered-rel-me-links' into 'develop' 
Feature/805 server rendered rel me links

Closes #805

See merge request pleroma/pleroma!1063
 2019-04-19 07:50:21 +00:00
Alexander Strizhakov ada384207b typo fix 
docs for RelMe provider
 2019-04-19 07:50:21 +00:00
lambda 218d96a26b Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' 
OAuth consumer params handling refactoring

See merge request pleroma/pleroma!1047
 2019-04-19 07:49:26 +00:00
Haelwenn eba3db0966 Merge branch 'bugfix/filter-boosted-blocks' into 'develop' 
activitypub: fix filtering of boosts from blocked users

See merge request pleroma/pleroma!1074
 2019-04-18 18:29:57 +00:00
kaniini ad3270c241 Merge branch 'fix/mastoapi-search-unauth' into 'develop' 
Do not require authentication for user search in MastoAPI

See merge request pleroma/pleroma!1075
 2019-04-18 18:21:28 +00:00
Mark Felder 1aa4994f6d Do not require authentication for user search in MastoAPI 2019-04-18 12:44:25 -05:00
William Pitcock 36f78c6dcd activitypub: fix filtering of boosts from blocked users 2019-04-17 22:27:59 +00:00
kaniini 8c65b69d4a Merge branch 'feature/improve-block-filtering' into 'develop' 
activitypub: properly filter out transitive activities concerning blocked users

See merge request pleroma/pleroma!1072
 2019-04-17 20:12:44 +00:00
William Pitcock 2140e164d7 activitypub: properly filter out transitive activities concerning blocked users 2019-04-17 20:05:09 +00:00
Roman Chvanikov 2f0203a4a1 Resolve conflicts 2019-04-17 16:59:05 +07:00
Roman Chvanikov 87013f8438 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-17 16:58:08 +07:00
rinpatch 8de17c480e Merge branch '788-notify-email-changelog' into 'develop' 
changelog info

See merge request pleroma/pleroma!1070
 2019-04-17 09:05:27 +00:00
Ivan Tashkinov 128aae05f3 [#923] Minor semantic adjustment. 2019-04-17 11:33:21 +03:00
Alex S 2198e54d28 changes 2019-04-17 14:27:51 +07:00
Alex S 6ac948c5b8 changelog info 2019-04-17 14:12:45 +07:00
kaniini 73df3046e0 Merge branch 'feature/788-separate-email-addresses' into 'develop' 
Feature/788 separate email addresses

Closes #788

See merge request pleroma/pleroma!1040
 2019-04-16 18:44:07 +00:00
kaniini 02a53d00c9 Merge branch 'fix/remote-follow-auth' into 'develop' 
Fix: remote follows should not ask user to log-in again for authorization

See merge request pleroma/pleroma!1060
 2019-04-16 18:40:56 +00:00
Haelwenn cde7711b12 Merge branch 'bugfix/relax-spam-protection' into 'develop' 
activitypub: allow indirect messages from users being followed at a personal inbox

See merge request pleroma/pleroma!1069
 2019-04-16 18:38:11 +00:00
kaniini 6ddaeb14e2 Merge branch 'patch-2' into 'develop' 
Add supervisord configuration

See merge request pleroma/pleroma!1066
 2019-04-16 18:35:58 +00:00
kaniini 5f31e7ec6b Merge branch 'fix/follow-imports' into 'develop' 
Handle new-style mastodon follow lists

Closes #814

See merge request pleroma/pleroma!1067
 2019-04-16 18:35:38 +00:00
Normandy d4a749cfb2 Handle new-style mastodon follow lists 
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
 2019-04-16 18:35:38 +00:00
William Pitcock 750b369d04 activitypub: allow indirect messages from users being followed at a personal inbox 2019-04-16 18:31:12 +00:00
Hakurei Reimu 2472efb4e9
Add extra_cookie_attrs to changelog 2019-04-16 22:24:24 +08:00
Hakurei Reimu 6e26ac10a3 make Pleroma.Endpoint use extra_cookie_attrs in config 2019-04-16 22:20:56 +08:00
Hakurei Reimu 10096bbf2b add extra_cookie_attrs option to config 
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
 2019-04-16 22:20:56 +08:00
rinpatch 0d4afdc6e6 Merge branch 'deps/bump-exdoc' into 'develop' 
Bump ex_doc to 20.2

See merge request pleroma/pleroma!1068
 2019-04-16 11:59:38 +00:00
rinpatch 37da03499e Bump ex_doc 2019-04-16 14:53:17 +03:00
Dominik V. Salonen 498c96d458 Add supervisord configuration 2019-04-16 07:14:44 +00:00
rinpatch 776f1e3bdf Merge branch 'remove-footguns' into 'develop' 
Remove ambiguous documentation regarding emoji and config.exs

See merge request pleroma/pleroma!1064
 2019-04-15 13:57:38 +00:00
lain 088f378408 Custom Emoji docs: Make it clear that config.exs is not for lewd. 2019-04-15 15:51:17 +02:00
lain 4fecd6f9a7 Config.exs: Add big warning so that nobody ever edits it. 2019-04-15 15:45:15 +02:00
lambda 56956de6fa Merge branch 'fix/status-reblogged' into 'develop' 
Assign reblogged in the Mastodon reblog status view

Closes #812

See merge request pleroma/pleroma!1057
 2019-04-15 10:26:23 +00:00
lambda f358295cbe Merge branch 'unfollow-oneself' into 'develop' 
Consistent response for self follow/unfollow

Closes #819

See merge request pleroma/pleroma!1061
 2019-04-15 10:24:37 +00:00
lambda f896699357 Merge branch 'refactor/remove-inReplyToStatusId' into 'develop' 
Remove inReplyToStatusId

See merge request pleroma/pleroma!1062
 2019-04-15 10:23:06 +00:00
eugenijm 27d78dc526 Use User.get_cached_by* 2019-04-15 12:37:49 +03:00
rinpatch fd2e31af86 oops 2019-04-15 11:59:01 +03:00
rinpatch 5d73dca064 Remove inReplyToStatusId 2019-04-15 11:50:36 +03:00
eugenijm 507e7821e3 Handle follow/unfollow directed to themselves 2019-04-15 10:21:18 +03:00
rinpatch 8c6d5a6b4d Merge branch 'bugfix/registration-email-pattern' into 'develop' 
fix pattern match on user registration

See merge request pleroma/pleroma!1058
 2019-04-14 17:54:32 +00:00
Roman Chvanikov dc21181f65 Update updated_at field on notification read 2019-04-14 22:29:05 +07:00
Sadposter e513504e88 Revert "Assert on the success of enqueue before returning" 
This reverts commit 16d8c8b33b.
Because it breaks everything
 2019-04-14 16:12:54 +01:00
Sadposter 16d8c8b33b Assert on the success of enqueue before returning 2019-04-14 16:05:26 +01:00
Sadposter 5e45557751 Always return {atom, _} from try_send_confirmation 2019-04-14 16:01:48 +01:00
Sadposter ec42b639a3 fix pattern match on user registration 
deliver_async will return a single atom
 2019-04-14 15:46:54 +01:00
eugenijm 679a8ef629 Assign reblogged in the Mastodon reblog status view 2019-04-14 11:35:15 +03:00