4c60fdcbb1
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
c8bfbf511e
Apply suggestion to docs/API/admin_api.md
5 years ago
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
5 years ago
564f3f01ca
Merge branch 'formatter-html-safe' into 'develop'
...
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357
5 years ago
de592a6d33
Merge branch 'changelog-update' into 'develop'
...
No changelog entry - bug fixed only in develop
See merge request pleroma/pleroma!2359
5 years ago
73134e248a
no changelog entry - bug fixed only in develop
5 years ago
4cedecac45
Merge branch 'bugfix/objectid_validator' into 'develop'
...
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
See merge request pleroma/pleroma!2358
5 years ago
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
5 years ago
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
5 years ago
3965772b26
[ #1559 ] Minor change (analysis).
5 years ago
f35c28bf07
[ #1559 ] Added / fixed tests for follow / follow_request notifications.
5 years ago
90cbf55236
Merge branch 'gun-pool-fix' into 'develop'
...
Fix for gun connections pool
Closes #1669 and #1664
See merge request pleroma/pleroma!2356
5 years ago
5739c498c0
fix for gun connections pool
5 years ago
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
5 years ago
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
5 years ago
2b7d7bbd2d
Merge branch 'develop' into issue/1276
5 years ago
06471940e0
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
5 years ago
03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
5 years ago
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
5 years ago
96ee0aadbf
Merge branch 'improving-test-coverage' into 'develop'
...
Tests for emoji mix task
See merge request pleroma/pleroma!2350
5 years ago
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
5 years ago
772bc258cd
ObjectID Validator: Refactor.
5 years ago
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
5 years ago
a43e055916
using another fn for file deletion
5 years ago
b59ac37b2c
tests for emoji mix task
5 years ago
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
5 years ago
8444e7ee96
Merge branch 'fix/docs-markdown' into 'develop'
...
Fix formatting in documentation
See merge request pleroma/pleroma!2348
5 years ago
8a0ffaa9ea
Fix formatting in documentation
5 years ago
7879369e4d
Merge branch '2323-accounts-relationships-hotfix' into 'develop'
...
[#2323 ] Fixed /accounts/relationships
Closes pleroma-fe#820
See merge request pleroma/pleroma!2347
5 years ago
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
5 years ago
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
5 years ago
0aa24a150b
Add oAuth
5 years ago
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
591f7015d9
update Oban package
5 years ago
23219e6fb3
Add OpenAPI
5 years ago
2d64500a9d
error improvement for email_invite endpoint
5 years ago
fd932b14a7
Merge branch 'update/adminfe-20200331' into 'develop'
...
Update AdminFE build in preparation for Pleroma 2.0.2
See merge request pleroma/pleroma!2343
5 years ago
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
5 years ago
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
037b49c415
Validators: Correct ObjectID filename
5 years ago
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
5 years ago
94ddbe4098
restrict remote users from indexing
5 years ago
c9f51edea1
Merge branch 'ops/fix-ci' into 'develop'
...
Ops/fix ci
See merge request pleroma/pleroma!2340
5 years ago
bcaaba4660
remove testing `only:` in docker build
5 years ago
c2715ed772
add imagemagick and update inherited container to alpine:3.11
5 years ago
ec5d6eef6a
Merge branch 'fix/docker-mogrify' into 'develop'
...
Remove problematic --cache-from argument
See merge request pleroma/pleroma!2338
5 years ago
d3cd3b96bf
Remove problematic --cache-from argument
5 years ago
7d3b25f0e1
Merge branch 'bugfix/funkwhale-channel' into 'develop'
...
Fix profile url for funkwhale channels, removes one source_data use
Closes #1653
See merge request pleroma/pleroma!2333
5 years ago
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Alexander Strizhakov