pleroma

Commit Graph

Author	SHA1	Message	Date
Hakaba Hitoyo	39c7bbe18f	Remove longfox emoji set	4 years ago
kaniini	b9497ead35	Merge branch 'develop' into 'develop' Fix a stale link and a few typos See merge request pleroma/pleroma!1529	4 years ago
Pierce McGoran	9b9453ceaf	Fix some typos and rework a few lines in howto_mediaproxy.md	4 years ago
Pierce McGoran	c10a3e035b	Update link in README.md	4 years ago
Ariadne Conill	cef3af5536	tasks: relay: add list task	4 years ago
kaniini	b1fb5b93ae	Merge branch 'bugfix/password-reset-link-styling' into 'develop' templates/layout/app.html.eex: Style anchors See merge request pleroma/pleroma!1527	4 years ago
Haelwenn (lanodan) Monnier	a035ab8c1d	templates/layout/app.html.eex: Style anchors [ci skip]	4 years ago
kaniini	86fffe9c27	Merge branch 'patch-2' into 'develop' Add preferredUsername to service actors so Mastodon can resolve them See merge request pleroma/pleroma!1526	4 years ago
Thibaut Girka	1fce56c7df	Refactor	4 years ago
Thibaut Girka	16cfb89240	Only add `preferredUsername` to service actor json when the underlying user actually has a username	4 years ago
kaniini	4ae0a6652f	Merge branch 'admin-fixes' into 'develop' Admin fixes See merge request pleroma/pleroma!1524	4 years ago
Alexander Strizhakov	de0f3b73dd	Admin fixes	4 years ago
kaniini	99ce6d6044	Merge branch 'fix/search-space-error' into 'develop' Remove spaces from the domain search Closes #1154 See merge request pleroma/pleroma!1521	4 years ago
Sergey Suprunenko	040347b248	Remove spaces from the domain search	4 years ago
kaniini	7319b41e34	Merge branch 'fix/with-reject-nil-clause' into 'develop' Handle MRF rejections of incoming AP activities Closes #1095 See merge request pleroma/pleroma!1520	4 years ago
Sergey Suprunenko	8b2fa31fed	Handle MRF rejections of incoming AP activities	4 years ago
kaniini	ba72d02f86	Merge branch 'official-docker-support' into 'develop' Add Dockerfile See merge request pleroma/pleroma!1523	4 years ago
Ashlynn Anderson	4007717534	Run mix format	4 years ago
Thibaut Girka	a187dbb326	Add preferredUsername to service actors so Mastodon can resolve them	4 years ago
Ashlynn Anderson	04327721d7	Add .dockerignore	4 years ago
Ashlynn Anderson	c86db959cb	Optimize Dockerfile Just merging RUNs to decrease the number of layers	4 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.	4 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.	4 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	4 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]	4 years ago
feld	5eec0abe09	Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop' Fix/mediaproxy whitelist base url See merge request pleroma/pleroma!1486	4 years ago
feld	d93d777915	Fix/mediaproxy whitelist base url	4 years ago
Roman Chvanikov	9d4f34fbcb	Merge branch 'develop' into feature/digest-email	4 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	4 years ago
kaniini	1fe092e03c	Merge branch 'fix/semver-violations' into 'develop' Fix Invalid SemVer version generation See merge request pleroma/pleroma!1517	4 years ago
rinpatch	955985fe2c	Merge branch 'cleanup-tests' into 'develop' Clean up `AdminAPIControllerTest` output See merge request pleroma/pleroma!1516	4 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	4 years ago
Egor Kislitsyn	f98235f2ad	Clean up tests output	4 years ago
Egor Kislitsyn	9ca4506355	Add configurable length limits for `User.bio` and `User.name`	4 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	4 years ago
rinpatch	def0c49ead	Add a changelog entry for disallowing locked accounts follows over OStatus	4 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	4 years ago
rinpatch	813c686dd7	Disallow following locked accounts over OStatus	4 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	4 years ago
Maksim	6eb33e7303	test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id	4 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	4 years ago
Ariadne Conill	f72e0b7cad	ostatus: explicitly disallow protocol downgrade from activitypub This closes embargoed bug #1135.	4 years ago
rinpatch	301ea0dc04	Add tests for counters being updated on follow	4 years ago
kaniini	957de9d771	Merge branch 'test/twitter/util_controller' into 'develop' tests for TwitterApi/UtilController See merge request pleroma/pleroma!1509	4 years ago
Maksim	58443d0cd6	tests for TwitterApi/UtilController	4 years ago
rinpatch	f42719506c	Fix credo issues	4 years ago
rinpatch	c88a5d3251	Merge branch 'develop' into feature/hide-follows-remote	4 years ago
kaniini	373a7c6739	Merge branch 'admin-changes' into 'develop' Admin changes See merge request pleroma/pleroma!1489	4 years ago
Alexander Strizhakov	51b3b6d816	Admin changes	4 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

1 2 3 4 5 ...

6281 Commits (3315a2a1c3cae3375bbb1c7112b2c75563f3a4af) All Branches Search

6281 Commits (3315a2a1c3cae3375bbb1c7112b2c75563f3a4af)

All Branches