summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-03Merge branch 'official-docker-support' into 'develop'kaniini
Add Dockerfile See merge request pleroma/pleroma!1523
2019-08-03Run mix formatAshlynn Anderson
2019-08-03Add .dockerignoreAshlynn Anderson
2019-08-03Optimize DockerfileAshlynn Anderson
Just merging RUNs to decrease the number of layers
2019-08-03Create docker.exs and docker-entrypoint + round out DockerfileAshlynn Anderson
At this point, the implementation is completely working and has been tested running live and federating with other instances.
2019-08-03Basic working DockerfileAshlynn Anderson
No fancy script or minit automatic migration, etc, but if you start the docker image and go in and manually do everything, it works.
2019-08-02Merge branch 'docfix/mix_task_options' into 'develop'Haelwenn
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at Closes #1155 See merge request pleroma/pleroma!1522
2019-08-02tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-atHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155 [ci skip]
2019-08-02Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'feld
Fix/mediaproxy whitelist base url See merge request pleroma/pleroma!1486
2019-08-02Fix/mediaproxy whitelist base urlfeld
2019-08-02Merge branch 'feature/hide-follows-remote' into 'develop'lain
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users See merge request pleroma/pleroma!1411
2019-08-01Merge branch 'fix/semver-violations' into 'develop'kaniini
Fix Invalid SemVer version generation See merge request pleroma/pleroma!1517
2019-08-01Merge branch 'cleanup-tests' into 'develop'rinpatch
Clean up `AdminAPIControllerTest` output See merge request pleroma/pleroma!1516
2019-08-01Fix Invalid SemVer version generationrinpatch
when the current branch does not have commits ahead of tag/checked out on a tag
2019-08-01Clean up tests outputEgor Kislitsyn
2019-07-31Merge branch 'chore/changelog-update' into 'develop'kaniini
Add a changelog entry for disallowing locked accounts follows over OStatus See merge request pleroma/pleroma!1513
2019-07-31Add a changelog entry for disallowing locked accounts follows over OStatusrinpatch
2019-07-31Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'kaniini
Disallow following locked accounts over OStatus See merge request pleroma/pleroma!1512
2019-07-31Disallow following locked accounts over OStatusrinpatch
2019-07-31Merge branch 'test/web_common_api_utils' into 'develop'kaniini
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id See merge request pleroma/pleroma!1510
2019-07-31test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_idMaksim
2019-07-31Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'kaniini
ostatus: explicitly disallow protocol downgrade from activitypub See merge request pleroma/pleroma!1511
2019-07-31ostatus: explicitly disallow protocol downgrade from activitypubAriadne Conill
This closes embargoed bug #1135.
2019-07-31Add tests for counters being updated on followrinpatch
2019-07-31Merge branch 'test/twitter/util_controller' into 'develop'kaniini
tests for TwitterApi/UtilController See merge request pleroma/pleroma!1509
2019-07-31tests for TwitterApi/UtilControllerMaksim
2019-07-31Fix credo issuesrinpatch
2019-07-31Merge branch 'develop' into feature/hide-follows-remoterinpatch
2019-07-30Merge branch 'admin-changes' into 'develop'kaniini
Admin changes See merge request pleroma/pleroma!1489
2019-07-30Admin changesAlexander Strizhakov
2019-07-29Merge branch 'security/remote-follow-commonapi' into 'develop'kaniini
twitter api: utils: rework do_remote_follow() to use CommonAPI Closes #1138 See merge request pleroma/pleroma!1506
2019-07-29twitter api: utils: rework do_remote_follow() to use CommonAPIAriadne Conill
Closes #1138
2019-07-29Merge branch 'revert-83508418' into 'develop'kaniini
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" See merge request pleroma/pleroma!1505
2019-07-29Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"kaniini
This reverts merge request !1504
2019-07-29Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'Haelwenn
markdown: clean up html generated by earmark See merge request pleroma/pleroma!1504
2019-07-29markdown: clean up html generated by earmarkAriadne Conill
2019-07-29Merge branch 'refactor/use-constants' into 'develop'lain
refactoring: begin to use constants See merge request pleroma/pleroma!1500
2019-07-29Merge branch 'mailer-enabled-nodeinfo' into 'develop'kaniini
Add `mailerEnabled` to the NodeInfo metadata See merge request pleroma/pleroma!1502
2019-07-29Add `mailerEnabled` to the NodeInfo metadataEugenij
2019-07-29Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'kaniini
Redirect not logged-in users to the MastoFE login page on private instances Closes #1045 See merge request pleroma/pleroma!1503
2019-07-29Redirect not logged-in users to the MastoFE login page on private instancesSergey Suprunenko
2019-07-29Merge branch 'tests/ostatus_controller' into 'develop'kaniini
added tests for OstatusController See merge request pleroma/pleroma!1501
2019-07-29added tests for OstatusControllerMaksim
2019-07-29constants: add as_public constant and use it everywhereAriadne Conill
2019-07-29mix: add ex_const dependencyAriadne Conill
2019-07-28Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'kaniini
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users Closes #1104 See merge request pleroma/pleroma!1498
2019-07-28transmogrifier: use User.delete() instead of handrolled user deletion code ↵Ariadne Conill
for remote users Closes #1104
2019-07-28Merge branch 'confirmation-resend' into 'develop'kaniini
add account confirmation email resend in mastodon api See merge request pleroma/pleroma!1492
2019-07-28add account confirmation email resend in mastodon apiSachin Joshi
2019-07-28Merge branch 'fix/user_update_and_set_cache' into 'develop'kaniini
fixed User.update_and_set_cache for stale user See merge request pleroma/pleroma!1493
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-29 15:02:56 +0000