summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-01Merge branch 'fix/changelog' into 'develop'rinpatch
Move changelog entries See merge request pleroma/pleroma!1368
2019-07-01Move changelog entriesMaxim Filippov
2019-07-01Merge branch 'fix/docs-dry-run' into 'develop'Haelwenn
OTP Release install docs: Remove --dry-run in cron certbot command See merge request pleroma/pleroma!1366
2019-07-01Merge branch 'ci-improvements' into 'develop'Haelwenn
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-01Merge branch 'chore/changelog-update' into 'develop'Haelwenn
Update changelog and admin API docs with tags, display_name, avatar additions See merge request pleroma/pleroma!1367
2019-07-01Merge branch 'issue/1033' into 'develop'feld
[#1033] Fix database migrations See merge request pleroma/pleroma!1350
2019-07-01[#1033] Fix database migrationsMaksim
2019-07-01Update changelog and admin API docs with tags, display_name, avatar additionsMaxim Filippov
2019-06-30OTP Release install docs: Remove --dry-run in cron certbot commandrinpatch
2019-06-30Merge branch 'filter-user-statuses-by-hashtag' into 'develop'rinpatch
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses) Closes #974 See merge request pleroma/pleroma!1362
2019-06-30Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)Eugenij
2019-06-30Merge branch 'issues/1026' into 'develop'rinpatch
[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text Closes #1026 See merge request pleroma/pleroma!1363
2019-06-30[#1026] Filter.AnonymizeFilename added ability to retain file extension with ↵Maksim
custom text
2019-06-30Merge branch 'fix/pin-unlisted' into 'develop'Haelwenn
Fix not being able to pin unlisted posts Closes #1038 See merge request pleroma/pleroma!1364
2019-06-29Fix not being able to pin unlisted postsrinpatch
Closes #1038
2019-06-29Add PLEROMA_BUILD_ENV to override env for the version generator and use it ↵rinpatch
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-29Merge branch 'my-develop' into 'develop'rinpatch
Docker specific configuration information See merge request pleroma/pleroma!1359
2019-06-29Add a caveat for docker deployment in the config docsdeorsum
2019-06-29Merge branch 'revert/tags-releases-develop' into 'develop'rinpatch
Revert "Build releases only on tags or develop" on develop See merge request pleroma/pleroma!1357
2019-06-29Revert "Build releases only on tags or develop"rinpatch
This reverts commit 54d287377054fa48c5a14cf6b056cd80e838b264.
2019-06-29Merge branch 'fix/no-untagged-builds-master' into 'develop'rinpatch
Build releases only on tags or develop See merge request pleroma/pleroma!1355
2019-06-29Build releases only on tags or developrinpatch
Needed so we could push documentation updates to master without triggering a rebuild
2019-06-29Merge branch 'fix/release-docs-path-warning' into 'develop'rinpatch
Add a warning about service files assuming installation paths See merge request pleroma/pleroma!1353
2019-06-29Add a warning about service files assuming installation pathsrinpatch
2019-06-29Merge branch 'patch-3' into 'develop'rinpatch
Move all upload contents despite upload folder itself. See merge request pleroma/pleroma!1352
2019-06-29Merge branch 'patch-2' into 'develop'rinpatch
Update migrating_from_source_otp_en.md See merge request pleroma/pleroma!1351
2019-06-29Move all upload contents despite upload folder itself.Yuji Nakao
2019-06-29Update migrating_from_source_otp_en.md: Replace `reload-daemon` with ↵Yuji Nakao
`daemon-reload`.
2019-06-29Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'kaniini
Merge admin and mastodon user views for reports See merge request pleroma/pleroma!1346
2019-06-28Merge branch 'feature/mrf-mediaproxy-warm' into 'develop'kaniini
MRF: add mediaproxy warming policy See merge request pleroma/pleroma!1342
2019-06-28test: add tests for mediaproxy warming policyWilliam Pitcock
2019-06-28docs: add documentation for MediaProxyWarmingPolicyWilliam Pitcock
2019-06-28MRF: add mediaproxy warming policyWilliam Pitcock
2019-06-28Merge branch 'develop' into 'develop'rinpatch
Fixed links in documentation See merge request pleroma/pleroma!1334
2019-06-28Update docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, ↵Julien Wehmschulte
docs/installation/debian_based_en.md, docs/installation/debian_based_jp.md, docs/installation/gentoo_en.md files
2019-06-28Merge branch 'release/1.0' into 'develop'lain
1.0 Release See merge request pleroma/pleroma!1348
2019-06-28Merge branch 'release-docs' into 'develop'lain
Docs on OTP releases See merge request pleroma/pleroma!1315
2019-06-28BUMP OF CHICKENlain
1.0
2019-06-28Merge branch '2019-06-29-pleromafe' into 'develop'lain
Update frontend. See merge request pleroma/pleroma!1347
2019-06-28Update frontend.lain
2019-06-28Kowalski, analysis!Maxim Filippov
2019-06-28Merge admin and mastodon user views for reportsMaxim Filippov
2019-06-28Add a note about the develop branchrinpatch
2019-06-27Merge branch 'fix/syslog-tag' into 'develop'kaniini
lowercase syslog tag See merge request pleroma/pleroma!1344
2019-06-27Add changelog entry for syslog tag changeMark Felder
2019-06-27In my experience syslog tags are usually lowercaseMark Felder
2019-06-27Add a note about OS/Distro packages in the readmerinpatch
2019-06-27Add a deprecation warning to the readmerinpatch
2019-06-27Add a note on what OTP releases arerinpatch
2019-06-27Merge branch 'idempotency-plug' into 'develop'kaniini
Add IdempotencyPlug and use it in all of the api Closes #1003 See merge request pleroma/pleroma!1339
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 21:13:57 +0000