1655 Commits (55fa4b812a30feddc0c60d7ade03d50193871d22)

Author	SHA1	Message	Date
kaniini	131f883207	Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop' ... Fix get_in_reply_to in OStatus' activity representer depending on embedded objects See merge request pleroma/pleroma!1129	5 years ago
Sachin Joshi	f01f995816	make url uniform in admin api	5 years ago
Francis Dinh	2a54e8c1f5	Use "repeated" instead of "retweeted" for repeated statuses in Twitter API ... This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533	5 years ago
rinpatch	e4523c3010	Fix get_in_reply_to in OStatus' activity representer depending on embedded objects	5 years ago
Alexander Strizhakov	bfeb33e951	Merge develop ... Merge conflict in lib/pleroma/activity.ex	5 years ago
rinpatch	4c5125dedc	Remove `bookmarks` assoc and add a fake `bookmark` assoc instead	5 years ago
rinpatch	3a7c14645e	- Actually use preloaded bookmarks in views ... - Preload bookmarks in bookmark timeline - Rework bookmark preload tests	5 years ago
rinpatch	f841eb7cdb	Preload bookmarks wherever the object is preloaded	5 years ago
lambda	238dd72fad	Merge branch 'conversations_three' into 'develop' ... Conversations once more. See merge request pleroma/pleroma!1119	5 years ago
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	5 years ago
lambda	aacac9da0b	Merge branch 'feature/bbs' into 'develop' ... BBS / SSH See merge request pleroma/pleroma!997	5 years ago
Alexander Strizhakov	ce6ca0fefe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	5 years ago
lain	eb0fb73ddb	BBS: Credo fixes.	5 years ago
lain	c58fd4c038	BBS: Fix tests.	5 years ago
lain	4c76f49e60	BBS: small fixes.	5 years ago
lain	6ad8ddfd29	Merge remote-tracking branch 'origin/develop' into feature/bbs	5 years ago
Haelwenn (lanodan) Monnier	b5ad1715b2	MastoAPI: profile update with emoji_map	5 years ago
Haelwenn (lanodan) Monnier	2f76a40d02	formatter.ex: Add get_emoji_map/1	5 years ago
Haelwenn (lanodan) Monnier	d70af32127	Pleroma.User: remove emojify on parse_bio	5 years ago
Haelwenn (lanodan) Monnier	85b5c60694	Pleroma.Formatter: width/height to class=emoji	5 years ago
lain	81d1aa424d	Streamer: Stream out Conversations/Participations.	5 years ago
lambda	497d34b825	Merge branch 'iss-849' into 'develop' ... Parse access_token from body parameters and URL parameters See merge request pleroma/pleroma!1103	5 years ago
AkiraFukushima	a53a6c9d64	Add oauth plug tests for url and body parameters	5 years ago
Roman Chvanikov	8af55728e4	Fix tests	5 years ago
lain	45f790becc	Merge remote-tracking branch 'origin/develop' into conversations_three	5 years ago
Maksim	c854bff8f5	Refactored Pleroma.Web.Auth.Authenticator	5 years ago
lambda	0bcdaf378e	Merge branch 'bugfix/web-notification-special-char' into 'develop' ... fix the web push notification with special char for status created See merge request pleroma/pleroma!1092	5 years ago
Alex S	f11e7037c2	test fixes	5 years ago
Sachin Joshi	cd6da3606b	Merge branch 'develop' into bugfix/web-notification-special-char	5 years ago
lain	b0951a8849	WebPush: Use Object.normalize, rewrite tests so they test reality.	5 years ago
rinpatch	0fd176b990	Merge branch 'fix/add-default-scope-mastoapi' into 'develop' ... Add default_scope to /api/v1/update_credentials See merge request pleroma/pleroma!1100	5 years ago
kaniini	292c69481b	Merge branch 'regression/rights-only-for-admin' into 'develop' ... Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators See merge request pleroma/pleroma!1102	5 years ago
rinpatch	61ca2f7a4e	Fix `rights` in TwitterAPI's user entity being present only for ... Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.	5 years ago
rinpatch	ce3789e39a	Add default_scope to /api/v1/update_credentials	5 years ago
rinpatch	c3e9fcf098	Fix bookmarks depending on embeded object and move checking if the ... status is bookmarked to SQL	5 years ago
kaniini	002ea343f8	Merge branch 'feature/bbcode' into 'develop' ... BBCode support (backend) See merge request pleroma/pleroma!1097	5 years ago
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
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
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	5 years ago
rinpatch	dfc8425659	Move settings to Source subentity	5 years ago
Alex S	85953c0836	fixes for tests	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
Sergey Suprunenko	9dd36e5bcb	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	5 years ago