3124 Commits (a9e75fa6a4ede24fbd4549d4deb06edf368e7c52)

Author	SHA1	Message	Date
Egor Kislitsyn	9ce928d823	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
lain	4cab98b7bf	Merge remote-tracking branch 'origin/develop' into explicit-addressing	5 years ago
William Pitcock	37a4ba0624	utils: access inReplyTo as an explicit string when fetching poll results`	5 years ago
Maksim Pechnikov	4f2e359687	Merge branch 'develop' into issue/941	5 years ago
William Pitcock	1c6cf0a348	nodeinfo: add pollLimits to metadata	5 years ago
kaniini	9f0d0d0805	Merge branch 'feature/mrf-subchain' into 'develop' ... MRF: subchain policy See merge request pleroma/pleroma!1233	5 years ago
kaniini	9d2563a3de	Merge branch 'generic-fe-settings' into 'develop' ... Generic settings store for frontend user settings See merge request pleroma/pleroma!1221	5 years ago
Roman Chvanikov	3e17610587	Add task to test emails	5 years ago
Mark Felder	6ef145b4fc	Merge branch 'develop' into feature/digest-email	5 years ago
Maksim Pechnikov	f13d6c7f78	update api to set skip_thread_containment	5 years ago
eugenijm	f2c4c99e03	Remove repeated scope lists	5 years ago
lain	80d4d83aac	CommonAPI: Add explicit addressing.	5 years ago
eugenijm	243d8ed94e	Use workaround for the heavy checkmark symbol in iOS	5 years ago
Mark Felder	f4e2595592	Merge branch 'develop' into update-oauth-template	5 years ago
Maksim Pechnikov	080e1aa70e	add option skip_thread_containment	5 years ago
rinpatch	dc91bcc0af	Merge branch 'develop' into feature/polls-2-electric-boogalo	5 years ago
lambda	314758c25b	Merge branch 'align-mastodon-conversations' into 'develop' ... Mastodon Conversations API: Align to Mastodon behavior See merge request pleroma/pleroma!1215	5 years ago
rinpatch	026b245dbc	Merge branch 'develop' into feature/polls-2-electric-boogalo	5 years ago
rinpatch	5bd41fef8b	Change query order in fetch_activities_for_context_query to make poll vote exclusion work	5 years ago
rinpatch	1fd8e19d76	Remove a TODO comment as the tests for poll view were written	5 years ago
rinpatch	2fe3a20638	Make error message about author's inability to vote more sensible	5 years ago
rinpatch	e3c460353d	Refresh the object in CommonAPI.vote instead of MastoAPI controller	5 years ago
William Pitcock	561a21986d	formatting	5 years ago
William Pitcock	4087ccdab8	mrf: add subchain policy	5 years ago
William Pitcock	edf772d41e	mrf: allow a policy chain to be specified when filtering	5 years ago
kaniini	5402d04e3c	Merge branch 'feature/notification-control-part-2' into 'develop' ... notification controls, part 2 See merge request pleroma/pleroma!1204	5 years ago
rinpatch	6bc9e5c020	Mastodon API: Refresh the object before rendering it after voting	5 years ago
rinpatch	444406167b	Mastodon API: actually check for poll votes	5 years ago
rinpatch	65db5e9f52	Resolve merge conflicts	5 years ago
rinpatch	300d94c628	Add poll votes ... Also in this commit by accident: - Fix query ordering causing exclude_poll_votes to not work - Do not create notifications for Answer objects	5 years ago
kaniini	e706b42f51	Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop' ... visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility See merge request pleroma/pleroma!1230	5 years ago
Sergey Suprunenko	2bbc2a801f	Remove all follower collections but actor's from "cc"	5 years ago
William Pitcock	f2efe24cf8	visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility	5 years ago
Haelwenn (lanodan) Monnier	5d3ece2861	Remove now useless flavours switching	5 years ago
Haelwenn (lanodan) Monnier	aa9f52edd2	mastodon_api_controller.ex: Remove vanilla from supported_flavours	5 years ago
lambda	2993361075	Merge branch 'hotfix/leaking-lists' into 'develop' ... Mastodon API: Fix lists leaking private posts See merge request pleroma/pleroma!1222	5 years ago
lain	7861974ab2	MastodonAPI: Add extension to set and get pleroma_settings_store.	5 years ago
lain	aaad85c4d9	AccountView: settings -> settings_store	5 years ago
lain	eb2963bc43	User: Add settings store to Info, AccountView ... This is to provide a generic frontend settings storage mechanism for all kinds of frontends.	5 years ago
rinpatch	d9c0650ff9	Mastodon API: Fix lists leaking private posts ... Our previous list visibility resolver grabbed posts if either follower collection of the user in a list who is followed is in `to` or if follower collection of the user in a list was in `cc`. This not only missed unlisted posts but also lead to leaking private posts when `fix_explicit_addressing` mistakingly started putting follower collections to `cc` (also fixed in this MR). Reported by @kurisu@iscute.moe via a DM	5 years ago
rinpatch	a9eaa55885	Fix fix_explicit_addressing moving follower collection to cc and add tests for it	5 years ago
lain	97fb50d9fa	Mastodon Conversation API: Don't return own account in 'accounts'.	5 years ago
Sergey Suprunenko	1690be991e	Replace missing non-nullable Card attributes with empty strings	5 years ago
lambda	91ac8b075b	Merge branch 'use-pleroma-config' into 'develop' ... Use Pleroma.Config everywhere See merge request pleroma/pleroma!1214	5 years ago
Egor Kislitsyn	99f70c7e20	Use Pleroma.Config everywhere	5 years ago
kaniini	6aec0d1b58	Revert "Merge branch 'feature/search-authenticated-only' into 'develop'" ... This reverts merge request !1209	5 years ago
Mark Felder	e7edfd9fec	Permit fetching statuses from API with nickname or id	5 years ago
Roman Chvanikov	ce47017c89	Merge develop	5 years ago
Mark Felder	672fddb721	Default search limit should be 40 ... https://docs.joinmastodon.org/api/rest/search/	5 years ago
William Pitcock	0159a6dbe9	router: require oauth_read for searching ... Search calls are generally expensive and allow unauthenticated users to crawl the instance for user profiles or posts which contain specified keywords. An adversary can build a distributed search engine which not only will consume significant instance resources, but also can be used for undesirable purposes such as datamining. Accordingly, require authenticated access to use the search API endpoints. This acts as a nice balance as it allows guest users to make use of most functionality available in Pleroma FE while ensuring that Pleroma instances are reasonably protected from resource exhaustion. It also removes Pleroma as a potential vector in distributed search engines.	5 years ago
Sachin Joshi	1452a96ad6	ability to set and reset avatar, profile banner and backgroud in Mastodon API	5 years ago
lambda	5bb843ceec	Merge branch 'refactor/die-httpoison-die' into 'develop' ... remove @httpoison, @ostatus and @websub compile-time constants See merge request pleroma/pleroma!1203	5 years ago
William Pitcock	79503ce90f	mrf: simple policy: fix matching imported activitypub and ostatus statuses	5 years ago
William Pitcock	59a703fcbe	twitter api: user view: expose user notification settings under pleroma object	5 years ago
William Pitcock	56fd7dbdd7	remove @websub and @ostatus module-level constants	5 years ago
William Pitcock	9bec891eb4	kill @httpoison	5 years ago
Aaron Tinio	9415932af5	Keep nodeinfo available when not federating	5 years ago
feld	f916e4cdd9	Move the Cache Control header test to its own file ... We can consolidate our cache control header tests here	5 years ago
Egor Kislitsyn	f333041a0a	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
rinpatch	8b2d39c1ec	Change the order of preloading when fetching activities for context	5 years ago
Sachin Joshi	0c53d91f3b	fix merge conflict	5 years ago
rinpatch	e6b175ed6c	Fix credo issues	5 years ago
William Pitcock	baf72d6c58	mrf: simple policy: add the ability to strip avatars and banners from user profiles	5 years ago
William Pitcock	60f882b09f	activitypub: run user objects through MRF filters	5 years ago
William Pitcock	75b6c4b004	mrf: defang policy modules for filtering user profile objects	5 years ago
rinpatch	ac7702f800	Exclude Answers from fetching by default	5 years ago
rinpatch	19c90d47c4	Normalize poll votes to Answer objects	5 years ago
Maksim	620908a2db	[#699] add worker to clean expired oauth tokens	5 years ago
lambda	ff363f70b5	Merge branch 'refactor/keys' into 'develop' ... move key generation functions into Pleroma.Keys module See merge request pleroma/pleroma!1186	5 years ago
William Pitcock	1344c85e2f	salmon: fix credo	5 years ago
rinpatch	cdac5efd10	Merge branch 'bugfix/account_view_source.note' into 'develop' ... MastoAPI AccountView: fill source.note with plaintext version of note Closes #926 See merge request pleroma/pleroma!1189	5 years ago
Haelwenn (lanodan) Monnier	0e2c215a00	MastoAPI AccountView: fill source.note with plaintext version of note ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/926	5 years ago
Sachin Joshi	17bfd000d7	Ability to reset avatar, profile banner and backgroud	5 years ago
kaniini	79c2cef2fb	Merge branch 'mongooseim-support' into 'develop' ... MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172	5 years ago
William Pitcock	045803346d	move key generation functions into Pleroma.Keys module	5 years ago
Aaron Tinio	3ab9255eda	Respond with a 404 Not implemented JSON error message ... when requested API is not implemented	5 years ago
rinpatch	63b0b7190c	MastoAPI: Add GET /api/v1/polls/:id	5 years ago
rinpatch	5f67c26baf	Accept strings in expires_in because sasuga javascript	5 years ago
rinpatch	0407ffe75f	Change validation error status codes to be more appropriate	5 years ago
rinpatch	ee68244141	Do not stream out poll replies	5 years ago
rinpatch	d7c4d029c8	Restrict poll replies when fetching activiites for context	5 years ago
rinpatch	f28747858b	Actual vote count in poll view	5 years ago
rinpatch	a53d062730	Fix posting non-polls from mastofe	5 years ago
rinpatch	aafe30d94e	Handle poll votes	5 years ago
rinpatch	3f96b3e4b8	Enforce poll limits and add error handling for MastodonAPI's post endpoint	5 years ago
rinpatch	76a7429bef	Add poll limits to /api/v1/instance and initial state	5 years ago
kaniini	d4847b17ca	Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop' ... Add virtual :thread_muted? field Closes #901 See merge request pleroma/pleroma!1178	5 years ago
Aaron Tinio	eb02edcad9	Add virtual :thread_muted? field ... that may be set when fetching activities	5 years ago
Sadposter	daeae8e2e7	Move default mascot configuration to `config/`	5 years ago
Sadposter	e81f0fc6d4	Add mascot get/set tests	5 years ago
Sadposter	54e9cb5c2d	Add API endpoints for a custom user mascot	5 years ago
Aaron Tinio	2375e9a95b	Add report filtering to MRF.SimplePolicy	5 years ago
rinpatch	6430cb1bf7	Restrict poll replies from fetch queries by default	5 years ago
rinpatch	1d90f9b969	Remove tags/mentions/rich text from poll options because Mastodon and ... add custom emoji	5 years ago
rinpatch	5ece901af3	Resolve merge conflicts and remove IO.inspects	5 years ago
rinpatch	fd920c8973	Mastodon API: Add support for posting polls	5 years ago
William Pitcock	c4a55e167a	add Changelog entry	5 years ago
William Pitcock	dc08159538	also suppress link previews from posts marked #nsfw	5 years ago
William Pitcock	0da1233e8e	rich media: suppress link previews if post is marked as sensitive	5 years ago
William Pitcock	78588dbd80	mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw	5 years ago
Egor Kislitsyn	3b71612d3d	Improve Pleroma.Web.ActivityPub.ActivityPub.maybe_update_cc/3	5 years ago
lain	075eecec90	Linting.	5 years ago
lain	f959bf7aa6	MongooseIM: Add basic integration endpoints.	5 years ago
Egor Kislitsyn	557f0e33a7	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
Egor Kislitsyn	f2936e0a07	Add `ap_id` to List	5 years ago
lain	412a3d8a0f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index	5 years ago
lambda	1dcdcd8871	Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop' ... MastoAPI account_view.ex: requested is false when following is true Closes #903 See merge request pleroma/pleroma!1169	5 years ago
lambda	46684db84d	Update account_view.ex	5 years ago
rinpatch	642a67dd44	Render polls in statuses	5 years ago
Alexander Strizhakov	7ed682213f	Fix/902 random compile failing	5 years ago
Haelwenn (lanodan) Monnier	68c75a08e8	MastoAPI account_view.ex: requested is false when following is true ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/903	5 years ago
Aaron Tinio	70235ce840	Fix typo: s/"tags"/"tag"/g	5 years ago
Sergey Suprunenko	e2b3a27204	Add Reports to Admin API	5 years ago
feld	e190b3022b	Merge branch 'fix/domain-unblocked-reblogs' into 'develop' ... Fix domain-unblocked reblogs Closes #892 See merge request pleroma/pleroma!1157	5 years ago
Mark Felder	ebb0482116	Merge branch 'develop' into conversations-import	5 years ago
lambda	fde30aee43	Merge branch 'feature/sql-thread-sat' into 'develop' ... SQL thread visibility solver See merge request pleroma/pleroma!971	5 years ago
Egor Kislitsyn	fc7246d715	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
William Pitcock	c31026423c	publisher: use the correct queue name for outgoing federation	5 years ago
Aaron Tinio	793f1834d2	Use named binding to conditionally join object	5 years ago
Aaron Tinio	2b6119dfbf	Restrict reblogs of activities from blocked domains	5 years ago
rinpatch	62e42b03ab	Handle incoming Question objects	5 years ago
William Pitcock	a591ab6112	activity pub: remove Ecto SQL query dumps	5 years ago
William Pitcock	31db31c587	activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread	5 years ago
William Pitcock	de114ffbb0	activitypub: remove contain_timeline()	5 years ago
William Pitcock	0387f52138	activitypub: add restrict_thread_visibility()	5 years ago
lain	f168a1cbdc	Merge remote-tracking branch 'origin/develop' into conversations-import	5 years ago
kaniini	62516be9c4	Merge branch 'fix/public-option-not-working' into 'develop' ... Fix public option not working Closes #873 See merge request pleroma/pleroma!1143	5 years ago
lambda	4440e23547	Merge branch 'chore/extricate-http-signatures' into 'develop' ... switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155	5 years ago
lain	7a92e701b9	CommonAPI: Visibility refactor.	5 years ago
lain	cbb3451023	CommonAPI: Refactor visibility, forbid public to private replies.	5 years ago
lain	f1e67bdc31	Search: Add optional rum indexing / searching.	5 years ago
Sachin Joshi	ee22fff5ac	remove deprecated PleromaFE configuration	5 years ago
Egor Kislitsyn	a7a8f3bc2c	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
Aaron Tinio	70c81b95d0	Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug	5 years ago
William Pitcock	071f78733a	switch to pleroma/http_signatures library	5 years ago
lambda	692919c7d2	Merge branch 'refactor/use-job-queue-everywhere' into 'develop' ... use job queue everywhere Closes #862 See merge request pleroma/pleroma!1142	5 years ago
William Pitcock	ac3a3abf6b	clean up follow/block imports a little	5 years ago
Maksim	52297920e7	Refactoring oauth response.	5 years ago
Egor Kislitsyn	e82e73478e	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	5 years ago
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Mark Felder	bbacdf2352	Bump Mastodon API level	5 years ago
Mark Felder	498bfdf403	Switch to Jason over Poison	5 years ago
William Pitcock	69a9e0563c	user: migrate follow/blocks import to job queue	5 years ago
William Pitcock	57d11ac9db	activitypub: move post rich media fetching to job queue	5 years ago
lambda	b14a314ce7	Merge branch 'feature/federator-behaviours' into 'develop' ... federator modularization (outgoing) See merge request pleroma/pleroma!1140	5 years ago
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	5 years ago
Sachin Joshi	7701a4c841	Make irreversible field default to false in filters	5 years ago
Egor Kislitsyn	23276e8d68	Use pseudo ap id of a list in BCC	5 years ago
William Pitcock	44b182732e	nodeinfo: gather supported protocol names from federation modules	5 years ago
William Pitcock	28f7f4c6de	webfinger: build the response based on enabled federation modules	5 years ago
William Pitcock	55fa4b812a	federator: websub removal	5 years ago
William Pitcock	c23276a59a	activitypub: publisher: fixups	5 years ago
William Pitcock	fedaca15a3	websub: adapt to work as a federator publishing module	5 years ago
William Pitcock	179293e51c	salmon: refactor to work as a federator publishing module	5 years ago
William Pitcock	2aee62a456	federator: publisher: only attempt publishing if we know the activity is representable	5 years ago
William Pitcock	69158f1065	ostatus: only as:Public activities are representable	5 years ago
William Pitcock	85377c0b67	federator: move activitypub relaying to the AP publisher module	5 years ago
William Pitcock	676752bb83	federator: hook up Publisher.publish()	5 years ago
William Pitcock	f7a6a37c4e	federator: remove no longer used :publish_single_ap	5 years ago
William Pitcock	10695a28d2	federator: publisher: add publish() wrapper	5 years ago
William Pitcock	0afc8d7856	federator: publisher: integrate job queue, simplify publish_one logic	5 years ago
William Pitcock	ef1f9e8d4e	activitypub: split out outgoing federation into a federation module	5 years ago
William Pitcock	e7d292f80e	federator: add publisher module defining a contract for publishing behaviours	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
lain	01c45ddc9e	Search: Use RUM index.	5 years ago
Sachin Joshi	f01f995816	make url uniform in admin api	5 years ago
Roman Chvanikov	f1f7a11222	Merge develop	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
lain	a33bec7d58	Conversations: Import order, import as read.	5 years ago
lain	e6d7f8d223	Credo fixes.	5 years ago
lain	a4598b5e8b	Visibility: Make it more resilient.	5 years ago
lain	920bd47055	ActivityPub: Remove leftover printf debugging.	5 years ago
lain	fcf2f38d20	Conversations: Add a function to 'import' old DMs.	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
Roman Chvanikov	b6b5b16ba4	Merge develop	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	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
lambda	238dd72fad	Merge branch 'conversations_three' into 'develop' ... Conversations once more. See merge request pleroma/pleroma!1119	5 years ago
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	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	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
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
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
Mark Felder	3c4cab9be1	Merge branch 'develop' into update-oauth-template	5 years ago
Mark Felder	9a98f48ec3	Remove incorrect statement about valid characters	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
Egor Kislitsyn	a3dc02d282	Add addressable lists	5 years ago
Alex S	f11e7037c2	test fixes	5 years ago
Alex S	bdfa3a6fa8	Merging with develop ... Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex	5 years ago
rinpatch	ce4825c1dc	Do not normalize objects in stream_out unless the activity type is ... Create Saves quite a bit of time with delete activities because they would always query the db	5 years ago
Roman Chvanikov	0f0cc2703b	Merge develop	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	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	a825056d4d	test fixes	5 years ago
Alex S	85953c0836	fixes for tests	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	1258128f4f	favourites add bookmark display	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
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
Alex S	d35246c449	added healthcheck setting to instance config	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
Egor	b9cdf6d3b9	Use `User.get_cached*` everywhere	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
Roman Chvanikov	4908e0eeee	Fix Credo warning	5 years ago
Roman Chvanikov	eeb093631c	Fix Credo warning	5 years ago
Roman Chvanikov	e56afefef9	Refactor conversation function in MastodonAPIController to use a View	5 years ago
Roman Chvanikov	2662bea4e0	Add accounts and last_status to conversation read response	5 years ago
Ivan Tashkinov	9256d2d4b4	[#923] Refactored OAuthController#authorize definitions, added test.	6 years ago
eugenijm	375fd21055	Set correct values in the MastoAPI reblog status view	6 years ago
Roman Chvanikov	24073f829f	Refactor query to return only 1 message instead of 20	6 years ago
Roman Chvanikov	724311e151	Fix Credo warnings	6 years ago
Roman Chvanikov	60f213bb1a	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email	6 years ago
Roman Chvanikov	64a2c6a041	Digest emails	6 years ago
Ekaterina Vaartis	52ed287e87	Fix incorrect multiple emoji tag handling introduced in initial impl	6 years ago
eugenijm	fa48532387	Handle `reblogs` on the first follow request in MastoAPI	6 years ago
kaniini	9da8b287f8	Merge branch 'feature/database-compaction' into 'develop' ... database compaction See merge request pleroma/pleroma!473	6 years ago
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	6 years ago
lambda	218d96a26b	Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' ... OAuth consumer params handling refactoring See merge request pleroma/pleroma!1047	6 years ago
rinpatch	f9865cf943	Stream out deletes, mistakingly removed when resolving merge conflicts	6 years ago
Haelwenn	eba3db0966	Merge branch 'bugfix/filter-boosted-blocks' into 'develop' ... activitypub: fix filtering of boosts from blocked users See merge request pleroma/pleroma!1074	6 years ago
Mark Felder	1aa4994f6d	Do not require authentication for user search in MastoAPI	6 years ago
rinpatch	83589ca6a5	Merge branch 'develop' into feature/database-compaction	6 years ago
rinpatch	ac04311b3f	Fix search in TwitterAPI	6 years ago
rinpatch	6069d0fd36	Fix object search depending on embeded object	6 years ago
rinpatch	e31a22043b	Fix media timeline depending on embeded object and add some guards	6 years ago
rinpatch	2abc09570f	Use the preloaded object in tag queries	6 years ago
William Pitcock	36f78c6dcd	activitypub: fix filtering of boosts from blocked users	6 years ago
William Pitcock	2140e164d7	activitypub: properly filter out transitive activities concerning blocked users	6 years ago
rinpatch	35ac672b8d	Remove containment tests from transmogrifier and fix thread visibility solver	6 years ago
rinpatch	8e4d950f31	Remove updating reply count for embeded objects	6 years ago
rinpatch	a53b917e7f	oof	6 years ago
rinpatch	ad681877df	Make credo happy	6 years ago
rinpatch	e641651e2b	Fix unbookmarking	6 years ago
rinpatch	b09ae02c04	Added some more normalization calls all in mastodon api controller	6 years ago
rinpatch	462028688b	Fix pinned posts relying on embded objects	6 years ago
rinpatch	627e5a0a49	Merge branch 'develop' into feature/database-compaction	6 years ago
Ivan Tashkinov	128aae05f3	[#923] Minor semantic adjustment.	6 years ago
kaniini	02a53d00c9	Merge branch 'fix/remote-follow-auth' into 'develop' ... Fix: remote follows should not ask user to log-in again for authorization See merge request pleroma/pleroma!1060	6 years ago
Haelwenn	cde7711b12	Merge branch 'bugfix/relax-spam-protection' into 'develop' ... activitypub: allow indirect messages from users being followed at a personal inbox See merge request pleroma/pleroma!1069	6 years ago
Normandy	d4a749cfb2	Handle new-style mastodon follow lists ... Fixes https://git.pleroma.social/pleroma/pleroma/issues/814	6 years ago
William Pitcock	750b369d04	activitypub: allow indirect messages from users being followed at a personal inbox	6 years ago
Hakurei Reimu	6e26ac10a3	make Pleroma.Endpoint use extra_cookie_attrs in config	6 years ago
lain	76999c73a7	Conversation: Add accounts to output.	6 years ago
lain	0da985182f	Conversation: Return full status object, id is a string.	6 years ago
lambda	56956de6fa	Merge branch 'fix/status-reblogged' into 'develop' ... Assign reblogged in the Mastodon reblog status view Closes #812 See merge request pleroma/pleroma!1057	6 years ago
lambda	f358295cbe	Merge branch 'unfollow-oneself' into 'develop' ... Consistent response for self follow/unfollow Closes #819 See merge request pleroma/pleroma!1061	6 years ago
eugenijm	27d78dc526	Use User.get_cached_by*	6 years ago
rinpatch	5d73dca064	Remove inReplyToStatusId	6 years ago
eugenijm	507e7821e3	Handle follow/unfollow directed to themselves	6 years ago
eugenijm	679a8ef629	Assign reblogged in the Mastodon reblog status view	6 years ago
Egor	f9af90c5aa	Revert "simplify mentions escape" ... This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.	6 years ago
lambda	184ae60b21	Merge branch 'bugfix/pleroma-email-naming' into 'develop' ... Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029	6 years ago
lambda	0a09692c7d	Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' ... Features: mastoapi-2.6.0 `min_id` pagination Closes #351 See merge request pleroma/pleroma!976	6 years ago
lambda	57d5ff57d6	Merge branch 'fix/732-password-align' into 'develop' ... password reset page labels align See merge request pleroma/pleroma!986	6 years ago
Alexander Strizhakov	711ade961e	adding destroy multiple for mastofe	6 years ago
Alexander Strizhakov	e03d24af96	in_reply_to_id - null	6 years ago
kaniini	31c06dba5a	Merge branch 'fix/hackney_max_body_param' into 'develop' ... Add `with_body: true` to requests relying on `max_body: val` Closes #778 See merge request pleroma/pleroma!1049	6 years ago
Roman Chvanikov	4615e56219	Add `with_body: true` to requests relying on `max_body: val`	6 years ago
Mark Felder	d6d5f46bae	Update OAuth web template	6 years ago
Egor Kislitsyn	db4badc6aa	move user disable into deactivation	6 years ago
Egor Kislitsyn	0f2f7d2cec	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	6 years ago
Ivan Tashkinov	c3f12cf3c3	[#923] OAuth consumer params handling refactoring. ... Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.	6 years ago
lain	c352a0aba6	Conversations: Make tests run.	6 years ago
lain	280172f6f6	Conversations: Create or bump on inserting a dm.	6 years ago
lambda	e5d553aa45	Merge branch 'feature/767-multiple-use-invite-token' into 'develop' ... Feature/767 multiple use invite token See merge request pleroma/pleroma!1032	6 years ago
Sadposter	be8350baa2	Merge branch 'develop' into feature/user-status-subscriptions	6 years ago
lambda	c8440b5e0c	Merge branch 'fix/emoji-api-nonsense' into 'develop' ... Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038	6 years ago
Haelwenn (lanodan) Monnier	9c1b36856b	s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/	6 years ago
Haelwenn (lanodan) Monnier	cae0231731	s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/	6 years ago
Haelwenn (lanodan) Monnier	1791ee8ec4	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	6 years ago
kaniini	0ab563d334	Merge branch 'hotfix/fix_undefined_summary' into 'develop' ... transmogrifier.ex: Add fix_summary/1 See merge request pleroma/pleroma!1039	6 years ago
kaniini	97395e013e	Merge branch 'notification-pleroma-settings' into 'develop' ... Notification controls Closes #738 See merge request pleroma/pleroma!988	6 years ago
Haelwenn (lanodan) Monnier	cf9ba8fe1b	transmogrifier.ex: Add fix_summary/1 ... MRF.KeywordPolicy assumes that summary is present in a activity, and this would probably simplify code elsewhere too anyway.	6 years ago
rinpatch	b57b43027c	Change response format of /api/pleroma/emoji to the one that actually makes sense	6 years ago
Sadposter	589629cf3e	Used cached user resources in subscriptions	6 years ago
lain	a9f805c871	Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations	6 years ago
Egor Kislitsyn	9abf832b03	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	6 years ago
lambda	e19590c93f	Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' ... Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019	6 years ago
lambda	fd45cab9ec	Merge branch 'twitter_oauth' into 'develop' ... OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923	6 years ago
Alexander Strizhakov	36c0a10fdf	adding language tag	6 years ago
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' ... Feature/770 add emoji tags See merge request pleroma/pleroma!998	6 years ago
Egor Kislitsyn	c3d5c3513a	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	6 years ago
Egor Kislitsyn	a1a854646e	Merge branch 'develop' into use-jobs-in-webpush	6 years ago
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	6 years ago
lambda	b4da2bc1d0	Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' ... # Conflicts: # config/config.exs # docs/config.md	6 years ago
lambda	b177e1e7f3	Merge branch 'scheduled-activities' into 'develop' ... Scheduled activities See merge request pleroma/pleroma!989	6 years ago
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	6 years ago
Sadposter	76fdfd1c7f	Add check on activity visibility in sub notification	6 years ago
Alex S	56c75aec12	credo fix	6 years ago
Alex S	b810aac117	added docs to docs/api/admin_api.md ... code style and little renamings	6 years ago
Ivan Tashkinov	e3328bc138	[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.	6 years ago
feld	fb2040d061	Merge branch 'fix/deactivated-user-error' into 'develop' ... Return 403 for deactivated user on token request Closes #785 See merge request pleroma/pleroma!1031	6 years ago
eugenijm	2056efa714	Add scheduler for sending scheduled activities to the queue	6 years ago
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	6 years ago
eugenijm	b3870df51f	Handle `scheduled_at` on status creation.	6 years ago
eugenijm	7bf622ce73	Add scheduled activities	6 years ago
eugenijm	7aa53d52bd	Return 403 on oauth token exchange for a deactivated user	6 years ago
Sadposter	c05fe4da0a	Document subscription endpoints, fix typos ... Also adds a quick error case on the subscription endpoints to avoid 500s	6 years ago
feld	9aeac7dcca	Merge branch 'feature/prometheus' into 'develop' ... Upstream: Metrics and debugging See merge request pleroma/pleroma!1020	6 years ago
Alex S	a53d591ac5	code style	6 years ago
Alex S	7410aee886	Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	6 years ago
Alex S	dcc54f8cfa	admin api endpoints for invites	6 years ago
Alex S	47b07cec49	token -> invite renaming	6 years ago
Alex S	be54e40890	twitter api registration ... fix for twitter api tests	6 years ago
Sergey Suprunenko	325a268017	Redirect to the referer url after mastofe authorization	6 years ago
Mark Felder	b5a2d384f7	Redundant Repo.get_by usage was recently removed from the codebase	6 years ago
Roger Braun	7895ee37fa	Add user following / unfollowing to the admin api.	6 years ago
Sadposter	9ca91cbb87	Change relationship direction of subscriptions	6 years ago
Sadposter	d35f6551c1	Move subscriptions endpoint to be under /pleroma	6 years ago
Sadposter	d56866c824	Add subscribed status to user view ... Added in pleroma extensions, but can be moved whenever	6 years ago