summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-28Merge branch 'fix/blocked-user-boosts' into 'develop'lambda
ActivityPub.ex: do not return boosted statuses from blocked users. See merge request pleroma/pleroma!111
2018-04-27Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'lambda
ActivityPub MRF SimplePolicy: fix media stripping See merge request pleroma/pleroma!133
2018-04-26Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-26Resurrect instance specific panel.lain
2018-04-25ActivityPub MRF SimplePolicy: fix media strippingWilliam Pitcock
2018-04-25Merge branch 'patch-1' into 'develop'eal
Fix typo in MastoFE login page. See merge request pleroma/pleroma!132
2018-04-25Optionally deactivate public timelines.lain
2018-04-25Align local bio limits to remote limit.lain
2018-04-24Fix typo in MastoFE login page. Normandy
see https://git.pleroma.social/pleroma/mastofe/issues/13
2018-04-24Merge branch 'gitignore' into 'develop'lambda
Gitignore See merge request pleroma/pleroma!131
2018-04-24Fix formatting.lain
2018-04-24Add common files to gitignoreRachel H
2018-04-24Merge branch 'feature/message-rewrite-facility' into 'develop'lambda
message rewrite facility See merge request pleroma/pleroma!112
2018-04-24Update .gitlab-ci.ymllambda
2018-04-24Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into developlain
2018-04-24Correct syntax with mix formatDashie
2018-04-24Add User.decrease_note_count and call it from ActivityPub.deleteDashie
2018-04-24Merge branch 'favicon_tag' into 'develop'lambda
Fix endpoint for favicon See merge request pleroma/pleroma!84
2018-04-23update frontendlain
2018-04-23update frontendlain
2018-04-22Small cleanup.lain
2018-04-22Merge branch 'develop' into fix/note-count-not-updatinglain
2018-04-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-21Formatter: Use proper escaping for links.lain
2018-04-21Update note count in ActivityPub.create.eal
2018-04-21Merge branch '146-enable-custom-panel-by-default-and-have-default-content' ↵lambda
into 'develop' Resolve "Enable custom panel by default and have default content" Closes #146 See merge request pleroma/pleroma!124
2018-04-21Merge branch 'readme-update' into 'develop'lambda
Elaborate on setup steps and CLI commands. See merge request pleroma/pleroma!126
2018-04-21Merge branch 'nginx-certbot-doc' into 'develop'lambda
Add info about certbot with the webroot plugin to pleroma.nginx See merge request pleroma/pleroma!125
2018-04-21Update README.mdlambda
2018-04-21Formatting fixes.lain
2018-04-21add formatterlain
2018-04-21.lain
2018-04-21.lain
2018-04-21..lain
2018-04-21Update CI.lain
2018-04-21Make search use id index too.lain
Seems to be faster in general, query planner chooses well.
2018-04-20Elaborate on setup steps and CLI commands.csaurus
* How to use MIX_ENV * How to create a user * Link to certbot's site with the webform which advises how to obtain a certificate based on web server/OS.
2018-04-20Add info about certbot with the webroot plugin to pleroma.nginxcsaurus
2018-04-20formattingKawen
2018-04-20enable instance panel by default, added some contentKawen
2018-04-20Formatting.lain
2018-04-20Add format checking to CI.lain
2018-04-19Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-19fix againlain
2018-04-19Merge branch 'feature/qvitter-notification-endpoint' into 'develop'lambda
TwitterAPI: Add Qvitter notification endpoint. Closes #142 See merge request pleroma/pleroma!123
2018-04-19TwitterAPI: Add Qvitter notification endpoint.eal
2018-04-19Merge branch 'patch-2' into 'develop'lambda
Ignore setup_db.psql and specify a folder for custom emojis See merge request pleroma/pleroma!121
2018-04-19ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at ↵nenolod@dereferenced.org
the right object (the child in this case)
2018-04-19fix againlain
2018-04-19Fix generate configlain
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-22 17:43:42 +0000