summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-20Use correct activity for undoFrancis Dinh
2018-04-20Fix federation of unreblog activityFrancis Dinh
2018-04-20Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into ↵Francis Dinh
feature/unrepeats
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-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
2018-04-18Merge branch 'fix/login-with-username-or-email' into 'develop'lambda
MastoAPI and OAuth: allow login with either email or username. See merge request pleroma/pleroma!118
2018-04-18MastoAPI and OAuth: allow login with either email or username.eal
2018-04-18Handle unrepeats via the TwitterAPIFrancis Dinh
2018-04-18Expose unannounce activity so that it can be testedFrancis Dinh
2018-04-17Add federation for unrepeatsFrancis Dinh
2018-04-17update frontendlain
2018-04-17Add make_unannounce_data helper functionFrancis Dinh
2018-04-17Remove unretweet function for nowFrancis Dinh
2018-04-16Return target status in MastoAPI endpoint instead of reblog activityFrancis Dinh
2018-04-16doc fixesFrancis Dinh
2018-04-14Add unreblogging testsFrancis Dinh
2018-04-14Add unrepeat functionalityFrancis Dinh
2018-04-13Update README.mdlambda
2018-04-13Merge branch 'mix_task_rm_user' into 'develop'lambda
Add rm_user mix task See merge request pleroma/pleroma!109
2018-04-12Switch to User.delete for rm_user taskPhenethylamine
2018-04-12Add rm_user mix taskPhenethylamine
2018-04-11Merge branch 'develop' into 'develop'lambda
Fix issue #124 Closes #124 See merge request pleroma/pleroma!108
2018-04-11update frontendlain
2018-04-11update frontendlain
2018-04-11OopsGian Sass
2018-04-11Add unit test for pinned statusesGian Sass
2018-04-11Fix issue #124Gian Sass
2018-04-11Merge branch 'feld-hackneyupdate' into 'develop'lambda
Update httpoison to get the latest hackney. See merge request pleroma/pleroma!107
2018-04-11Update httpoison to get the latest hackney.Mark Felder
Works on my computer ^TM
2018-04-10Fix register_user task.lain
2018-04-10Order masto searches by date.lain
2018-04-10Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'lambda
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec See merge request pleroma/pleroma!104
2018-04-10Merge branch 'feld-varnish' into 'develop'lambda
Remove attempted caching of toots See merge request pleroma/pleroma!106
2018-04-10Remove attempted caching of tootsMark Felder
This does not work as expected. We should not attempt to be clever here. Varnish will do the right thing if we just teach Pleroma to set headers properly for content we know can be cached.