Ashlynn Anderson
|
04327721d7
|
Add .dockerignore
|
5 years ago |
|
Ashlynn Anderson
|
c86db959cb
|
Optimize Dockerfile
Just merging RUNs to decrease the number of layers
|
5 years ago |
|
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.
|
5 years ago |
|
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.
|
5 years ago |
|
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
|
5 years ago |
|
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]
|
5 years ago |
|
feld
|
5eec0abe09
|
Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'
Fix/mediaproxy whitelist base url
See merge request pleroma/pleroma!1486
|
5 years ago |
|
feld
|
d93d777915
|
Fix/mediaproxy whitelist base url
|
5 years ago |
|
Roman Chvanikov
|
9d4f34fbcb
|
Merge branch 'develop' into feature/digest-email
|
5 years ago |
|
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
|
5 years ago |
|
kaniini
|
1fe092e03c
|
Merge branch 'fix/semver-violations' into 'develop'
Fix Invalid SemVer version generation
See merge request pleroma/pleroma!1517
|
5 years ago |
|
rinpatch
|
955985fe2c
|
Merge branch 'cleanup-tests' into 'develop'
Clean up `AdminAPIControllerTest` output
See merge request pleroma/pleroma!1516
|
5 years ago |
|
rinpatch
|
81412240e6
|
Fix Invalid SemVer version generation
when the current branch does not have commits ahead of tag/checked out on a tag
|
5 years ago |
|
Egor Kislitsyn
|
f98235f2ad
|
Clean up tests output
|
5 years ago |
|
Egor Kislitsyn
|
9ca4506355
|
Add configurable length limits for `User.bio` and `User.name`
|
5 years ago |
|
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
|
5 years ago |
|
rinpatch
|
def0c49ead
|
Add a changelog entry for disallowing locked accounts follows over OStatus
|
5 years ago |
|
kaniini
|
6c06529cd4
|
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
|
5 years ago |
|
rinpatch
|
813c686dd7
|
Disallow following locked accounts over OStatus
|
5 years ago |
|
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
|
5 years ago |
|
Maksim
|
6eb33e7303
|
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
|
5 years ago |
|
kaniini
|
8980c1c769
|
Merge branch 'hardening/disallow-ostatus-downgrade' into 'develop'
ostatus: explicitly disallow protocol downgrade from activitypub
See merge request pleroma/pleroma!1511
|
5 years ago |
|
Ariadne Conill
|
f72e0b7cad
|
ostatus: explicitly disallow protocol downgrade from activitypub
This closes embargoed bug #1135.
|
5 years ago |
|
rinpatch
|
301ea0dc04
|
Add tests for counters being updated on follow
|
5 years ago |
|
kaniini
|
957de9d771
|
Merge branch 'test/twitter/util_controller' into 'develop'
tests for TwitterApi/UtilController
See merge request pleroma/pleroma!1509
|
5 years ago |
|
Maksim
|
58443d0cd6
|
tests for TwitterApi/UtilController
|
5 years ago |
|
rinpatch
|
f42719506c
|
Fix credo issues
|
5 years ago |
|
rinpatch
|
c88a5d3251
|
Merge branch 'develop' into feature/hide-follows-remote
|
5 years ago |
|
kaniini
|
373a7c6739
|
Merge branch 'admin-changes' into 'develop'
Admin changes
See merge request pleroma/pleroma!1489
|
5 years ago |
|
Alexander Strizhakov
|
51b3b6d816
|
Admin changes
|
5 years ago |
|
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
|
5 years ago |
|
Ariadne Conill
|
3850812503
|
twitter api: utils: rework do_remote_follow() to use CommonAPI
Closes #1138
|
5 years ago |
|
kaniini
|
6657506185
|
Merge branch 'revert-83508418' into 'develop'
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
See merge request pleroma/pleroma!1505
|
5 years ago |
|
kaniini
|
5835069215
|
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
This reverts merge request !1504
|
5 years ago |
|
Haelwenn
|
83508418fb
|
Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'
markdown: clean up html generated by earmark
See merge request pleroma/pleroma!1504
|
5 years ago |
|
Ariadne Conill
|
5795a890e9
|
markdown: clean up html generated by earmark
|
5 years ago |
|
lain
|
1dfde4151c
|
Merge branch 'refactor/use-constants' into 'develop'
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
|
5 years ago |
|
kaniini
|
3b8cd27b05
|
Merge branch 'mailer-enabled-nodeinfo' into 'develop'
Add `mailerEnabled` to the NodeInfo metadata
See merge request pleroma/pleroma!1502
|
5 years ago |
|
Eugenij
|
0bee2131ce
|
Add `mailerEnabled` to the NodeInfo metadata
|
5 years ago |
|
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
|
5 years ago |
|
Sergey Suprunenko
|
c0e258cf21
|
Redirect not logged-in users to the MastoFE login page on private instances
|
5 years ago |
|
kaniini
|
1f7c8d9615
|
Merge branch 'tests/ostatus_controller' into 'develop'
added tests for OstatusController
See merge request pleroma/pleroma!1501
|
5 years ago |
|
Maksim
|
159bbec570
|
added tests for OstatusController
|
5 years ago |
|
Ariadne Conill
|
b93498eb52
|
constants: add as_public constant and use it everywhere
|
5 years ago |
|
Ariadne Conill
|
9d78b3b281
|
mix: add ex_const dependency
|
5 years ago |
|
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
|
5 years ago |
|
Ariadne Conill
|
492d854e7a
|
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
Closes #1104
|
5 years ago |
|
kaniini
|
44bfff22a7
|
Merge branch 'confirmation-resend' into 'develop'
add account confirmation email resend in mastodon api
See merge request pleroma/pleroma!1492
|
5 years ago |
|
Sachin Joshi
|
242f5c585e
|
add account confirmation email resend in mastodon api
|
5 years ago |
|
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
|
5 years ago |
