Maxim Filippov
0b3561ae72
Move changelog entries
2019-07-01 14:04:24 +03:00
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
2019-07-01 04:52:42 +00:00
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
2019-07-01 04:51:56 +00:00
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
2019-07-01 04:45:00 +00:00
feld
5f1dd4fe80
Merge branch 'issue/1033' into 'develop'
...
[#1033 ] Fix database migrations
See merge request pleroma/pleroma!1350
2019-07-01 01:08:07 +00:00
Maksim
85c7916c94
[ #1033 ] Fix database migrations
2019-07-01 01:08:07 +00:00
Maxim Filippov
611f6665ac
Update changelog and admin API docs with tags, display_name, avatar additions
2019-07-01 03:36:42 +03:00
Roman Chvanikov
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
2019-06-30 21:23:35 +03:00
Ivan Tashkinov
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
2019-06-30 16:05:00 +03:00
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
2019-06-30 15:58:50 +03:00
rinpatch
044eb039c2
OTP Release install docs: Remove --dry-run in cron certbot command
2019-06-30 13:06:10 +03:00
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
2019-06-30 09:08:46 +00:00
Eugenij
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
2019-06-30 09:08:46 +00:00
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
2019-06-30 07:28:35 +00:00
Maksim
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
2019-06-30 07:28:35 +00:00
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
2019-06-30 00:59:40 +00:00
rinpatch
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
2019-06-29 22:27:42 +03:00
Ivan Tashkinov
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
2019-06-29 20:04:50 +03:00
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.
2019-06-29 14:28:26 +03:00
rinpatch
9b1e75bac8
Merge branch 'my-develop' into 'develop'
...
Docker specific configuration information
See merge request pleroma/pleroma!1359
2019-06-29 11:24:14 +00:00
deorsum
4c40ada7a5
Add a caveat for docker deployment in the config docs
2019-06-29 21:14:11 +10:00
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
2019-06-29 10:39:52 +00:00
rinpatch
0f6e333d8b
Revert "Build releases only on tags or develop"
...
This reverts commit 54d2873770
2019-06-29 13:29:11 +03:00
rinpatch
f810acc7b0
Merge branch 'fix/no-untagged-builds-master' into 'develop'
...
Build releases only on tags or develop
See merge request pleroma/pleroma!1355
2019-06-29 09:41:31 +00:00
rinpatch
ee79c67081
Build releases only on tags or develop
...
Needed so we could push documentation updates to master without
triggering a rebuild
2019-06-29 12:29:12 +03:00
rinpatch
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
2019-06-29 08:44:56 +00:00
rinpatch
eddcebf8ae
Add a warning about service files assuming installation paths
2019-06-29 11:35:42 +03:00
rinpatch
b6cfc8f98b
Merge branch 'patch-3' into 'develop'
...
Move all upload contents despite upload folder itself.
See merge request pleroma/pleroma!1352
2019-06-29 06:01:33 +00:00
rinpatch
b20b2d862a
Merge branch 'patch-2' into 'develop'
...
Update migrating_from_source_otp_en.md
See merge request pleroma/pleroma!1351
2019-06-29 06:01:30 +00:00
Yuji Nakao
ab6de9b478
Move all upload contents despite upload folder itself.
2019-06-29 04:24:44 +00:00
Yuji Nakao
b2548e65db
Update migrating_from_source_otp_en.md: Replace reload-daemon with daemon-reload.
2019-06-29 04:17:49 +00:00
kaniini
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
2019-06-29 00:12:09 +00:00
kaniini
f375c2fd70
Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'
...
MRF: add mediaproxy warming policy
See merge request pleroma/pleroma!1342
2019-06-28 23:50:23 +00:00
William Pitcock
c22f0bfb80
test: add tests for mediaproxy warming policy
2019-06-28 23:41:42 +00:00
William Pitcock
074ffee0b2
docs: add documentation for MediaProxyWarmingPolicy
2019-06-28 23:20:17 +00:00
William Pitcock
034986e1fd
MRF: add mediaproxy warming policy
2019-06-28 23:19:20 +00:00
Roman Chvanikov
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
rinpatch
c6668c2e7b
Merge branch 'develop' into 'develop'
...
Fixed links in documentation
See merge request pleroma/pleroma!1334
2019-06-28 18:25:21 +00:00
Julien Wehmschulte
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
2019-06-28 18:25:21 +00:00
lain
456668b490
Merge branch 'release/1.0' into 'develop'
...
1.0 Release
See merge request pleroma/pleroma!1348
2019-06-28 15:29:44 +00:00
lain
2286f62a36
Merge branch 'release-docs' into 'develop'
...
Docs on OTP releases
See merge request pleroma/pleroma!1315
2019-06-28 15:26:09 +00:00
lain
da17bdd87e
BUMP OF CHICKEN
...
1.0
2019-06-28 17:15:44 +02:00
lain
f5b015b998
Merge branch '2019-06-29-pleromafe' into 'develop'
...
Update frontend.
See merge request pleroma/pleroma!1347
2019-06-28 12:39:51 +00:00
lain
efad26bbb9
Update frontend.
2019-06-28 14:29:26 +02:00
Maxim Filippov
90927e6a9a
Kowalski, analysis!
2019-06-28 15:27:18 +03:00
Maxim Filippov
452ca5250d
Merge admin and mastodon user views for reports
2019-06-28 15:15:32 +03:00
rinpatch
eeb419e3a0
Add a note about the develop branch
2019-06-28 09:42:45 +03:00
kaniini
ad249f6f5f
Merge branch 'fix/syslog-tag' into 'develop'
...
lowercase syslog tag
See merge request pleroma/pleroma!1344
2019-06-27 21:30:54 +00:00
Mark Felder
e64c758cea
Add changelog entry for syslog tag change
2019-06-27 16:25:55 -05:00
Mark Felder
f8ec3e129f
In my experience syslog tags are usually lowercase
2019-06-27 13:00:22 -05:00
