kPherox
0e8f6d24b8
Create OTP_VERSION file by `mix release`
4 years ago
kPherox
d37a102933
Fix OTP_VERSION file in docker
4 years ago
lain
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
4 years ago
Alexander Strizhakov
f20a19de85
typo fix
4 years ago
Alexander Strizhakov
9795ff5b01
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
4 years ago
Alexander Strizhakov
365c34a7a9
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
4 years ago
Alexander Strizhakov
1cf0d5ab0d
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
4 years ago
Alexander Strizhakov
4c60fdcbb1
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
4 years ago
Alexander Strizhakov
c8bfbf511e
Apply suggestion to docs/API/admin_api.md
4 years ago
lain
d2e21fbc96
Merge branch 'open-api' into 'develop'
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
4 years ago
lain
564f3f01ca
Merge branch 'formatter-html-safe' into 'develop'
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357
4 years ago
Haelwenn
de592a6d33
Merge branch 'changelog-update' into 'develop'
No changelog entry - bug fixed only in develop
See merge request pleroma/pleroma!2359
4 years ago
Alexander Strizhakov
73134e248a
no changelog entry - bug fixed only in develop
4 years ago
Haelwenn
4cedecac45
Merge branch 'bugfix/objectid_validator' into 'develop'
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
See merge request pleroma/pleroma!2358
4 years ago
Haelwenn (lanodan) Monnier
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
4 years ago
rinpatch
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.
4 years ago
feld
90cbf55236
Merge branch 'gun-pool-fix' into 'develop'
Fix for gun connections pool
Closes #1669 and #1664
See merge request pleroma/pleroma!2356
4 years ago
Alexander Strizhakov
5739c498c0
fix for gun connections pool
4 years ago
rinpatch
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
4 years ago
kPherox
06471940e0
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
4 years ago
Egor Kislitsyn
03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
4 years ago
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
4 years ago
lain
96ee0aadbf
Merge branch 'improving-test-coverage' into 'develop'
Tests for emoji mix task
See merge request pleroma/pleroma!2350
4 years ago
lain
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
4 years ago
lain
772bc258cd
ObjectID Validator: Refactor.
4 years ago
lain
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
4 years ago
Alexander Strizhakov
a43e055916
using another fn for file deletion
4 years ago
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task
4 years ago
feld
8444e7ee96
Merge branch 'fix/docs-markdown' into 'develop'
Fix formatting in documentation
See merge request pleroma/pleroma!2348
4 years ago
Egor Kislitsyn
8a0ffaa9ea
Fix formatting in documentation
4 years ago
feld
7879369e4d
Merge branch '2323-accounts-relationships-hotfix' into 'develop'
[#2323 ] Fixed /accounts/relationships
Closes pleroma-fe#820
See merge request pleroma/pleroma!2347
4 years ago
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
4 years ago
Egor Kislitsyn
0aa24a150b
Add oAuth
4 years ago
Egor Kislitsyn
23219e6fb3
Add OpenAPI
4 years ago
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint
4 years ago
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
4 years ago
feld
ef7d2b0f11
Merge branch 'gun' into 'develop'
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
4 years ago
lain
037b49c415
Validators: Correct ObjectID filename
4 years ago
rinpatch
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
4 years ago
Alexander Strizhakov
94ddbe4098
restrict remote users from indexing
4 years ago
Haelwenn
c9f51edea1
Merge branch 'ops/fix-ci' into 'develop'
Ops/fix ci
See merge request pleroma/pleroma!2340
4 years ago
jp
bcaaba4660
remove testing `only:` in docker build
4 years ago
jp
c2715ed772
add imagemagick and update inherited container to alpine:3.11
4 years ago
feld
ec5d6eef6a
Merge branch 'fix/docker-mogrify' into 'develop'
Remove problematic --cache-from argument
See merge request pleroma/pleroma!2338
4 years ago
Mark Felder
d3cd3b96bf
Remove problematic --cache-from argument
4 years ago
Haelwenn
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
4 years ago
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
4 years ago
Haelwenn (lanodan) Monnier
b30fb1f3bb
User: Fix use of source_data in profile_url/1
4 years ago
Haelwenn (lanodan) Monnier
2553400a66
Initial failing test statement against funkwhale channels
4 years ago
feld
fa38089f16
Merge branch 'fix/docker-mogrify' into 'develop'
Fix/docker mogrify
Closes #1644
See merge request pleroma/pleroma!2337
4 years ago