aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2018-04-05Delete Caddyfilelambda
2018-04-05Merge branch 'develop' into 'develop'lambda
2018-04-05Fix failure to serve media from custom upload pathRX14
2018-04-04TwitterAPI: Don't put follows into the public tls.lain
2018-04-04Handle + in links.lain
2018-04-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-03Use user url in mention if we have it.lain
2018-04-02Merge branch 'mastofe-5edce2030238293463c041537da4aaeea5cb3875' into 'develop'lambda
2018-04-02Bring mastofe up to dateMorgan Bazalgette
2018-04-02Load all users at once in timelines.lain
2018-04-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-02Use context_ids directly if we have them.lain
2018-04-02Generates contexts and ids on insertion time.lain
2018-04-02Pre-fetch conversation ids.lain
2018-04-02Merge branch 'fix-107' into 'develop'lambda
2018-04-02Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain
2018-04-02Fail faster.lain
2018-04-02Fix some test stuff.lain
2018-04-02Add mock.lain
2018-04-02masto api: run emojis through mediaproxyMorgan Bazalgette
2018-04-01Respond to proper ActivityPub type.lain
2018-04-01Merge branch 'mastofe-f48f11d4' into 'develop'lambda
2018-04-01update mastofeMorgan Bazalgette
2018-04-01Merge branch 'feature/cors' into 'develop'lambda
2018-04-01Merge branch 'feature/mastodon-search-tags' into 'develop'lambda
2018-04-01Merge branch 'feature/upload-limit' into 'develop'lambda
2018-04-01mastodon search api: implement a reasonable hashtags stubWilliam Pitcock
2018-04-01nginx: document how to enable CORS supportWilliam Pitcock
2018-03-31config: make the upload limit configurableWilliam Pitcock