73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
3 years ago
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
3 years ago
50892a198d
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
...
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
3 years ago
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
3 years ago
7c1d804554
Merge branch 'fix-search-dos' into 'develop'
...
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
3 years ago
108dfd1f87
Search: limit number of results
3 years ago
c96e52b88c
Add 'notifying' to relationship for compatibility with Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
64a4c147b1
MastoAPI: accept notify param in follow request
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
6519f59d91
v2 Suggestions: return `is_suggested` through the API
3 years ago
8dc1d2201a
Instance: add v2_suggestions feature
3 years ago
e5a7547fbe
v2 Suggestions: also filter out users you follow
3 years ago
437c1a5a52
v2 Suggestions: actually flter out dismissed suggestions
3 years ago
aee55b9a8b
v2 Suggestions: dismiss a suggestion
3 years ago
e28d990ecb
v2 Suggestions: don't skip visibility check
3 years ago
b17360cd7c
v2 Suggestions: rudimentary API response
3 years ago
7e1caddc58
v2 Suggestions: return empty array
3 years ago
588bcbac55
Apply 2 suggestion(s) to 2 file(s)
3 years ago
8e040e098b
Lint
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
40414bf177
MastoAPI: Add user notes on accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
a17910a6c6
CI: Bump lint stage to elixir-1.12
...
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
3 years ago
555d7d57c9
Add "exposable_reactions" to features, if showing reactions
3 years ago
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
3 years ago
01175ef498
Streamer: fix crash in MastodonAPI.StatusView
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
3 years ago
61ba54897e
Merge branch 'streamer-crash-fix' into 'develop'
...
Streamer crash fix
See merge request pleroma/pleroma!3508
3 years ago
b7bbf42acd
Streamer: fix crash in MastodonAPI.StatusView
3 years ago
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
3 years ago
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
3 years ago
ad09bdb376
Improve readability
3 years ago
f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
...
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
3 years ago
03030b47c2
quarantine instances info
...
Added a new field in the nodeinfo called quarantined_instances_info
This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`
3 years ago
7fdc3cde06
Return maps in node_info
...
It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE,
but for FE maps like %{"instance": "instance", "reason", "reason"} are better.
I changed it so that node_info returns maps now for simple_policy and quarantined instances.
3 years ago
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
0114754db2
MastodonAPI: Support poll notification
3 years ago
5d279a22b1
Merge develop branch upstream
3 years ago
6ef8e1776d
fix the fucking list timelines on mastofe/soapbox-fe
3 years ago
45b7325b9e
Refactor skipped plugs into Pleroma.Web functions
...
Speeds up recompilation by reducing compile cycles
3 years ago
b99f60615c
Fix order of Pleroma.Web.Utils.Params aliases
3 years ago
ec65b7ae29
Pleroma.Web.Params --> Pleroma.Web.Utils.Params
3 years ago
0877b120c3
Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
...
Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex
3 years ago
2e310b3ec8
Fix more build errors
3 years ago
dc4814f0cd
Fix merge conflicts with upstream
3 years ago
2743c66693
Add "chat" back as a feature for backwards compat.
...
Legacy PleromaFE uses this to identify if ShoutBox is available.
3 years ago
d6432a65da
Move shout configuration from :instance, update docs and changelog
3 years ago
ff00b354fa
Rename the non-federating Chat feature to Shout
3 years ago
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
3 years ago
2e682788a3
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
3 years ago
5d40ffe429
Merge branch 'cycles-views' into 'develop'
...
Recompilation speedup: Create real Views for all Controllers
See merge request pleroma/pleroma!3425
3 years ago
1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
3 years ago
3ff9c5e2a6
Break out activity-specific HTML functions into Pleroma.Activity.HTML
...
Fixes cycles in lib/pleroma/ecto_type/activity_pub/object_validators/safe_text.ex
3 years ago
Alex Gleason