3272 Commits (642a67dd4492f31b5b9fe457e34c1589c9d70c3f)

Author	SHA1	Message	Date
rinpatch	642a67dd44	Render polls in statuses	5 years ago
rinpatch	62e42b03ab	Handle incoming Question objects	5 years ago
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
feld	c953ae8c3d	Initial bundle of basic AdminFE ... Due to CSP headers we only allow connecting to self. If you want to host AdminFE on a separate domain without CSP headers you will be able to connect to any public Pleroma host.	5 years ago
rinpatch	1d78e42fd4	Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects	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
Maksim	799e1f48b5	Refactoring functions for dealing with oauth scopes.	5 years ago
kaniini	14deed7f7d	Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop' ... Optimize bookmarks by preloading them with activities Closes #861 See merge request pleroma/pleroma!1121	5 years ago
William Pitcock	d64c3b604e	twitterapi: use order constraint to force descending order	5 years ago
William Pitcock	6020ff3fb6	activitypub: add optional order constraint to timeline query builder	5 years ago
rinpatch	4c5125dedc	Remove `bookmarks` assoc and add a fake `bookmark` assoc instead	5 years ago
rinpatch	be067ec2ab	Use with_preloaded_bookmark in create_by_object_ap_id_with_object	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
rinpatch	06947c9147	Remove bookmarks assoc	5 years ago
kaniini	a1a0df19c4	Merge branch 'docs/MRF-modules' into 'develop' ... Documentation: MRF Modules See merge request pleroma/pleroma!1122	5 years ago
William Pitcock	e71ddf23ba	containment: remove pointless moduledoc line	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
Haelwenn (lanodan) Monnier	69a5074893	Remove H1 in @moduledoc	5 years ago
Haelwenn (lanodan) Monnier	e41a2f98d5	mrf/tag_policy.ex: Add some documentation ... mrf_tag:disable-remote-subscription exact way of working is quite unclear to me. Is it the requester that is denied if they have a tag, or is it the requestee if they have one?	5 years ago
Haelwenn (lanodan) Monnier	af62ace954	Add short documentation on every MRF Policy	5 years ago
lain	eb0fb73ddb	BBS: Credo fixes.	5 years ago
lain	c9d1cb2dce	BBS: Use cached user fetcher.	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
rinpatch	d089ff2460	Merge branch 'fix/embeded-relationship-in-follows' into 'develop' ... Fix embeded relationships in Mastodon API See merge request pleroma/pleroma!1118	5 years ago
Haelwenn (lanodan) Monnier	b5ad1715b2	MastoAPI: profile update with emoji_map	5 years ago
Haelwenn (lanodan) Monnier	46bbf9e1cf	TwitterAPI: profile update with emoji_map	5 years ago
Haelwenn (lanodan) Monnier	85434669bb	Web.TwitterAPI.UserView: Also view local user emojis	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	c42ded13a2	Credo fixes.	5 years ago
feld	acb04306b6	Standardize construction of websocket URL ... This follows up on the change made in d747bd98	5 years ago
lain	a0c755cc4a	MastodonApi: Bump api level.	5 years ago
lain	81d1aa424d	Streamer: Stream out Conversations/Participations.	5 years ago
rinpatch	38b79461df	Fix embeded relationships in Mastodon API ... Currently some endpoints render accounts without for user resulting in embedded relationship being empty. It causes bugs in followers/following tab in pleroma-fe but I fixed it for other endpoints as well just in case	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	533d8cd581	Parse access_token from body parameters and URL 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
rinpatch	51e26f14f7	Remove redundant ensure_scrubbed_html ... It is never used as handling for fake and non-fake activities was merged into one function above it	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