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

10133 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain 2c6ebe709a Credo fixes 2020-06-02 15:14:52 +02:00
lain 6cd2fa2a4c Migrations: Add a migration to backfill notification types. 2020-06-02 15:13:19 +02:00
lain 38dce485c4 Notification: Add function to backfill notification types 2020-06-02 14:50:10 +02:00
lain 904295d53b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-02 14:28:01 +02:00
lain 37542a9dfa Activity: Remove notifications-related functions. 2020-06-02 14:22:16 +02:00
lain 127ccc4e1c NotificationController: Don't return chat_mentions by default. 2020-06-02 14:05:53 +02:00
lain cd2abcc0e3 Merge branch 'fix/invisible-repeats' into 'develop' 
Do not include activities of invisible users unless explicitly requested

Closes #1833

See merge request pleroma/pleroma!2620
 2020-06-02 11:32:03 +00:00
lain 805ab86933 Notifications: Make notifications save their type. 2020-06-02 13:24:34 +02:00
rinpatch 165a4b2a69 Do not include activities of invisible users unless explicitly requested 
Closes #1833
 2020-06-02 13:34:12 +03:00
lain 2db7a0d6b6 Merge branch 'weblate-pleroma-pleroma' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma!2623
 2020-06-02 09:15:56 +00:00
Fristi 81fb45a71b Translated using Weblate (Dutch) 
Currently translated at 29.2% (31 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/
 2020-06-02 08:49:35 +00:00
lain d111eae798 Merge branch 'feature/status-by-id-account-view' into 'develop' 
another view for account in admin-fe status_show

Closes #1783

See merge request pleroma/pleroma!2543
 2020-06-02 08:49:24 +00:00
lain 8e1db6a835 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-02 10:43:13 +02:00
Alexander Strizhakov 19f468c5bc
replies filtering for blocked domains 2020-06-02 09:00:10 +03:00
rinpatch 6fb900a496 Merge branch 'user-updates' into 'develop' 
AccountController: Federate user account changes.

Closes pleroma-support#33 and #1801

See merge request pleroma/pleroma!2617
 2020-06-01 20:48:11 +00:00
rinpatch d67b8a96c7 Merge branch 'only-creates-in-public-tl' into 'develop' 
TimelineController: Only return `Create` in public timelines.

Closes #1833 and #1821

See merge request pleroma/pleroma!2618
 2020-06-01 20:45:59 +00:00
Alexander Strizhakov 7e6ec778d9
exclude replies on blocked domains 2020-06-01 21:17:32 +03:00
Egor Kislitsyn 6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts 2020-06-01 17:38:57 +04:00
lain fa37bfff99 Merge branch 'default-to-hackney-again' into 'develop' 
Config: Default to Hackney again

See merge request pleroma/pleroma!2619
 2020-06-01 13:24:03 +00:00
lain af9090238e CommonAPI: Newlines -> br for chat messages. 2020-06-01 15:14:22 +02:00
lain ac31f687c0 Config: Default to Hackney again 
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
 2020-06-01 13:35:39 +02:00
lain 8ff3425828 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-01 13:34:13 +02:00
lain d4d4b92f75 TimelineController: Only return Create in public timelines. 2020-06-01 13:17:56 +02:00
lain 9460983032 AccountController: Federate user account changes. 
Hotfixy commit, will be moved to the pipeline.
 2020-06-01 13:03:22 +02:00
Haelwenn e96765df6b Merge branch 'chore/bump-hackney' into 'develop' 
mix.lock: update hackney to 1.16.0

Closes #1612

See merge request pleroma/pleroma!2614
 2020-05-30 15:51:19 +00:00
lain beeeed5b58 Merge branch 'test/fix-config-setting-in-user-test' into 'develop' 
Fix config setting to not affect other tests

See merge request pleroma/pleroma!2615
 2020-05-30 14:03:43 +00:00
Roman Chvanikov b973d0b2f0 Fix config setting to not affect other tests 2020-05-30 16:47:09 +03:00
rinpatch 0cb7b0ea84 hackney adapter helper: support tlsv1.3 and remove custom opts 
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
 2020-05-30 15:36:55 +03:00
lain 6ff079ca9f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-30 12:31:12 +02:00
lain 8bdf18d7c1 CommonAPI: Linkify chat messages. 2020-05-30 12:30:31 +02:00
lain 2c9465cc51 SafeText: Let through basic html. 2020-05-30 12:17:18 +02:00
lain b004c427a0 Merge branch 'conversation-pagination' into 'develop' 
Conversation pagination

See merge request pleroma/pleroma!2601
 2020-05-30 10:02:37 +00:00
Steven Fuchs 6d4b80822b Conversation pagination 2020-05-30 10:02:37 +00:00
Ivan Tashkinov 24f40b8a26 [#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test. 2020-05-30 10:29:08 +03:00
Ivan Tashkinov 78c80a261a Merge remote-tracking branch 'remotes/origin/develop' into fix/1794-hashtag-search-results 2020-05-30 08:51:38 +03:00
rinpatch d23b3701d8 Merge branch 'bugfix/csp-unproxied' into 'develop' 
http_security_plug.ex: Fix non-proxied media

See merge request pleroma/pleroma!2610
 2020-05-29 21:23:49 +00:00
rinpatch 32ba2b7f9f Merge branch 'media-docs' into 'develop' 
Docs: Attachement limitations in MastoAPI differences

See merge request pleroma/pleroma!2607
 2020-05-29 21:20:36 +00:00
rinpatch d2a1975e56 mix.lock: update hackney to 1.16.0 
Closes #1612
 2020-05-30 00:18:17 +03:00
rinpatch 109af93227 Apply suggestion to lib/pleroma/plugs/http_security_plug.ex 2020-05-29 21:15:07 +00:00
lain f361264e1a Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop' 
fix unused var warning in streamer test

See merge request pleroma/pleroma!2612
 2020-05-29 20:31:07 +00:00
Roman Chvanikov 0a83af330b fix unused var warning 2020-05-29 23:05:03 +03:00
rinpatch 660d49227b Merge branch 'connect-src' into 'develop' 
Add blob: to connect-src CSP, fixes #1827

Closes #1827

See merge request pleroma/pleroma!2608
 2020-05-29 19:26:54 +00:00
Ivan Tashkinov c181e555db [#1794] Improvements to hashtags extraction from search query. 2020-05-29 22:03:14 +03:00
Alex Gleason d38f28870e
Add blob: to connect-src CSP 2020-05-29 11:08:17 -05:00
lain 219d2b3146 Merge branch 'fix-streaming' into 'develop' 
Fix argument error in streamer

See merge request pleroma/pleroma!2609
 2020-05-29 15:42:43 +00:00
feld 81db758e8e Merge branch 'mix/database-vacuum-options' into 'develop' 
Database vacuum mix task

See merge request pleroma/pleroma!2599
 2020-05-29 15:33:35 +00:00
kPherox 9ca978494f
Add test for stream boosts of mastodon user 2020-05-30 00:31:20 +09:00
kPherox de0e262839
Fix argument error in streamer 
`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.
 2020-05-30 00:31:18 +09:00
Haelwenn (lanodan) Monnier da1e31fae3
http_security_plug.ex: Fix non-proxied media 2020-05-29 17:20:09 +02:00
Mark Felder 1b586ff3ae Document new database vacuum tasks 2020-05-29 10:17:06 -05:00