Commit graph

6117 commits

Author SHA1 Message Date
Ashlynn Anderson 4007717534 Run mix format 2019-08-03 13:42:57 -04:00
Ashlynn Anderson 04327721d7 Add .dockerignore 2019-08-03 00:21:54 -04:00
Ashlynn Anderson c86db959cb Optimize Dockerfile
Just merging RUNs to decrease the number of layers
2019-08-03 00:21:54 -04:00
Ashlynn Anderson 4a418698db Create docker.exs and docker-entrypoint + round out Dockerfile
At this point, the implementation is completely working and has been
tested running live and federating with other instances.
2019-08-03 00:21:54 -04:00
Ashlynn Anderson 7efca4317b Basic working Dockerfile
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-03 00:21:54 -04:00
Haelwenn e553a17e98 Merge branch 'docfix/mix_task_options' into 'develop'
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at

Closes #1155

See merge request pleroma/pleroma!1522
2019-08-02 21:38:28 +00:00
Haelwenn (lanodan) Monnier 8815f07058
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155

[ci skip]
2019-08-02 23:38:02 +02:00
feld 5eec0abe09 Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'
Fix/mediaproxy whitelist base url

See merge request pleroma/pleroma!1486
2019-08-02 17:07:09 +00:00
feld d93d777915 Fix/mediaproxy whitelist base url 2019-08-02 17:07:09 +00:00
lain 5ff8f07ca9 Merge branch 'feature/hide-follows-remote' into 'develop'
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users

See merge request pleroma/pleroma!1411
2019-08-02 11:23:07 +00:00
kaniini 1fe092e03c Merge branch 'fix/semver-violations' into 'develop'
Fix Invalid SemVer version generation

See merge request pleroma/pleroma!1517
2019-08-01 16:37:04 +00:00
rinpatch 955985fe2c Merge branch 'cleanup-tests' into 'develop'
Clean up `AdminAPIControllerTest` output

See merge request pleroma/pleroma!1516
2019-08-01 13:38:15 +00:00
rinpatch 81412240e6 Fix Invalid SemVer version generation
when the current branch does not have commits ahead of tag/checked out on a tag
2019-08-01 14:15:18 +03:00
Egor Kislitsyn f98235f2ad Clean up tests output 2019-08-01 16:33:36 +07:00
kaniini cdfd02e904 Merge branch 'chore/changelog-update' into 'develop'
Add a changelog entry for disallowing locked accounts follows over OStatus

See merge request pleroma/pleroma!1513
2019-07-31 20:08:27 +00:00
rinpatch def0c49ead Add a changelog entry for disallowing locked accounts follows over OStatus 2019-07-31 23:03:46 +03:00
kaniini 6c06529cd4 Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
Disallow following locked accounts over OStatus

See merge request pleroma/pleroma!1512
2019-07-31 19:13:56 +00:00
rinpatch 813c686dd7 Disallow following locked accounts over OStatus 2019-07-31 22:05:12 +03:00
kaniini b431b565f0 Merge branch 'test/web_common_api_utils' into 'develop'
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id

See merge request pleroma/pleroma!1510
2019-07-31 18:35:15 +00:00
Maksim 6eb33e7303 test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id 2019-07-31 18:35:15 +00:00
kaniini 8980c1c769 Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'
ostatus: explicitly disallow protocol downgrade from activitypub

See merge request pleroma/pleroma!1511
2019-07-31 18:30:40 +00:00
Ariadne Conill f72e0b7cad ostatus: explicitly disallow protocol downgrade from activitypub
This closes embargoed bug #1135.
2019-07-31 18:17:31 +00:00
rinpatch 301ea0dc04 Add tests for counters being updated on follow 2019-07-31 21:09:13 +03:00
kaniini 957de9d771 Merge branch 'test/twitter/util_controller' into 'develop'
tests for TwitterApi/UtilController

