summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-07-12Merge branch 'bugfix/activitypub-object-actor' into 'develop'lambda
2018-07-12Merge branch 'feature/message-summary' into 'develop'lambda
2018-07-12activitypub: more robustly handle object-to-actor associationsWilliam Pitcock
2018-07-12formattingWilliam Pitcock
2018-07-12testsuite: twitter api: add summary where necessaryWilliam Pitcock
2018-07-12twitter api: activity representer: add summary field for testsuiteWilliam Pitcock
2018-07-12twitter api: refactor activity html generation, add support for ArticlesWilliam Pitcock
2018-07-12twitterapi: activity view: expose message summary textWilliam Pitcock
2018-07-12Merge branch 'feature/default-scope' into 'develop'lambda
2018-07-12Merge branch 'feature/article-support' into 'develop'lambda
2018-07-12Merge branch 'feature/auto-shortcodes' into 'develop'lambda
2018-07-12Merge branch 'bugfix/status-url-field' into 'develop'lambda
2018-07-12Merge branch 'bugfix/x509-public-key' into 'develop'lambda
2018-07-12activitypub: switch to using x509 representation for public keys instead of p...William Pitcock
2018-07-12[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statusesHaelwenn (lanodan) Monnier
2018-06-30Fix auto-shortcode emojiJorty
2018-06-30Move emoji glob setting to config.exsJorty
2018-06-30Allow emojis to be added automaticallyJorty
2018-06-27activity interpretation: formattingWilliam Pitcock
2018-06-27twitter api: use ActivityView.render_content() where appropriate instead of d...William Pitcock
2018-06-27mastodon api: add interpreter for Article activity typesWilliam Pitcock
2018-06-27twitter api: refactor activity html generation, add support for ArticlesWilliam Pitcock
2018-06-27utils: make_create_data: add support for Article objectsWilliam Pitcock
2018-06-27transmogrifier: accept Article activitiesWilliam Pitcock
2018-06-27tests: add default_scope where appropriateWilliam Pitcock
2018-06-27twitter api: allow setting default_scopeWilliam Pitcock
2018-06-27twitter api: user view: show default message scope if knownWilliam Pitcock
2018-06-27mastodon api: use info["default_scope"] if available for post scopeWilliam Pitcock
2018-06-27Merge branch 'features/initial-state_rights' into 'develop'lambda
2018-06-26[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_stateHaelwenn (lanodan) Monnier
2018-06-25Merge branch 'fix/mutes.json-emptyarray' into 'develop'lambda
2018-06-25Merge branch 'feature/configurable-blocks' into 'develop'lambda
2018-06-24combined outgoing_blocks with statementsquidboi
2018-06-24mix formatVivian Lim
2018-06-24Merge branch 'feature/application-xml-mime' into 'develop'lambda
2018-06-24Merge branch 'features/glitch-soc-frontend' into 'develop'lambda
2018-06-23return unquoted empty array from /api/qvitter/mutes.jsonVivian Lim
2018-06-23fixes- found that TwitterAPI.Controller adds .json suffix alreadyVivian Lim
2018-06-23return empty array for api/qvitter/mutes.json queries instead of htmlVivian Lim
2018-06-23fix mind-crushingly dumb syntax errorsquidboi
2018-06-23change moved attributes into normal variablessquidboi
2018-06-23move configurable module attributes into relevant functionssquidboi
2018-06-23[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_to...Haelwenn (lanodan) Monnier
2018-06-23[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/searchHaelwenn (lanodan) Monnier
2018-06-23Fake 2.4.0 APIHaelwenn (lanodan) Monnier
2018-06-23lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix formatHaelwenn (lanodan) Monnier
2018-06-21Merge branch 'feature/mrf-simple-accept-lists' into 'develop'lambda
2018-06-19mrf simple: add accept listsWilliam Pitcock
2018-06-19Merge branch 'features/column_media_streaming' into 'develop'lambda
2018-06-19Merge branch 'bugfix/block-follow-relationships' into 'develop'lambda