limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
15649 commits 27 branches 107 tags 315 MiB
Commit graph

1374 commits

Author SHA1 Message Date
FloatingGhost
68894089e8 Do not fetch anything from blocked instances 2022-12-10 00:09:45 +00:00
FloatingGhost
739ed14f54 Revert "mandate published on notes" 
This reverts commit e49b583147.
 2022-12-09 20:59:26 +00:00
FloatingGhost
e49b583147 mandate published on notes 
fixes #356
 2022-12-09 20:27:54 +00:00
FloatingGhost
f5a315f04c Add URL and code to :not_found errors 
Ref #355
 2022-12-09 20:13:31 +00:00
FloatingGhost
dcf58a3c53 Do not pass transient undo-y activities through MRF 2022-12-09 20:01:38 +00:00
FloatingGhost
9db4c2429f Remove FollowBotPolicy 2022-12-09 19:59:27 +00:00
FloatingGhost
6f83ae27aa extend reject MRF to check if originating instance is blocked 2022-12-09 19:57:29 +00:00
sfr
7c4b415929 static-fe overhaul (#236) 
makes static-fe look more like pleroma-fe, with the stylesheets matching pleroma-dark and pleroma-light based on `prefers-color-scheme`.

- [x] navbar
- [x] about sidebar
- [x] background image
- [x] statuses
  - [x] "reply to" or "edited" tags
- [x] accounts
  - [x] show more / show less
  - [x] posts / with replies / media / followers / following
    - [x] followers/following would require user card snippets
  - [x] admin/bot indicators
- [x] attachments
  - [x] nsfw attachments
- [x] fontawesome icons
- [x] clean up and sort css
- [x] add pleroma-light
- [x] replace hardcoded strings

also i forgot
- [x] repeated headers

how it looks + sneak peek at statuses:
![](https://akkoma.dev/attachments/c0d3a025-6987-4630-8eb9-5f4db6858359)

Co-authored-by: Sol Fisher Romanoff <sol@solfisher.com>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/236
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-12-07 11:20:53 +00:00
floatingghost
4c3971aebd Add changelog entry for hashtag following 2022-12-04 18:35:04 +00:00
floatingghost
db60640c5b Fixing up deletes a bit (#327) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/327
 2022-12-01 15:00:53 +00:00
floatingghost
0cfd5b4e89 Add ability to set a default post expiry (#321) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/321
 2022-11-28 13:34:54 +00:00
FloatingGhost
ee7059c9cf Spin off imports into n oban jobs 2022-11-27 21:45:41 +00:00
floatingghost
98a21debf9 normalise markup by default (#316) 
why was this _not_ default?

honestly i'm surprised pleroma hasn't exploded yet

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/316
 2022-11-26 21:06:20 +00:00
floatingghost
e3085c495c fix tests broken by relay defaults changing (#314) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/314
 2022-11-26 20:45:47 +00:00
floatingghost
2fe1484ed3 http timeout config (#307) 
Ref https://meta.akkoma.dev/t/increase-timeout-on-libretranslate-request-how/156/2

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/307
 2022-11-24 12:27:16 +00:00
ave
1c4ca20ff7 Change follow_operation schema to use type BooleanLike (#301) 
Changes follow_operation schema to use BooleanLike instead of :boolean so that strings like "0" and "1" (used by mastodon.py) can be accepted. Rest of file uses the same. For more info please see https://git.pleroma.social/pleroma/pleroma/-/issues/2999

(I'm also sending this here as I'm not hopeful about upstream not ignoring  it)

Co-authored-by: ave <ave@ave.zone>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/301
Co-authored-by: ave <ave@noreply.akkoma>
Co-committed-by: ave <ave@noreply.akkoma>
 2022-11-24 11:27:01 +00:00
FloatingGhost
89dbc7177b Chores for 2022.11 2022-11-11 16:12:04 +00:00
FloatingGhost
c5b6cb746f add requested_by changelog entry 2022-11-10 03:17:00 +00:00
FloatingGhost
7bbaa8f8e0 automatically trim loading *. prefixes on domain blocks 2022-11-07 22:33:18 +00:00
floatingghost
31ad09010e Fix regex usage in MRF (#254) 
fixes #235
fixes #228

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/254
 2022-11-06 23:50:32 +00:00
FloatingGhost
bbedbaaf5c Changelog 2022-11-06 22:50:11 +00:00
FloatingGhost
1bb8b76311 Fix tests in ldap registration 2022-11-01 14:21:35 +00:00
Ilja
338612d72b Use EXIF data of image to prefill image description 
During attachment upload Pleroma returns a "description" field.

* This MR allows Pleroma to read the EXIF data during upload and return the description to the FE using this field.
    * If a description is already present (e.g. because a previous module added it), it will use that
    * Otherwise it will read from the EXIF data. First it will check -ImageDescription, if that's empty, it will check -iptc:Caption-Abstract
    * If no description is found, it will simply return nil, which is the default value
* When people set up a new instance, they will be asked if they want to read metadata and this module will be activated if so

There was an Exiftool module, which has now been renamed to Exiftool.StripLocation
 2022-10-23 14:46:16 +02:00
floatingghost
f36d14818d Unilateral remove from followers (#232) 
from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3647/

Co-authored-by: marcin mikołajczak <git@mkljczk.pl>
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/232
 2022-10-19 10:01:14 +00:00
floatingghost
66f913355a Docker builds (#231) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/231
 2022-10-16 19:25:54 +00:00
FloatingGhost
60b3c8d17b bump version 2022-10-14 12:49:35 +01:00
FloatingGhost
856c57208b Ensure deletes are handled after everything else 2022-10-11 14:30:08 +01:00
FloatingGhost
cb9b0d3720 optimise notifications query 2022-10-11 11:40:43 +01:00
floatingghost
c6e63aaf6b Backend settings sync (#226) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/226
 2022-10-06 16:22:15 +00:00
floatingghost
b2aa82cee5 Fix false error in meilisearch index (#221) 
the schema changed

https://docs.meilisearch.com/reference/api/documents.html#add-or-update-documents

this wasn't breaking anything, it would just report errors that were actually successes

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/221
 2022-09-20 10:36:21 +00:00
floatingghost
9b2c169cef Merge pull request 'Move remote user interaction changelog entry to correct version' (#219) from norm/akkoma:changelog-remote-user-interaction into develop 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/219
 2022-09-19 17:33:32 +00:00
Norm
561e1f2470 Make backups require its own scope (#218) 
Pulled from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3721.

This makes backups require its own scope (`read:backups`) instead of the `read:accounts` scope.

Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/218
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev>
 2022-09-19 17:31:35 +00:00
Norm
84f8f32ef9 Move remote user interaction changelog entry to correct version 
That feature was added in 2022.09, not 2022.08.
 2022-09-18 03:21:05 +00:00
floatingghost
b8190f19dc 2022.09 stable release chores (#206) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/206
 2022-09-10 14:44:17 +00:00
Norm
a6d85003fe Remote interaction with posts (#198) 
Grabbed from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3587

Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/198
Co-authored-by: Norm <normandy@biribiri.dev>
Co-committed-by: Norm <normandy@biribiri.dev>
 2022-09-08 10:19:22 +00:00
floatingghost
2641dcdd15 Post editing (#202) 
Rebased from #103

Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/202
 2022-09-06 19:24:02 +00:00
floatingghost
df39cab9c1 Automatic status translation (#187) 
Fixes #115

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/187
 2022-08-29 19:42:22 +00:00
FloatingGhost
722e56b308 add changelog entry 2022-08-27 19:12:15 +01:00
FloatingGhost
85137f591f Add ability to obfuscate domains in MRF transparency 2022-08-27 11:57:57 +01:00
floatingghost
e4f2251e0f Add support for setting language in instance metadata (#183) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/183
 2022-08-25 16:11:21 +00:00
FloatingGhost
017b50550b add changelog entry 2022-08-24 15:38:02 +01:00
FloatingGhost
a8f8ecce31 add changelog entry 2022-08-18 04:23:07 +01:00
floatingghost
11ec9daa5b API compatibility with fedibird, frontend config (#163) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/163
 2022-08-17 00:22:59 +00:00
floatingghost
89ffc01c23 only return create objects for ES search (#165) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/165
 2022-08-16 23:24:19 +00:00
floatingghost
61641957cb fix compatibility with meilisearch (#164) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/164
 2022-08-16 22:56:49 +00:00
floatingghost
37a1001b97 add finch outbound proxy support (#158) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/158
 2022-08-14 23:13:49 +00:00
floatingghost
ca000f8301 Merge mrf_simple-reject with quarantine (#137) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/137
 2022-08-02 14:19:24 +00:00
Joel Beckmeyer
e26388a01c Support reaching user@sub.domain.tld at user@domain.tld (#134) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/134
Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us>
Co-committed-by: Joel Beckmeyer <joel@beckmeyer.us>
 2022-08-02 13:54:22 +00:00
floatingghost
2c8f57db98 rename-flavours (#123) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/123
 2022-07-28 10:36:51 +00:00
floatingghost
645f0390bc Prepare for ubuntu22 murdering openssl (#120) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/120
 2022-07-27 21:48:13 +00:00
floatingghost
90c4785b89 remove public post quarantine exception (#114) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/114
 2022-07-26 11:09:13 +00:00
floatingghost
1419eee5df Quote posting (#113) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/113
 2022-07-25 16:30:06 +00:00
floatingghost
c4e9c4bc95 extend custom runtime system (#108) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/108
 2022-07-24 16:42:43 +00:00
floatingghost
0c542e58aa Remove instrumentors (#98) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/98
 2022-07-21 11:32:17 +00:00
FloatingGhost
0f132b802d purge chat and shout endpoints 2022-07-21 11:29:28 +01:00
floatingghost
07ea4d73e1 update mastofe paths (#95) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/95
 2022-07-20 20:13:50 +00:00
floatingghost
729f45ccd2 purge ldap authenticator (#92) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/92
 2022-07-20 12:49:13 +00:00
floatingghost
dc9f66749c remove all endpoints marked as deprecated (#91) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/91
 2022-07-20 12:00:58 +00:00
FloatingGhost
a2b384d572 document scrobbling purge 2022-07-19 17:22:02 +01:00
FloatingGhost
99ced95d3b bump version 2022-07-15 16:31:28 +01:00
floatingghost
d2a185c013 Documentation updates for stable release (#73) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/73
 2022-07-15 12:27:16 +00:00
floatingghost
a59fe8ba2d Add support for musl11 build (#71) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/71
 2022-07-14 10:59:21 +00:00
floatingghost
82fa766ed7 Remove precompiled javascript (#55) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/55
 2022-07-08 13:03:18 +00:00
floatingghost
bc6bfe383f Add configurable theme color (#53) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/53
 2022-07-06 20:00:43 +00:00
floatingghost
a9c82b62f2 Fixes for elasticsearch 8 (#52) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/52
 2022-07-06 18:57:00 +00:00
sfr
058bf96798 implement Move activities (#45) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/45
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
 2022-07-04 16:29:39 +00:00
Ilja
661d0ba481 Also use actor_type to determine if an account is a bot in antiFollowbotPolicy 2022-06-29 20:47:44 +01:00
Tusooa Zhu
6e8123a330 Add changelog 2022-06-29 20:47:09 +01:00
FloatingGhost
064c36274c Purge gopher frontend 2022-06-27 17:31:16 +01:00
floatingghost
e6cd61619f Purge SSH frontend (#23) 
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/23
 2022-06-27 11:32:06 +00:00
FloatingGhost
883036b245 update changelog 2022-06-22 17:10:55 +01:00
FloatingGhost
502382da45 cherry-pick security from upstream 2022-06-22 16:25:05 +01:00
FloatingGhost
d15d55eda2 update changelog 2022-06-21 08:35:05 +01:00
FloatingGhost
0f5bea2465 Add emoji_url to notifications to allow rendering 
Ref #5
 2022-06-12 13:35:14 +01:00
FloatingGhost
0d012ebea1 Revert "Merge branch 'remove/mastofe' into 'develop'" 
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
 2022-01-08 21:44:37 +00:00
Alex Gleason
5f87472cdf
Update CHANGELOG.md 2021-12-28 15:14:09 -06:00
Alex Gleason
326575d5b7
Merge remote-tracking branch 'origin/develop' into finch 2021-12-27 11:31:15 -06:00
Alibek Omarov
cd1041c3a4 API: optionally restrict moderators from accessing sensitive data 2021-12-27 02:27:48 +03:00
Lain Soykaf
7ed2258979 Update changelog 2021-12-26 17:00:09 +01:00
Alex Gleason
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes 2021-12-25 19:57:53 -06:00
Alex Gleason
d9746ae4cb Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop' 
Handle Reject for already-accepted Follows properly

Closes #2766 and #2802

See merge request pleroma/pleroma!3568
 2021-12-23 16:00:16 +00:00
Alex Gleason
3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators 2021-12-19 12:55:36 -06:00
Tusooa Zhu
538d5ac210
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568 2021-12-17 16:47:48 -05:00
Alibek Omarov
efc28812b8 Add changelog entry 2021-11-17 00:39:10 +01:00
lain
e2772d6bf1 Merge branch 'block-behavior' into 'develop' 
Configurable block visibility, fixes #2123

Closes #2123

See merge request pleroma/pleroma!3242
 2021-11-15 14:27:59 +00:00
lain
6e3df11693 Merge branch 'instance-deletion' into 'develop' 
AdminAPI: endpoint to delete all content from a remote instance

See merge request pleroma/pleroma!3483
 2021-11-15 14:24:13 +00:00
lain
6aff3d3204 Merge branch 'fix-object-deletion-timeout' into 'develop' 
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted

Closes #2704

See merge request pleroma/pleroma!3479
 2021-11-15 13:21:42 +00:00
Haelwenn
92a8ff59aa Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop' 
Allow users to remove their emails if instance does not need email to register

See merge request pleroma/pleroma!3522
 2021-10-06 05:44:44 +00:00
Haelwenn
6b3842cf50 Merge branch 'remove/mastofe' into 'develop' 
Remove MastoFE from Pleroma, fixes #2625

Closes #2625

See merge request pleroma/pleroma!3392
 2021-09-07 16:41:53 +00:00
Tusooa Zhu
198250dcef
Allow users to remove their emails if instance does not need email to register 2021-09-05 21:27:02 -04:00
Haelwenn (lanodan) Monnier
28a17c2dc7
Merge branch 'release/2.4.1' into chores/2.4.1-develop 2021-08-28 18:49:04 +02:00
Haelwenn (lanodan) Monnier
7372609c5b
Release 2.4.1 2021-08-28 18:32:21 +02:00
someone
cc4f20b130
mix pleroma.database set_text_search_config now runs concurrently and infinitely 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514
 2021-08-28 18:29:43 +02:00
Ilja
20084329ea
Selecting MRF policies didn't work as intended any more 
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
    * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
    * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509
 2021-08-28 18:27:58 +02:00
Tusooa Zhu
bd0eb1c675
Make activity search properly use GIN indexes 
The original approach to search in GIN indexes is to use
`to_tsvector(text)` in the WHERE clause of the query. According to
postgres docs [pdoc], this method does not make use of the index,
while `to_tsvector(config, text)` does. This commit changed the
query to use the two-argument `to_tsvector()`.

[pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html

To obtain the search config in use, we make a query to the db first.
The `::regconfig::oid` hack is needed because Postgrex does not support
regconfig type directly [postgrexbug]. I use the conversion from and to
`oid` instead of `text` because I tested in the actual DB and querying
using the conversion via `text` is slow just as the one-argument
`to_tsvector()` variant.

[postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3519

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2758
 2021-08-28 18:26:04 +02:00
Ilja
53b0dd4ecc
List available frontends also when no static/frontends folder is present yet 
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510
 2021-08-28 18:23:49 +02:00
Sam Therapy
09c42ce13e
Add Admin-FE menu for StealEmojiPolicy 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512
 2021-08-28 18:21:59 +02:00
Tusooa Zhu
a80cb58ac1
Add changelog for !3519 2021-08-27 22:31:22 -04:00
Alex Gleason
01175ef498
Streamer: fix crash in MastodonAPI.StatusView 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
 2021-08-13 17:58:03 +02:00
Haelwenn (lanodan) Monnier
27e1e4c742
Activity.Search: fallback on status resolution on DB Timeout 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3507
 2021-08-13 17:57:50 +02:00
Alex Gleason
e117551169
AdminAPI: hotfix for nil report objects 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504
 2021-08-13 17:57:39 +02:00
Haelwenn (lanodan) Monnier
bb2d5879cc
maybe_notify_subscribers: Don't create notifications from ingested replies 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505
 2021-08-13 17:57:19 +02:00
Haelwenn (lanodan) Monnier
0e2aebd036
TwitterAPI: Make change_email require body params instead of query 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
 2021-08-13 17:57:11 +02:00
Haelwenn (lanodan) Monnier
3961422f85
TwitterAPI: Make change_password require body params instead of query 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
 2021-08-13 17:56:59 +02:00
Haelwenn (lanodan) Monnier
8baaa36a16
ObjectAgePolicy: Fix pattern matching on published 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500
 2021-08-13 17:56:46 +02:00
kPherox
34606d609d
fix: stream out Create Activity 
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499
 2021-08-13 17:54:51 +02:00
rinpatch
7afabe1cc6 Merge branch 'bugfix/status-search-fallback' into 'develop' 
Activity.Search: resolve status on DB Timeout

Closes #2566

See merge request pleroma/pleroma!3507
 2021-08-13 12:09:39 +00:00
Haelwenn (lanodan) Monnier
6455b967ec
Activity.Search: fallback on status resolution on DB Timeout 2021-08-12 10:35:32 +02:00
Haelwenn
3ca39ccf69 Merge branch 'bugfix/subscriptions-replies' into 'develop' 
maybe_notify_subscribers: Normalize Object to check inReplyTo presence

Closes #2732

See merge request pleroma/pleroma!3505
 2021-08-11 18:50:39 +00:00
Haelwenn (lanodan) Monnier
436fac3bac
maybe_notify_subscribers: Don't create notifications from ingested messages 2021-08-11 20:49:38 +02:00
Haelwenn
901204df22 Merge branch 'poll-notification' into 'develop' 
MastodonAPI: Support poll notification

See merge request pleroma/pleroma!3484
 2021-08-09 10:02:37 +00:00
Haelwenn
6384d78035 Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop' 
Simple policy reasons for instance specific policies

See merge request pleroma/pleroma!3314
 2021-08-09 09:37:59 +00:00
Sean King
1841bd8383 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe 2021-08-06 08:08:20 -06:00
matildepark
469405b7b2
CHANGELOG.md: Fix instances of 2020 being actually 2021 2021-08-06 08:42:27 +02:00
Ilja
cd706c0335
improve changelog entry 2021-08-06 07:59:54 +02:00
Ilja
9418424048
Add transparency_exclusions also to the breaking changes 2021-08-06 07:59:53 +02:00
Ilja
506bf16363
Change docs 
* ./configuration/mrf.md
  * Change example
* ./configuration/cheatsheet.md
  * Change descriptions to include that a reason is given
* CHANGELOG.md
  * Add as breaking change
 2021-08-06 07:59:53 +02:00
Alex Gleason
e311c60923
CHANGELOG: moderator abilities 2021-08-05 11:11:27 -05:00
Haelwenn (lanodan) Monnier
79e993cae5
Release 2.4.0 2021-08-01 08:26:39 +02:00
Alex Gleason
3d8ce61fe5
CHANGELOG: fixed JSON error rendering 2021-07-27 08:30:38 -05:00
Alex Gleason
85d71d4f1d
CHANGELOG: Support poll notification type 2021-07-18 11:49:25 -05:00
Alex Gleason
c4efe0d2d6
CHANGELOG: instance deletion 2021-07-17 15:05:20 -05:00
feld
3f58213646 Merge branch 'admin-api-users-sort' into 'develop' 
AdminAPI: sort new users at the top

Closes #2709

See merge request pleroma/pleroma!3481
 2021-07-14 14:39:14 +00:00
Alex Gleason
117b3edf54
CHANGELOG: AdminAPI return date with users 2021-07-14 09:03:44 -05:00
Alex Gleason
5681a007d7
CHANGELOG: AdminAPI users sort 2021-07-13 22:48:32 -05:00
Alex Gleason
65514484cc
CHANGELOG: fixed user deletion database timeout 2021-07-12 16:59:54 -05:00
Haelwenn (lanodan) Monnier
6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline 2021-07-12 06:49:41 +02:00
Sean King
5d279a22b1 Merge develop branch upstream 2021-07-10 11:04:16 -06:00
Mark Felder
64d009693e Update Linkify to fix crash on posts with a URL we failed to parse correctly 2021-07-08 12:33:17 -05:00
Alex Gleason
310ef6b70d
Deletions: change User.purge/1 to defp, add CHANGELOG entry 2021-06-30 12:25:20 -05:00
Mark Felder
d12e62c0b6 Add new Twittercard/OGP changes 2021-06-09 11:56:54 -05:00
Mark Felder
8443f82247 Update scope of AnalyzeMetadata features 2021-06-08 12:56:03 -05:00
feld
9a357d63f0 Update CHANGELOG.md 2021-06-07 20:07:59 +00:00
feld
10abbf13ba Update CHANGELOG.md 2021-06-07 20:07:27 +00:00
feld
84f42b92f0 Merge branch 'develop' into 'fix/prune-hashtags' 
# Conflicts:
#   CHANGELOG.md
 2021-06-07 20:06:36 +00:00
feld
4ca380490f Update CHANGELOG.md 2021-06-07 20:05:18 +00:00
feld
c31338abe6 Update CHANGELOG.md 2021-06-07 20:04:27 +00:00
Mark Felder
eb150e7d88 Document OTP 24 support so we remember to add it to the official release notes / announcement 2021-06-04 15:50:10 -05:00
Sean King
dc4814f0cd
Fix merge conflicts with upstream 2021-06-04 14:42:44 -06:00
Haelwenn
0c56f9de0d Merge branch 'tests/openapi-everywhere' into 'develop' 
Put OpenAPI ~everywhere in tests

See merge request pleroma/pleroma!3324
 2021-06-04 18:53:09 +00:00
Mark Felder
d6432a65da Move shout configuration from :instance, update docs and changelog 2021-06-01 11:49:46 -05:00
Mark Felder
ff00b354fa Rename the non-federating Chat feature to Shout 2021-06-01 11:49:14 -05:00
feld
359ded086c Merge branch 'simplepolicy-announce-leak' into 'develop' 
SimplePolicy: filter nested objects, fixes #2582

Closes #2582

See merge request pleroma/pleroma!3376
 2021-05-28 19:05:13 +00:00
Mark Felder
cd4352a86f Missing entry for pinned posts federation from MR !3312 2021-05-27 12:20:21 -05:00
Mark Felder
05d678c070 Expose user email address to user/owner; not publicly. 2021-05-20 12:50:43 -05:00
Mark Felder
2d7f6ce6fb Clarify AttachmentMetadata changes 2021-05-18 16:46:51 -05:00
Mark Felder
c64cbee26c Fixed checking for Upload Filter required commands 2021-05-18 16:28:21 -05:00
Mark Felder
9b6b5ac196 Rename upload filter to AnalyzeMetadata 2021-05-18 15:33:33 -05:00
Alex Gleason
5a57b025c7
Changelog: attachment meta 2021-05-12 20:15:33 -05:00
Alex Gleason
cea44b6b3e
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak 2021-05-07 12:40:45 -05:00