See merge request pleroma/pleroma!1509
2019-07-31 15:14:36 +00:00
Maksim 58443d0cd6 tests for TwitterApi/UtilController 2019-07-31 15:14:36 +00:00
rinpatch f42719506c Fix credo issues 2019-07-31 14:20:34 +03:00
rinpatch c88a5d3251 Merge branch 'develop' into feature/hide-follows-remote 2019-07-31 14:12:29 +03:00
kaniini 373a7c6739 Merge branch 'admin-changes' into 'develop'
Admin changes

See merge request pleroma/pleroma!1489
2019-07-30 16:36:05 +00:00
Alexander Strizhakov 51b3b6d816 Admin changes 2019-07-30 16:36:05 +00:00
kaniini 677df5ceb3 Merge branch 'security/remote-follow-commonapi' into 'develop'
twitter api: utils: rework do_remote_follow() to use CommonAPI

Closes #1138

See merge request pleroma/pleroma!1506
2019-07-29 20:10:59 +00:00
Ariadne Conill 3850812503 twitter api: utils: rework do_remote_follow() to use CommonAPI
Closes #1138
2019-07-29 20:00:57 +00:00
kaniini 6657506185 Merge branch 'revert-83508418' into 'develop'
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"

See merge request pleroma/pleroma!1505
2019-07-29 19:42:35 +00:00
kaniini 5835069215 Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
This reverts merge request !1504
2019-07-29 19:42:26 +00:00
Haelwenn 83508418fb Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'
markdown: clean up html generated by earmark

See merge request pleroma/pleroma!1504
2019-07-29 19:24:14 +00:00
Ariadne Conill 5795a890e9 markdown: clean up html generated by earmark 2019-07-29 19:09:58 +00:00
lain 1dfde4151c Merge branch 'refactor/use-constants' into 'develop'
refactoring: begin to use constants

See merge request pleroma/pleroma!1500
2019-07-29 16:30:47 +00:00
kaniini 3b8cd27b05 Merge branch 'mailer-enabled-nodeinfo' into 'develop'
Add `mailerEnabled` to the NodeInfo metadata

See merge request pleroma/pleroma!1502
2019-07-29 16:17:41 +00:00
Eugenij 0bee2131ce Add mailerEnabled to the NodeInfo metadata 2019-07-29 16:17:40 +00:00
kaniini 8be0154094 Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop'
Redirect not logged-in users to the MastoFE login page on private instances

Closes #1045

See merge request pleroma/pleroma!1503
2019-07-29 16:17:23 +00:00
Sergey Suprunenko c0e258cf21 Redirect not logged-in users to the MastoFE login page on private instances 2019-07-29 16:17:22 +00:00
kaniini 1f7c8d9615 Merge branch 'tests/ostatus_controller' into 'develop'
added tests for OstatusController

See merge request pleroma/pleroma!1501
2019-07-29 05:02:20 +00:00
Maksim 159bbec570 added tests for OstatusController 2019-07-29 05:02:20 +00:00
Ariadne Conill b93498eb52 constants: add as_public constant and use it everywhere 2019-07-29 02:43:19 +00:00
Ariadne Conill 9d78b3b281 mix: add ex_const dependency 2019-07-29 02:12:35 +00:00
kaniini b38d21060e Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop'
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users

Closes #1104

See merge request pleroma/pleroma!1498
2019-07-28 21:40:55 +00:00
Ariadne Conill 492d854e7a transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
Closes #1104
2019-07-28 21:32:04 +00:00
kaniini 44bfff22a7 Merge branch 'confirmation-resend' into 'develop'
add account confirmation email resend in mastodon api

See merge request pleroma/pleroma!1492
2019-07-28 20:30:10 +00:00
Sachin Joshi 242f5c585e add account confirmation email resend in mastodon api 2019-07-28 20:30:10 +00:00
kaniini 0d05ec3855 Merge branch 'fix/user_update_and_set_cache' into 'develop'
fixed User.update_and_set_cache for stale user

See merge request pleroma/pleroma!1493
2019-07-28 20:29:27 +00:00
Maksim 6a4b8b2681 fixed User.update_and_set_cache for stale user 2019-07-28 20:29:26 +00:00