summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-21Update README.mdlambda
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-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-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-17update frontendlain
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.
2018-04-10Merge branch 'patch-1' into 'develop'lambda
Indentation for Apache vhost See merge request pleroma/pleroma!105
2018-04-10Indentation for Apache vhostStanislas
2018-04-09Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ecMorgan Bazalgette
2018-04-09Merge branch 'bugfix/user-search-with-at-sign' into 'develop'lambda
user: strip leading @ from user query when searching for users if present Closes #117 See merge request pleroma/pleroma!99
2018-04-09Merge branch 'develop' into 'develop'lambda
Fix max upload size in nginx config. See merge request pleroma/pleroma!102
2018-04-09user: strip leading @ from user query when searching for users if presentWilliam Pitcock
closes #117
2018-04-09Merge branch 'develop' into 'develop'lambda
Apache config for everything on one host. See merge request pleroma/pleroma!103
2018-04-08Apache config for everything on one host. nepfag
2018-04-08Fix max upload size in nginx config.Hector A. Escobedo
The built-in nginx default does not allow users to upload images larger than 1 MB. This increases the maximum request size to match the default Pleroma config upload_limit parameter. Some helpful comments were also added.
2018-04-08Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'lambda
mastodon api emulation improvements for tootstream Closes #101 See merge request pleroma/pleroma!100
2018-04-08Merge branch 'fix/persisted-mastofe-settings' into 'develop'lambda
MastoAPI: Persist frontend timelines and settings. Closes #113 See merge request pleroma/pleroma!98
2018-04-07mastodon api: report version as the Mastodon API version supported with the ↵William Pitcock
real version in parenthesis
2018-04-07mastodon api: implement /api/v1/lists stubWilliam Pitcock
2018-04-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 09:59:57 +0000