Haelwenn (lanodan) Monnier
b5ba41a725
mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header
5 years ago
Haelwenn (lanodan) Monnier
e174614eb9
MastoAPI Streaming: Keep compatibility with access_token
5 years ago
KokaKiwi
a7885748c7
MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol
5 years ago
Maxim Filippov
9f23502856
Fix docs
5 years ago
Ivan Tashkinov
e2f4135a8c
Apply suggestion to CHANGELOG.md
5 years ago
Ivan Tashkinov
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
5 years ago
rinpatch
3589b30ddc
Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'
...
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
Closes #1058
See merge request pleroma/pleroma!1378
5 years ago
Maxim Filippov
6c50fbcd14
Admin API: Allow querying user by ID
5 years ago
Haelwenn
c1c0091441
Merge branch 'issue/1043' into 'develop'
...
[#1043 ] fix search accounts.
See merge request pleroma/pleroma!1372
5 years ago
Maksim
6dadf5d6f4
[ #1043 ] fix search accounts.
5 years ago
Haelwenn (lanodan) Monnier
977c2d0448
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
5 years ago
rinpatch
497788a3cc
Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'
...
Expose `skip_thread_containment` in nodeinfo
Closes #1030
See merge request pleroma/pleroma!1349
5 years ago
Eugenij
15eb1235ed
Expose `skip_thread_containment` in nodeinfo
5 years ago
feld
9b45feae9b
Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop'
...
Fix occasional migration failures
See merge request pleroma/pleroma!1373
5 years ago
Roman Chvanikov
efefee8241
Split alters rather than work with indexes
5 years ago
rinpatch
079266d406
Merge branch 'handle-search-timeout' into 'develop'
...
Handle search timeouts for /api/v1/search and /api/v2/search
Closes #994
See merge request pleroma/pleroma!1369
5 years ago
Eugenij
5184b0f41a
Use fallback values for search queries
...
This is to make sure the entire request doesn't return a 500 error if
user or status search times out.
5 years ago
Egor Kislitsyn
11143c542a
Remove `httpoison` from dependencies
5 years ago
Egor Kislitsyn
4f42093220
Remove Uploaders.Swift
5 years ago
Haelwenn
dcadf34471
Merge branch '1048-semver-format-compliance' into 'develop'
...
Resolved violations of SemVer version format
Closes #1036 and #1048
See merge request pleroma/pleroma!1371
5 years ago
Roman Chvanikov
291d95dcc3
Fix migration
5 years ago
Ivan Tashkinov
8c7d7cc936
[ #1048 ] Fixed version parsing in pleroma_ctl. Closes #1036 .
5 years ago
Ivan Tashkinov
a02f52d12a
[ #1048 ] Resolved violations of SemVer version format. Refactoring.
5 years ago
kaniini
a565dbde4f
Merge branch 'admin-report-view-user-fallback' into 'develop'
...
Handle deleted reported accounts in report admin API
Closes #1046
See merge request pleroma/pleroma!1370
5 years ago
Eugenij
ab50c6b3ca
Add fallback value to the admin report view.
...
This is to avoid 500 error when the reported user no longer exists
in the database.
5 years ago
rinpatch
79c88a257f
Merge branch 'fix/changelog' into 'develop'
...
Move changelog entries
See merge request pleroma/pleroma!1368
5 years ago
Maxim Filippov
0b3561ae72
Move changelog entries
5 years ago
Haelwenn
3b05f834f4
Merge branch 'fix/docs-dry-run' into 'develop'
...
OTP Release install docs: Remove --dry-run in cron certbot command
See merge request pleroma/pleroma!1366
5 years ago
Haelwenn
ce827a1626
Merge branch 'ci-improvements' into 'develop'
...
Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
See merge request pleroma/pleroma!1360
5 years ago
Haelwenn
47efe52c50
Merge branch 'chore/changelog-update' into 'develop'
...
Update changelog and admin API docs with tags, display_name, avatar additions
See merge request pleroma/pleroma!1367
5 years ago
feld
5f1dd4fe80
Merge branch 'issue/1033' into 'develop'
...
[#1033 ] Fix database migrations
See merge request pleroma/pleroma!1350
5 years ago
Maksim
85c7916c94
[ #1033 ] Fix database migrations
5 years ago
Maxim Filippov
611f6665ac
Update changelog and admin API docs with tags, display_name, avatar additions
5 years ago
Roman Chvanikov
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
5 years ago
Ivan Tashkinov
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
5 years ago
rinpatch
044eb039c2
OTP Release install docs: Remove --dry-run in cron certbot command
5 years ago
rinpatch
66380d36d5
Merge branch 'filter-user-statuses-by-hashtag' into 'develop'
...
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
Closes #974
See merge request pleroma/pleroma!1362
5 years ago
Eugenij
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
5 years ago
rinpatch
e5df6487c8
Merge branch 'issues/1026' into 'develop'
...
[#1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
Closes #1026
See merge request pleroma/pleroma!1363
5 years ago
Maksim
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
5 years ago
Haelwenn
4a1c36e18f
Merge branch 'fix/pin-unlisted' into 'develop'
...
Fix not being able to pin unlisted posts
Closes #1038
See merge request pleroma/pleroma!1364
5 years ago
rinpatch
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
5 years ago
Ivan Tashkinov
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
5 years ago
rinpatch
bdc1592377
Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
...
This is needed because if we run with MIX_ENV=dev we will get a "+dev"
suffix to the version in the docs, but if we run with MIX_ENV=prod the
docs build will fail because ex_doc is dev-only dependency.
5 years ago
rinpatch
9b1e75bac8
Merge branch 'my-develop' into 'develop'
...
Docker specific configuration information
See merge request pleroma/pleroma!1359
5 years ago
deorsum
4c40ada7a5
Add a caveat for docker deployment in the config docs
5 years ago
rinpatch
a8c9522e04
Merge branch 'revert/tags-releases-develop' into 'develop'
...
Revert "Build releases only on tags or develop" on develop
See merge request pleroma/pleroma!1357
5 years ago
rinpatch
0f6e333d8b
Revert "Build releases only on tags or develop"
...
This reverts commit 54d2873770
.
5 years ago
rinpatch
f810acc7b0
Merge branch 'fix/no-untagged-builds-master' into 'develop'
...
Build releases only on tags or develop
See merge request pleroma/pleroma!1355
5 years ago