aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-14remove CC-BY-NC-ND license.Ariadne Conill
we moved branding assets (mascot etc) to CC-BY-SA a while back.
2019-06-29Merge branch 'revert/tags-releases' into 'master'rinpatch
Revert "Build releases only on tags or develop" See merge request pleroma/pleroma!1356
2019-06-29Revert "Build releases only on tags or develop"rinpatch
This reverts commit 54d287377054fa48c5a14cf6b056cd80e838b264. It breaks getting the latest artifact for the master branch.
2019-06-29Merge branch 'rebase/docs-master' into 'master'rinpatch
Cherry-pick documentation fixes to master See merge request pleroma/pleroma!1354
2019-06-29Build releases only on tags or developrinpatch
Needed so we could push documentation updates to master without triggering a rebuild
2019-06-29Add a warning about service files assuming installation pathsrinpatch
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-28Merge branch 'release/1.0' into 'develop'v1.0.0lain
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-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
2019-06-27Merge branch 'fix/admin-configure' into 'develop'kaniini
don't delete config settings on admin update See merge request pleroma/pleroma!1340
2019-06-27don't delete config settings on admin updateAlexander Strizhakov
2019-06-26Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'rinpatch
Update mastofe to bundle-2019-06-26 See merge request pleroma/pleroma!1341
2019-06-26Update mastofe to bundle-2019-06-26Haelwenn (lanodan) Monnier
2019-06-27Polish IdempotencyPlugEgor Kislitsyn
2019-06-26Instructions on getting the flavourrinpatch
2019-06-26Do not assume ~pleroma == /opt/pleromarinpatch
2019-06-26Fix credo warningEgor Kislitsyn
2019-06-26Remove previous idempotency implementation from `post_status`Egor Kislitsyn
2019-06-26Enable IdempotencyPlug for the all APIEgor Kislitsyn
2019-06-26Add Idempotency plugEgor Kislitsyn
2019-06-26Merge branch 'fix/handle-wrong-visibility-error' into 'develop'Haelwenn
Return correct response when reply to a direct message is not direct itself Closes #1010 See merge request pleroma/pleroma!1336
2019-06-26Return correct response when reply to a direct message is not direct itselfSergey Suprunenko
2019-06-26Add all the remaining sections to Switching to OTP releasesrinpatch
2019-06-26Merge branch 'refactoring/fix_render_view' into 'develop'kaniini
Fix Controller.render/4 deprecation See merge request pleroma/pleroma!1337
2019-06-26Merge branch 'feature/configurable-pack-extensions' into 'develop'kaniini
Make default pack extensions configurable and default to png and gif See merge request pleroma/pleroma!1338
2019-06-26Merge branch 'issues/1016' into 'develop'rinpatch
[#1016] add clear formatted text/ removes links with private ip See merge request pleroma/pleroma!1335
2019-06-26update changelogMaksim Pechnikov
2019-06-26Make default pack extensions configurable and default to png and gifrinpatch
2019-06-26Apply suggestion to CHANGELOG.mdMaksim
2019-06-26update changelogMaksim Pechnikov
2019-06-26fix validate_page_urlMaksim Pechnikov
2019-06-26Apply suggestion to docs/config.mdMaksim
2019-06-26Fix Controller.render/4 deprecationRoman Chvanikov
2019-06-25add ignore hosts and TLDs for rich_mediaMaksim Pechnikov
2019-06-25add testMaksim Pechnikov
2019-06-25fix validate_url for private ipMaksim Pechnikov
2019-06-25Add a note that OTP releases don't contain revision historyrinpatch
2019-06-25Remove the useless specification of test size and make the main points boldrinpatch