summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-22Embed announce activity data instead of linking to itFrancis Dinh
2018-04-22Revert "Rename make_unannounce_data helper to make_undo_data"Francis Dinh
This reverts commit c649ca89586ec83407b298c20f51a25318d777b9.
2018-04-22Small cleanup.lain
2018-04-22Merge branch 'develop' into fix/note-count-not-updatinglain
2018-04-22Rename make_unannounce_data helper to make_undo_dataFrancis Dinh
This makes it a bit more easier to adapt for unlikes as well in the future.
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-20Use correct activity for undoFrancis Dinh
2018-04-20Fix federation of unreblog activityFrancis Dinh
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-20Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Francis Dinh
feature/unrepeats
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-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
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
2018-04-19Ignore setup_db.psql and ignore a folder for custom emojisDominik V. Salonen
Wiki page should also be updated to recommend that admins put their custom emojis in /priv/static/emoji/custom/. This both makes for less hassle when doing a pull. And also prevents more mess in the /priv/static/emoji/ folder.
2018-04-19Revert "Ask for proxy URL if proxy enabled."eal
The most common case is running it on the same server.
2018-04-19Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'lambda
CommonAPI post: kill \r with fire See merge request pleroma/pleroma!120
2018-04-18Fix TwitterAPI.delete callFrancis Dinh
2018-04-18CommonAPI post: kill \r with fireWilliam Pitcock
2018-04-18rm_user: also ensure that cache is running.eal
2018-04-18Merge branch 'fix/rm-user-task' into 'develop'lambda
Fix rm_user task. See merge request pleroma/pleroma!119
2018-04-18Fix rm_user task.eal