5214 Commits (3cc00fd2e9924e2c05bda3eb198881046e85f709)

 

All Branches   

Search

Author	SHA1	Message	Date
William Pitcock	ef52aa0e66	tests: fix up for changed bbcode library output and verify html is properly escaped	5 years ago
William Pitcock	501af917b5	add support for bbcode	5 years ago
William Pitcock	2bd880be88	mix: add bbcode dependency	5 years ago
lambda	4de5fef1f8	Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' ... Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059	5 years ago
kaniini	48f68fd133	Merge branch 'feature/mastoapi-new-config' into 'develop' ... Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093	5 years ago
kaniini	fd45c74e6f	Merge branch 'chore/update-changelog' into 'develop' ... update Changelog See merge request pleroma/pleroma!1096	5 years ago
William Pitcock	99b0792751	update Changelog	5 years ago
kaniini	5b2791698c	Merge branch 'feature/mediaproxy-whitelist' into 'develop' ... Add mediaproxy whitelist capability Closes #837 See merge request pleroma/pleroma!1095	5 years ago
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	5 years ago
Haelwenn	8c9227c1f1	Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop' ... activitypub: transmogrifier: send reject follow if following does not succeed See merge request pleroma/pleroma!1094	5 years ago
rinpatch	dfc8425659	Move settings to Source subentity	5 years ago
Alex S	a825056d4d	test fixes	5 years ago
Alex S	85953c0836	fixes for tests	5 years ago
Alex S	229ce6abbc	migration without using old field name ... removing old field from db, after bookmarks migration	5 years ago
Alex S	3c2ae80008	unused	5 years ago
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	5 years ago
Alex S	58711a79d0	removing useless transaction	5 years ago
Alex S	6322c1e123	migration optimization ... changelog wording	5 years ago
Alex S	17b5b78737	changelog file update	5 years ago
Alex S	1258128f4f	favourites add bookmark display	5 years ago
Alex S	324c9c8ab5	migrate user.bookmarks to separate table	5 years ago
Alex S	73d01857e3	bookmarks in separate table	5 years ago
William Pitcock	0fd0ffcd76	activitypub: transmogrifier: send reject follow if following does not succeed	5 years ago
rinpatch	4baea6e6d9	Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API ... This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs	5 years ago
Sachin Joshi	963d5774af	fix the status notification with special char	5 years ago
kaniini	030a7876b4	Merge branch 'security/fix-html-class-scrubbing' into 'develop' ... html: lock down allowed class attributes to only those related to microformats See merge request pleroma/pleroma!1090	5 years ago
William Pitcock	f5535e5743	html: lock down allowed class attributes to only those related to microformats	5 years ago
kaniini	3789945784	Merge branch 'feature/users-favourites-timeline-endpoint' into 'develop' ... Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789) Closes #789 See merge request pleroma/pleroma!1056	5 years ago
Sergey Suprunenko	9dd36e5bcb	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	5 years ago
kaniini	10c40e13d2	Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop' ... Add `in_reply_to_account_acct` to MastoAPI status entity See merge request pleroma/pleroma!1086	5 years ago
kaniini	aa9d378985	Merge branch 'fix/normalize-activities' into 'develop' ... Normalize acitvities instead of objects inside them See merge request pleroma/pleroma!1085	5 years ago
kaniini	7dcac0bac0	Merge branch 'develop' into 'develop' ... Add shortcode_globs setting to documentation See merge request pleroma/pleroma!1087	5 years ago
kaniini	414902cd9e	Merge branch 'add-healthcheck-setting-to-config' into 'develop' ... added healthcheck setting to instance config See merge request pleroma/pleroma!1088	5 years ago
ilja	74ef14b04e	Add :emoji settings to config.md	5 years ago
Alex S	d35246c449	added healthcheck setting to instance config	5 years ago
ilja	c876b04aeb	Add shortcode_globs setting to documentation	5 years ago
rinpatch	f4c9b79306	Add a changelog entry for `pleroma.in_reply_to_account_acct`	5 years ago
rinpatch	f60d072bbb	Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity	5 years ago
rinpatch	d21d921def	Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading	5 years ago
rinpatch	20deff75f1	Merge branch 'fix/emoji-task-docs' into 'develop' ... Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix task docs See merge request pleroma/pleroma!1084	5 years ago
rinpatch	952a4ae68e	Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix ... task docs	5 years ago
kaniini	0b6d1d920e	Merge branch 'get-cached-everywhere' into 'develop' ... Use `User.get_cached*` everywhere See merge request pleroma/pleroma!1021	5 years ago
Egor	b9cdf6d3b9	Use `User.get_cached*` everywhere	5 years ago
kaniini	05862ded7a	Merge branch 'feature/826-healthcheck-endpoint' into 'develop' ... Feature/826 healthcheck endpoint Closes #826 See merge request pleroma/pleroma!1083	5 years ago
Alexander Strizhakov	88f0be9693	Feature/826 healthcheck endpoint	5 years ago
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
kaniini	7fcbda702e	Merge branch 'rework-emoji-management' into 'develop' ... Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073	5 years ago
Ekaterina Vaartis	3cefdc62e0	Fix emoji.txt / custom_emoji.txt / shortcode_globs handling	5 years ago
rinpatch	6c0e07b8bd	Merge branch 'docs/posting_formatted' into 'develop' ... differences_in_mastoapi_responses.md: `content_type` parameter of post submission See merge request pleroma/pleroma!1081	5 years ago
Ekaterina Vaartis	ba19ba8a88	Formatting	5 years ago