aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2018-04-19Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'lambda
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
2018-04-18Fix rm_user task.eal
2018-04-18Merge branch 'fix/login-with-username-or-email' into 'develop'lambda
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
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
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
2018-04-11Update httpoison to get the latest hackney.Mark Felder
2018-04-10Fix register_user task.lain
2018-04-10Order masto searches by date.lain
2018-04-10Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'lambda
2018-04-10Merge branch 'feld-varnish' into 'develop'lambda
2018-04-10Remove attempted caching of tootsMark Felder
2018-04-10Merge branch 'patch-1' into 'develop'lambda
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
2018-04-09Merge branch 'develop' into 'develop'lambda
2018-04-09user: strip leading @ from user query when searching for users if presentWilliam Pitcock
2018-04-09Merge branch 'develop' into 'develop'lambda
2018-04-08Apache config for everything on one host. nepfag
2018-04-08Fix max upload size in nginx config.Hector A. Escobedo
2018-04-08Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'lambda
2018-04-08Merge branch 'fix/persisted-mastofe-settings' into 'develop'lambda
2018-04-07mastodon api: report version as the Mastodon API version supported with the r...William Pitcock
2018-04-07mastodon api: implement /api/v1/lists stubWilliam Pitcock
2018-04-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-07Only search in public data for now.lain
2018-04-07Update Readme.lain
2018-04-07MastoAPI: Persist frontend timelines and settings.eal
2018-04-07Merge branch 'bugfix/html-webfinger-host-meta' into 'develop'lambda
2018-04-07Merge branch 'fix/follow-import-by-uri' into 'develop'lambda
2018-04-07Follow import: allow URI in addition to screen_name.eal
2018-04-06XML: use try/catch with XPath functionsWilliam Pitcock
2018-04-06Accept port number in urls.lain
2018-04-05MastodonAPI search: return only create activities.lain