aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-05Pleroma Conversations API: Add a way to set recipients.lain
2019-08-05Update CHANGELOGEgor Kislitsyn
2019-08-04Merge branch 'report-email-from-remote-user' into 'develop'kaniini
Remove Reply-To from report emails Closes #1141 See merge request pleroma/pleroma!1531
2019-08-04Remove Reply-To from report emailsEugenij
2019-08-04Merge branch 'feature/relay-list-task' into 'develop'kaniini
tasks: relay: add list task Closes #1101 See merge request pleroma/pleroma!1528
2019-08-04Merge branch 'fix/wrong-next-key-likes-json' into 'develop'kaniini
Do not add the "next" key to likes.json if there is no more items See merge request pleroma/pleroma!1530
2019-08-04Do not add the "next" key to likes.json if there is no more itemsSergey Suprunenko
2019-08-04Merge branch 'patch-2' into 'develop'kaniini
Replace "impode" with "implode" See merge request pleroma/pleroma!1532
2019-08-04Replace "impode" with "implode" forx0rz3q
2019-08-04Merge branch 'remove-longfox-emoji-set' into 'develop'kaniini
Remove longfox emoji set See merge request pleroma/pleroma!1525
2019-08-04Remove longfox emoji setHakaba Hitoyo
2019-08-04Merge branch 'develop' into 'develop'kaniini
Fix a stale link and a few typos See merge request pleroma/pleroma!1529
2019-08-04Fix some typos and rework a few lines in howto_mediaproxy.mdPierce McGoran
2019-08-04Update link in README.mdPierce McGoran
2019-08-03tasks: relay: add list taskAriadne Conill
2019-08-03Merge branch 'bugfix/password-reset-link-styling' into 'develop'kaniini
templates/layout/app.html.eex: Style anchors See merge request pleroma/pleroma!1527
2019-08-03templates/layout/app.html.eex: Style anchorsHaelwenn (lanodan) Monnier
[ci skip]
2019-08-03Merge branch 'patch-2' into 'develop'kaniini
Add preferredUsername to service actors so Mastodon can resolve them See merge request pleroma/pleroma!1526
2019-08-03RefactorThibaut Girka
2019-08-03Only add `preferredUsername` to service actor json when the underlying user ↵Thibaut Girka
actually has a username
2019-08-03Merge branch 'admin-fixes' into 'develop'kaniini
Admin fixes See merge request pleroma/pleroma!1524
2019-08-03Admin fixesAlexander Strizhakov
2019-08-03Merge branch 'fix/search-space-error' into 'develop'kaniini
Remove spaces from the domain search Closes #1154 See merge request pleroma/pleroma!1521
2019-08-03Remove spaces from the domain searchSergey Suprunenko
2019-08-03Merge branch 'fix/with-reject-nil-clause' into 'develop'kaniini
Handle MRF rejections of incoming AP activities Closes #1095 See merge request pleroma/pleroma!1520
2019-08-03Handle MRF rejections of incoming AP activitiesSergey Suprunenko
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 preferredUsername to service actors so Mastodon can resolve themThibaut Girka
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-02Pleroma API: Add endpoint to get conversation statuses.lain
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 'develop' into feature/digest-emailRoman Chvanikov
2019-08-02CommonAPI: Extend api with conversation replies.lain
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-02Conversations: Add recipient list to conversation participation.lain
This enables to address the same group of people every time.
2019-08-01Merge branch 'fix/semver-violations' into 'develop'kaniini
Fix Invalid SemVer version generation See merge request pleroma/pleroma!1517
2019-08-01nothinglain
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-08-01Add configurable length limits for `User.bio` and `User.name`Egor 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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:12:57 +0000