aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-04-25Merge branch 'patch-1' into 'develop'eal
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
2018-04-24Merge branch 'gitignore' into 'develop'lambda
2018-04-24Fix formatting.lain
2018-04-24Add common files to gitignoreRachel H
2018-04-24Merge branch 'feature/message-rewrite-facility' into 'develop'lambda
2018-04-24Update .gitlab-ci.ymllambda
2018-04-24Changed to support \r\n and \nWim Vanderbauwhede
2018-04-24Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into developlain
2018-04-24Patch to replace newlines with <br> tags in bioWim Vanderbauwhede
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
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' in...lambda
2018-04-21Merge branch 'readme-update' into 'develop'lambda
2018-04-21Merge branch 'nginx-certbot-doc' into 'develop'lambda
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
2018-04-20Elaborate on setup steps and CLI commands.csaurus
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
2018-04-19Remove hack for /about/more as we are doing this in Pleroma nowMark Felder
2018-04-19TwitterAPI: Add Qvitter notification endpoint.eal
2018-04-19Merge branch 'patch-2' into 'develop'lambda
2018-04-19ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at t...nenolod@dereferenced.org
2018-04-19fix againlain
2018-04-19Fix generate configlain
2018-04-19Ignore setup_db.psql and ignore a folder for custom emojisDominik V. Salonen
2018-04-19Revert "Ask for proxy URL if proxy enabled."eal