de592a6d33
Merge branch 'changelog-update' into 'develop'
...
No changelog entry - bug fixed only in develop
See merge request pleroma/pleroma!2359
2020-04-09 05:11:10 +00:00
73134e248a
no changelog entry - bug fixed only in develop
2020-04-09 08:03:21 +03:00
4cedecac45
Merge branch 'bugfix/objectid_validator' into 'develop'
...
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
See merge request pleroma/pleroma!2358
2020-04-09 02:43:03 +00:00
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
2020-04-09 04:36:39 +02:00
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.
2020-04-08 22:58:31 +03:00
3965772b26
[ #1559 ] Minor change (analysis).
2020-04-08 21:33:37 +03:00
f35c28bf07
[ #1559 ] Added / fixed tests for follow / follow_request notifications.
2020-04-08 21:26:22 +03:00
feld
90cbf55236
Merge branch 'gun-pool-fix' into 'develop'
...
Fix for gun connections pool
Closes #1669 and #1664
See merge request pleroma/pleroma!2356
2020-04-08 17:13:54 +00:00
5739c498c0
fix for gun connections pool
2020-04-08 18:46:01 +03:00
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
2020-04-07 11:41:10 +00:00
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
06471940e0
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
2020-04-07 08:44:53 +00:00
03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
2020-04-06 17:11:00 +04:00
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00
96ee0aadbf
Merge branch 'improving-test-coverage' into 'develop'
...
Tests for emoji mix task
See merge request pleroma/pleroma!2350
2020-04-06 12:49:17 +00:00
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
2020-04-06 11:59:01 +00:00
772bc258cd
ObjectID Validator: Refactor.
2020-04-06 13:53:24 +02:00
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
2020-04-06 13:46:34 +02:00
a43e055916
using another fn for file deletion
2020-04-06 14:27:20 +03:00
b59ac37b2c
tests for emoji mix task
2020-04-06 11:13:59 +03:00
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
2020-04-06 10:20:44 +03:00
feld
8444e7ee96
Merge branch 'fix/docs-markdown' into 'develop'
...
Fix formatting in documentation
See merge request pleroma/pleroma!2348
2020-04-02 19:36:55 +00:00
8a0ffaa9ea
Fix formatting in documentation
2020-04-02 23:10:13 +04:00
feld
7879369e4d
Merge branch '2323-accounts-relationships-hotfix' into 'develop'
...
[#2323 ] Fixed /accounts/relationships
Closes pleroma-fe#820
See merge request pleroma/pleroma!2347
2020-04-02 16:48:47 +00:00
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
2020-04-02 19:38:39 +03:00
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
0aa24a150b
Add oAuth
2020-04-02 17:33:23 +04:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
591f7015d9
update Oban package
2020-04-02 09:34:11 +03:00
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
2d64500a9d
error improvement for email_invite endpoint
2020-04-01 20:26:33 +03:00
feld
fd932b14a7
Merge branch 'update/adminfe-20200331' into 'develop'
...
Update AdminFE build in preparation for Pleroma 2.0.2
See merge request pleroma/pleroma!2343
2020-04-01 17:12:59 +00:00
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
feld
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
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.
2020-04-01 19:49:09 +03:00
037b49c415
Validators: Correct ObjectID filename
2020-04-01 16:10:17 +02:00
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
2020-04-01 12:55:52 +00:00
94ddbe4098
restrict remote users from indexing
2020-04-01 09:57:12 +03:00
c9f51edea1
Merge branch 'ops/fix-ci' into 'develop'
...
Ops/fix ci
See merge request pleroma/pleroma!2340
2020-04-01 03:44:47 +00:00
bcaaba4660
remove testing `only:` in docker build
2020-03-31 22:16:36 -04:00
c2715ed772
add imagemagick and update inherited container to alpine:3.11
2020-03-31 21:31:23 -04:00
feld
ec5d6eef6a
Merge branch 'fix/docker-mogrify' into 'develop'
...
Remove problematic --cache-from argument
See merge request pleroma/pleroma!2338
2020-03-31 22:32:48 +00:00
d3cd3b96bf
Remove problematic --cache-from argument
2020-03-31 17:28:41 -05:00
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
2020-03-31 22:04:02 +00:00
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
b30fb1f3bb
User: Fix use of source_data in profile_url/1
2020-03-31 23:54:20 +02:00
2553400a66
Initial failing test statement against funkwhale channels
2020-03-31 23:54:20 +02:00
feld
fa38089f16
Merge branch 'fix/docker-mogrify' into 'develop'
...
Fix/docker mogrify
Closes #1644
See merge request pleroma/pleroma!2337
2020-03-31 19:36:04 +00:00
f6dc33615b
Add imagemagick to Docker image to fix broken mogrify plugin
2020-03-31 14:29:43 -05:00
Haelwenn
feld