nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
12718 commits 2 branches 0 tags 272 MiB
Commit graph

63 commits

Author SHA1 Message Date
Haelwenn b122b6ffa3 Merge branch 'features/hashtag-column' into 'develop' 
Insert text representation of hashtags into object["hashtags"]

See merge request pleroma/pleroma!2824
 2020-12-28 10:14:58 +00:00
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"] 
Includes a new mix task: pleroma.database fill_old_hashtags
 2020-12-22 05:15:34 +01:00
lain 9d5ce82221 Test: More async/sync tweaks. 2020-12-21 15:05:56 +01:00
lain 9ba60f70d2 Tests: Make as many tests as possible async. 
In general, tests that match these criteria can be made async:

- Doesn't use real Cachex.
- Doesn't write to the Config / Application Environment.
- Uses Mock. Using Mox is fine.
- Uses the streamer.
 2020-12-21 12:21:40 +01:00
lain b4b68b71fc Tests: Remove unneeded explicit cachex use. 
Only use cachex when we're actually testing it.
 2020-12-18 13:18:17 +01:00
lain 477c6c8e55 Merge branch 'auth-improvements' into 'develop' 
Cookie auth rework / Auth subsystem refactoring and tweaks

Closes pleroma/secteam/pleroma#3

See merge request pleroma/pleroma!3112
 2020-12-09 15:55:45 +00:00
Ivan Tashkinov a010c5b16a Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements 2020-12-06 13:59:35 +03:00
Egor Kislitsyn 35ba48494f
Stream follow updates 2020-12-02 00:18:58 +04:00
rinpatch fc9ebe5073 Search tests: Use on_exit for restoring persistent_term state 
Otherwise if the assertion failed, the code below which resets the
state would never be reached
 2020-12-01 19:45:25 +03:00
Ivan Tashkinov f1b07a2b2b OAuth form user remembering feature. Local MastoFE login / logout fixes. 2020-11-28 21:51:06 +03:00
lain 67b15cc033 Search: Save detected pg version in a persistent term. 2020-11-23 15:29:55 +01:00
lain f9a4cf2097 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch 2020-11-23 15:18:19 +01:00
lain 8532325d65 SearchController Test: Fix test. 2020-11-20 16:29:11 +01:00
feld cd1b4155d5 Merge branch 'oban-jobs-to-simple-tasks' into 'develop' 
Moving some background jobs into simple tasks

Closes #1790

See merge request pleroma/pleroma!3129
 2020-11-19 20:32:32 +00:00
lain 783fa797bb SearchController Test: Fix test 2020-11-19 16:53:26 +01:00
minibikini 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions' 
# Conflicts:
#   CHANGELOG.md
 2020-11-18 20:22:40 +00:00
Mark Felder 415481a4d9 Add test for POST when push is disabled 
Also group together the tests verifiying failure when disabled
 2020-11-17 22:18:22 +00:00
Mark Felder 3eaa5335c9 Revert adding extra alert types here 2020-11-17 21:37:17 +00:00
Mark Felder d9732fb7d3 Fix incorrect test description 2020-11-17 21:34:18 +00:00
Mark Felder ff7a4b6aa2 Test that we ignore invalid subscription alert types separately. 2020-11-17 20:22:25 +00:00
Mark Felder 30f140e570 Ensure all supported push notification subscription alert types are tested 2020-11-17 20:22:25 +00:00
Mark Felder 67a6abd071 Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions 2020-11-17 20:20:00 +00:00
Egor Kislitsyn 79d2d3f609
Merge branch 'develop' into hide-muted-reactions 2020-11-17 18:29:52 +04:00
lain fec1ed802e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope 2020-11-17 15:01:38 +01:00
Mark Felder b1466661eb Use absolute URLs to thumbnail and background in /api/v1/instance 2020-11-16 21:29:15 +00:00
Egor Kislitsyn fb41bd1a85 Hide reactions from muted and blocked users 2020-11-16 22:50:14 +04:00
lain 0d149502fe Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' 
fixes 2034 Make notifs view work for reports

Closes #2034

See merge request pleroma/pleroma!2912
 2020-11-13 13:35:47 +00:00
Ilja 70e4b86250 Make notifs view work for reports 
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
 2020-11-13 13:35:46 +00:00
Mark Felder 2254e5e595 Render blurhashes in Mastodon API 2020-11-11 12:51:13 -06:00
Egor Kislitsyn 0118ccb53c
Add local visibility 2020-11-11 18:54:01 +04:00
Alexander Strizhakov 8d218ebaf5
Moving some background jobs into simple tasks 
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
 2020-11-11 13:39:49 +03:00
lain dd2b3a8da9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes 2020-11-04 16:51:42 +01:00
lain 5db4c823b2 Merge branch 'restrict-domain' into 'develop' 
View a remote server's timeline

See merge request pleroma/pleroma!2713
 2020-11-04 14:54:53 +00:00
lain 329aa19c9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain 2020-11-04 15:05:01 +01:00
lain c7bcbfbc1d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope 2020-11-04 11:47:41 +01:00
lain 1cfc3278c0 Poll View: Always return voters_count. 2020-11-04 10:14:00 +01:00
lain c37118e6f2 Conversations: A few refactors 2020-11-03 13:56:12 +01:00
lain 91f6c32430 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4 2020-11-03 13:45:09 +01:00
Egor Kislitsyn 1a98476f48 Remove unused aliases 2020-10-30 18:42:43 +04:00
Alibek Omarov 1042c30fa5 ConversationViewTest: fix test 2020-10-30 13:59:53 +01:00
Alibek Omarov 0552a08dfd ConversationControllerTest: fix test, fix formatting 2020-10-30 13:59:53 +01:00
Alibek Omarov 9b93eef715 ConversationView: fix last_status.account being empty, fix current user being included in group conversations 2020-10-30 13:59:53 +01:00
Alibek Omarov 630eb0f939 ConversationViewTest: fix test #2 2020-10-30 12:58:51 +01:00
Alibek Omarov 149589c842 ConversationViewTest: fix test 2020-10-30 12:58:51 +01:00
Alibek Omarov 390a12d4c8 ConversationControllerTest: fix test 2020-10-30 12:58:51 +01:00
minibikini 1cc8e94506 Merge branch 'develop' into 'feature/local-only-scope' 
# Conflicts:
#   CHANGELOG.md
 2020-10-30 11:18:55 +00:00
Haelwenn 131f3219e6 Merge branch 'issue/2069' into 'develop' 
[#2069] unread_conversation_count

See merge request pleroma/pleroma!2939
 2020-10-29 23:39:15 +00:00
Egor Kislitsyn fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination 2020-10-29 15:35:42 +04:00
minibikini 1bfd8528bb Merge branch 'develop' into 'feature/local-only-scope' 
# Conflicts:
#   CHANGELOG.md
 2020-10-27 18:59:19 +00:00
Egor Kislitsyn 76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination 2020-10-19 15:40:03 +04:00