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
79c88a257f
Merge branch 'fix/changelog' into 'develop'
...
Move changelog entries
See merge request pleroma/pleroma!1368
5 years ago
0b3561ae72
Move changelog entries
5 years ago
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
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
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
5f1dd4fe80
Merge branch 'issue/1033' into 'develop'
...
[#1033 ] Fix database migrations
See merge request pleroma/pleroma!1350
5 years ago
85c7916c94
[ #1033 ] Fix database migrations
5 years ago
611f6665ac
Update changelog and admin API docs with tags, display_name, avatar additions
5 years ago
044eb039c2
OTP Release install docs: Remove --dry-run in cron certbot command
5 years ago
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
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
5 years ago
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
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
5 years ago
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
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
5 years ago
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
9b1e75bac8
Merge branch 'my-develop' into 'develop'
...
Docker specific configuration information
See merge request pleroma/pleroma!1359
5 years ago
4c40ada7a5
Add a caveat for docker deployment in the config docs
5 years ago
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
0f6e333d8b
Revert "Build releases only on tags or develop"
...
This reverts commit 54d2873770
5 years ago
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
ee79c67081
Build releases only on tags or develop
...
Needed so we could push documentation updates to master without
triggering a rebuild
5 years ago
c82024adcb
Merge branch 'fix/release-docs-path-warning' into 'develop'
...
Add a warning about service files assuming installation paths
See merge request pleroma/pleroma!1353
5 years ago
eddcebf8ae
Add a warning about service files assuming installation paths
5 years ago
b6cfc8f98b
Merge branch 'patch-3' into 'develop'
...
Move all upload contents despite upload folder itself.
See merge request pleroma/pleroma!1352
5 years ago
b20b2d862a
Merge branch 'patch-2' into 'develop'
...
Update migrating_from_source_otp_en.md
See merge request pleroma/pleroma!1351
5 years ago
ab6de9b478
Move all upload contents despite upload folder itself.
5 years ago
b2548e65db
Update migrating_from_source_otp_en.md: Replace `reload-daemon` with `daemon-reload`.
5 years ago
d1549a6375
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
...
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
5 years ago
f375c2fd70
Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'
...
MRF: add mediaproxy warming policy
See merge request pleroma/pleroma!1342
5 years ago
c22f0bfb80
test: add tests for mediaproxy warming policy
5 years ago
074ffee0b2
docs: add documentation for MediaProxyWarmingPolicy
5 years ago
034986e1fd
MRF: add mediaproxy warming policy
5 years ago
c6668c2e7b
Merge branch 'develop' into 'develop'
...
Fixed links in documentation
See merge request pleroma/pleroma!1334
5 years ago
e556c96661
Update docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, docs/installation/debian_based_en.md, docs/installation/debian_based_jp.md, docs/installation/gentoo_en.md files
5 years ago
456668b490
Merge branch 'release/1.0' into 'develop'
...
1.0 Release
See merge request pleroma/pleroma!1348
5 years ago
2286f62a36
Merge branch 'release-docs' into 'develop'
...
Docs on OTP releases
See merge request pleroma/pleroma!1315
5 years ago
da17bdd87e
BUMP OF CHICKEN
...
1.0
5 years ago
f5b015b998
Merge branch '2019-06-29-pleromafe' into 'develop'
...
Update frontend.
See merge request pleroma/pleroma!1347
5 years ago
efad26bbb9
Update frontend.
5 years ago
90927e6a9a
Kowalski, analysis!
5 years ago
452ca5250d
Merge admin and mastodon user views for reports
5 years ago
eeb419e3a0
Add a note about the develop branch
5 years ago
ad249f6f5f
Merge branch 'fix/syslog-tag' into 'develop'
...
lowercase syslog tag
See merge request pleroma/pleroma!1344
5 years ago
e64c758cea
Add changelog entry for syslog tag change
5 years ago
f8ec3e129f
In my experience syslog tags are usually lowercase
5 years ago
e91f09cfe6
Add a note about OS/Distro packages in the readme
5 years ago
ceebe95c27
Add a deprecation warning to the readme
5 years ago
4f44732100
Add a note on what OTP releases are
5 years ago
Eugenij