4018 commits

Author	SHA1	Message	Date
William Pitcock	501af917b5	add support for bbcode	2019-04-26 22:35:02 +00:00
lambda	4de5fef1f8	Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' ... Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059	2019-04-26 11:59:47 +00:00
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	2019-04-26 02:41:35 +00:00
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	2019-04-25 18:11:47 -05:00
rinpatch	dfc8425659	Move settings to Source subentity	2019-04-25 10:31:14 +03:00
Alex S	a825056d4d	test fixes	2019-04-25 14:09:57 +07:00
Alex S	85953c0836	fixes for tests	2019-04-25 13:46:40 +07:00
Alex S	229ce6abbc	migration without using old field name ... removing old field from db, after bookmarks migration	2019-04-25 13:42:10 +07:00
Alex S	3c2ae80008	unused	2019-04-25 13:42:10 +07:00
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	2019-04-25 13:41:10 +07:00
Alex S	1258128f4f	favourites add bookmark display	2019-04-25 13:38:24 +07:00
Alex S	324c9c8ab5	migrate user.bookmarks to separate table	2019-04-25 13:38:24 +07:00
Alex S	73d01857e3	bookmarks in separate table	2019-04-25 13:38:24 +07:00
William Pitcock	0fd0ffcd76	activitypub: transmogrifier: send reject follow if following does not succeed	2019-04-25 00:48:45 +00:00
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	2019-04-24 20:01:42 +03:00
Sachin Joshi	963d5774af	fix the status notification with special char	2019-04-24 07:06:17 +05:45
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	2019-04-23 23:07:56 +00:00
William Pitcock	f5535e5743	html: lock down allowed class attributes to only those related to microformats	2019-04-23 23:03:45 +00:00
Sergey Suprunenko	9dd36e5bcb	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	2019-04-23 02:47:43 +00:00
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	2019-04-23 02:43:53 +00:00
kaniini	aa9d378985	Merge branch 'fix/normalize-activities' into 'develop' ... Normalize acitvities instead of objects inside them See merge request pleroma/pleroma!1085	2019-04-23 02:43:26 +00:00
Alex S	d35246c449	added healthcheck setting to instance config	2019-04-22 17:00:06 +07:00
rinpatch	f60d072bbb	Add pleroma.in_reply_to_account_acct to MastoAPI status entity	2019-04-22 11:54:27 +03:00
rinpatch	d21d921def	Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading	2019-04-22 11:27:29 +03:00
rinpatch	952a4ae68e	Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix ... task docs	2019-04-22 11:02:31 +03:00
Egor	b9cdf6d3b9	Use User.get_cached* everywhere	2019-04-22 07:20:43 +00:00
Alexander Strizhakov	88f0be9693	Feature/826 healthcheck endpoint	2019-04-22 07:19:53 +00:00
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-22 13:08:30 +07:00
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	2019-04-22 02:07:19 +00:00
Ekaterina Vaartis	3cefdc62e0	Fix emoji.txt / custom_emoji.txt / shortcode_globs handling	2019-04-21 23:07:14 +03:00
Ekaterina Vaartis	ba19ba8a88	Formatting	2019-04-21 22:33:54 +03:00
Ekaterina Vaartis	153f5375a6	Replace MD5 with SHA256 for emoji pack verification	2019-04-21 22:28:41 +03:00
Ekaterina Vaartis	d5c0fd35e1	Wrap the docstrings to 70 characters	2019-04-21 22:16:46 +03:00
Roman Chvanikov	4908e0eeee	Fix Credo warning	2019-04-21 23:24:33 +07:00
Roman Chvanikov	eeb093631c	Fix Credo warning	2019-04-21 23:19:36 +07:00
Roman Chvanikov	e56afefef9	Refactor conversation function in MastodonAPIController to use a View	2019-04-21 23:14:27 +07:00
Roman Chvanikov	2662bea4e0	Add accounts and last_status to conversation read response	2019-04-21 20:26:13 +07:00
Ivan Tashkinov	9256d2d4b4	[#923] Refactored OAuthController#authorize definitions, added test.	2019-04-21 10:51:32 +03:00
eugenijm	375fd21055	Set correct values in the MastoAPI reblog status view	2019-04-21 05:40:22 +03:00
Roman Chvanikov	24073f829f	Refactor query to return only 1 message instead of 20	2019-04-21 00:40:41 +07:00
Ekaterina Vaartis	8f93d4c423	Remove most finmoji mentions where appropriate	2019-04-20 15:42:14 +03:00
Ekaterina Vaartis	53a3e61016	Fix priv/static/instance/static to be just instance/static ... It was a misunderstanding	2019-04-20 15:08:51 +03:00
Ekaterina Vaartis	31cff7dbca	Document the pleroma.emoji task	2019-04-20 15:06:07 +03:00
Ekaterina Vaartis	1e311d6662	Add a newline at the end of pack in ls-packs	2019-04-20 11:34:03 +03:00
Ekaterina Vaartis	52ed287e87	Fix incorrect multiple emoji tag handling introduced in initial impl	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	9bd5e2dec9	Make emoji default_manifest a config option	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	98d4b3de53	Treat the manifest path as a file if it doesn't start with http	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	aaaa428512	mix format	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	a141f0807b	Assume packs without emoji.txt only have emoji pictures, unhardcode ... unhardcode: remove hardcoded /instance/static and actually use the config option as it is used in other places. packs without emoji.txt: these are now assumed to have .png files that are all emojis, their names are used as shortcodes	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	eff725c3af	Add a task to generate emoji packs	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	1e44b5478d	Remove useless comment	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	c5b7286b5f	Move helper functions of emoji manager task down in the file	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	06db3ee1a8	Add MD5 verification for emoji pack source	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	af5494f942	Separate emoji pack file lists in a different file ... The file should be in the same directory as the manifest file	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	21b39c54a3	Allow using a custom manfest and getting multiple packs at once ... A custom manifest can be provided as a command-line options --manifest/-m	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	c26724cc55	Remove finmoji and add a way to download emojis in packs ... These packs are stored in a git repo on pleroma gitlab	2019-04-20 11:17:17 +03:00
eugenijm	fa48532387	Handle reblogs on the first follow request in MastoAPI	2019-04-20 04:39:49 +03:00
kaniini	9da8b287f8	Merge branch 'feature/database-compaction' into 'develop' ... database compaction See merge request pleroma/pleroma!473	2019-04-19 16:55:33 +00:00
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	2019-04-19 07:50:21 +00:00
lambda	218d96a26b	Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' ... OAuth consumer params handling refactoring See merge request pleroma/pleroma!1047	2019-04-19 07:49:26 +00:00
rinpatch	f9865cf943	Stream out deletes, mistakingly removed when resolving merge conflicts	2019-04-19 00:47:02 +03:00
rinpatch	73b8c5387b	Add some logging	2019-04-19 00:17:37 +03:00
rinpatch	945325013a	remove query timeouts	2019-04-18 23:58:59 +03:00
rinpatch	099f89367e	Replace embedded object migration with a mix task	2019-04-18 23:34:01 +03:00
rinpatch	9238dccac1	Add a guard to fetching reply activity	2019-04-18 21:40:40 +03:00
Haelwenn	eba3db0966	Merge branch 'bugfix/filter-boosted-blocks' into 'develop' ... activitypub: fix filtering of boosts from blocked users See merge request pleroma/pleroma!1074	2019-04-18 18:29:57 +00:00
Mark Felder	1aa4994f6d	Do not require authentication for user search in MastoAPI	2019-04-18 12:44:25 -05:00
rinpatch	a11ca87f40	Add a migration to remove embeded objects	2019-04-18 13:10:38 +03:00
rinpatch	83589ca6a5	Merge branch 'develop' into feature/database-compaction	2019-04-18 12:56:38 +03:00
rinpatch	ac04311b3f	Fix search in TwitterAPI	2019-04-18 10:24:06 +03:00
rinpatch	6069d0fd36	Fix object search depending on embeded object	2019-04-18 09:28:20 +03:00
rinpatch	e31a22043b	Fix media timeline depending on embeded object and add some guards	2019-04-18 08:31:08 +03:00
rinpatch	2abc09570f	Use the preloaded object in tag queries	2019-04-18 01:37:04 +03:00
William Pitcock	36f78c6dcd	activitypub: fix filtering of boosts from blocked users	2019-04-17 22:27:59 +00:00
William Pitcock	2140e164d7	activitypub: properly filter out transitive activities concerning blocked users	2019-04-17 20:05:09 +00:00
rinpatch	35ac672b8d	Remove containment tests from transmogrifier and fix thread visibility solver	2019-04-17 17:59:15 +03:00
rinpatch	4c289e924e	Fix delete-by_ap_id to expect not only embeded objects	2019-04-17 16:35:01 +03:00
rinpatch	8e4d950f31	Remove updating reply count for embeded objects	2019-04-17 15:54:09 +03:00
rinpatch	c3a2052806	If it's an object struct it is already normalized	2019-04-17 15:11:22 +03:00
rinpatch	a53b917e7f	oof	2019-04-17 14:55:26 +03:00
rinpatch	ad681877df	Make credo happy	2019-04-17 14:52:01 +03:00
rinpatch	e641651e2b	Fix unbookmarking	2019-04-17 14:27:02 +03:00
rinpatch	e7c3c36766	Update functions in object fetcher for tesla and set up a proper mock for tests	2019-04-17 14:21:39 +03:00
rinpatch	b09ae02c04	Added some more normalization calls all in mastodon api controller	2019-04-17 13:04:58 +03:00
rinpatch	462028688b	Fix pinned posts relying on embded objects	2019-04-17 12:34:19 +03:00
rinpatch	627e5a0a49	Merge branch 'develop' into feature/database-compaction	2019-04-17 12:22:32 +03:00
Ivan Tashkinov	128aae05f3	[#923] Minor semantic adjustment.	2019-04-17 11:33:21 +03:00
kaniini	73df3046e0	Merge branch 'feature/788-separate-email-addresses' into 'develop' ... Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040	2019-04-16 18:44:07 +00:00
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	2019-04-16 18:40:56 +00:00
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	2019-04-16 18:38:11 +00:00
Normandy	d4a749cfb2	Handle new-style mastodon follow lists ... Fixes https://git.pleroma.social/pleroma/pleroma/issues/814	2019-04-16 18:35:38 +00:00
William Pitcock	750b369d04	activitypub: allow indirect messages from users being followed at a personal inbox	2019-04-16 18:31:12 +00:00
Hakurei Reimu	6e26ac10a3	make Pleroma.Endpoint use extra_cookie_attrs in config	2019-04-16 22:20:56 +08:00
lain	76999c73a7	Conversation: Add accounts to output.	2019-04-15 22:28:42 +02:00
lain	0da985182f	Conversation: Return full status object, id is a string.	2019-04-15 21:58:58 +02:00
lain	c1ebb38d3a	Conversation: Also create participations for remote users. ... Needed to get the participating user list.	2019-04-15 21:45:25 +02:00
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	2019-04-15 10:26:23 +00:00
lambda	f358295cbe	Merge branch 'unfollow-oneself' into 'develop' ... Consistent response for self follow/unfollow Closes #819 See merge request pleroma/pleroma!1061	2019-04-15 10:24:37 +00:00
eugenijm	27d78dc526	Use User.get_cached_by*	2019-04-15 12:37:49 +03:00
rinpatch	5d73dca064	Remove inReplyToStatusId	2019-04-15 11:50:36 +03:00
eugenijm	507e7821e3	Handle follow/unfollow directed to themselves	2019-04-15 10:21:18 +03:00
Sadposter	e513504e88	Revert "Assert on the success of enqueue before returning" ... This reverts commit 16d8c8b33b. Because it breaks everything	2019-04-14 16:12:54 +01:00
Sadposter	16d8c8b33b	Assert on the success of enqueue before returning	2019-04-14 16:05:26 +01:00
Sadposter	5e45557751	Always return {atom, _} from try_send_confirmation	2019-04-14 16:01:48 +01:00
Sadposter	ec42b639a3	fix pattern match on user registration ... deliver_async will return a single atom	2019-04-14 15:46:54 +01:00
eugenijm	679a8ef629	Assign reblogged in the Mastodon reblog status view	2019-04-14 11:35:15 +03:00
Alex S	c349573791	Merge develop to 788-separate-email-addresses ... Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs	2019-04-13 12:24:38 +07:00
Alex S	a64eb2b389	fallback to the old behaviour ... admin and user mailers	2019-04-13 12:20:36 +07:00
Egor	f9af90c5aa	Revert "simplify mentions escape" ... This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.	2019-04-12 19:25:53 +00:00
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	2019-04-12 10:41:09 +00:00
Egor Kislitsyn	dd097a406b	add tests	2019-04-12 16:38:32 +07:00
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	2019-04-12 09:34:12 +00:00
lambda	57d5ff57d6	Merge branch 'fix/732-password-align' into 'develop' ... password reset page labels align See merge request pleroma/pleroma!986	2019-04-12 09:13:30 +00:00
Alexander Strizhakov	711ade961e	adding destroy multiple for mastofe	2019-04-12 02:28:46 +00:00
Alexander Strizhakov	e03d24af96	in_reply_to_id - null	2019-04-12 02:21:32 +00:00
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	2019-04-11 17:54:31 +00:00
Roman Chvanikov	4615e56219	Add with_body: true to requests relying on max_body: val	2019-04-12 00:16:33 +07:00
Mark Felder	d6d5f46bae	Update OAuth web template	2019-04-11 16:02:38 +00:00
Egor Kislitsyn	46bd5c1d87	fix format	2019-04-11 17:28:12 +07:00
Egor Kislitsyn	db4badc6aa	move user disable into deactivation	2019-04-11 17:22:42 +07:00
Egor Kislitsyn	0f2f7d2cec	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-11 15:51:52 +07:00
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.	2019-04-10 21:40:38 +03:00
lain	d115d2a27e	Conversations: Tidying up.	2019-04-10 18:17:22 +02:00
lain	c352a0aba6	Conversations: Make tests run.	2019-04-10 17:48:31 +02:00
lain	cf353514fe	Participations: Add last activity.	2019-04-10 17:28:02 +02:00
lain	20d9b90760	Participation: Get for a user.	2019-04-10 17:05:33 +02:00
lain	280172f6f6	Conversations: Create or bump on inserting a dm.	2019-04-10 16:33:45 +02:00
lain	64c1c3a407	Participations: Add marking as read and unread.	2019-04-10 15:12:01 +02:00
lain	d1da6b155a	Conversation: Add Conversations and Participations.	2019-04-10 15:01:42 +02:00
Alex S	fe511a6c65	Merge branch 'develop' into feature/788-separate-email-addresses	2019-04-10 18:06:54 +07:00
Alex S	fe13a1d78c	adding notify_email setting for trigger emails	2019-04-10 17:57:41 +07:00
lambda	e5d553aa45	Merge branch 'feature/767-multiple-use-invite-token' into 'develop' ... Feature/767 multiple use invite token See merge request pleroma/pleroma!1032	2019-04-10 10:10:08 +00:00
Sadposter	be8350baa2	Merge branch 'develop' into feature/user-status-subscriptions	2019-04-10 10:44:54 +01:00
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	2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier	9c1b36856b	s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/	2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier	cae0231731	s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/	2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier	1791ee8ec4	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	2019-04-10 06:33:19 +02:00
kaniini	0ab563d334	Merge branch 'hotfix/fix_undefined_summary' into 'develop' ... transmogrifier.ex: Add fix_summary/1 See merge request pleroma/pleroma!1039	2019-04-10 02:10:47 +00:00
kaniini	97395e013e	Merge branch 'notification-pleroma-settings' into 'develop' ... Notification controls Closes #738 See merge request pleroma/pleroma!988	2019-04-10 02:10:31 +00:00
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.	2019-04-10 02:32:04 +02:00
rinpatch	b57b43027c	Change response format of /api/pleroma/emoji to the one that actually makes sense	2019-04-09 23:20:31 +03:00
rinpatch	144648de92	Merge branch 'mastoapi/plaintext-statuses' into 'develop' ... Provide plaintext representations of content/cw in MastoAPI Closes #787 See merge request pleroma/pleroma!1035	2019-04-09 17:25:31 +00:00
lambda	0a02ed7a2f	Merge branch 'bugfix/follower_count' into 'develop' ... update the follower count when a follower is blocked See merge request pleroma/pleroma!1033	2019-04-09 07:30:38 +00:00
Sachin Joshi	07afb9b537	update the follower count when a follower is blocked	2019-04-09 09:15:45 +05:45
Sadposter	589629cf3e	Used cached user resources in subscriptions	2019-04-08 15:56:14 +01:00
Alex S	fee50636d0	removing not needed invite update	2019-04-08 20:08:16 +07:00
Alex S	d0696fdfd6	fix for elixir 1.7.4	2019-04-08 19:16:59 +07:00
lain	a9f805c871	Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations	2019-04-08 14:10:51 +02:00
Sadposter	87a01f9ee0	Use Pleroma.Config instead of Application.get_env	2019-04-08 13:04:30 +01:00
Egor Kislitsyn	9abf832b03	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 18:48:10 +07:00
Sadposter	13ff312c48	Sever subscription in case of block	2019-04-08 12:46:12 +01:00
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	2019-04-08 11:42:20 +00:00
lambda	fd45cab9ec	Merge branch 'twitter_oauth' into 'develop' ... OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923	2019-04-08 11:41:50 +00:00
Alexander Strizhakov	36c0a10fdf	adding language tag	2019-04-08 11:03:10 +00:00
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' ... Feature/770 add emoji tags See merge request pleroma/pleroma!998	2019-04-08 09:50:00 +00:00
Egor Kislitsyn	c3d5c3513a	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 16:46:59 +07:00
Egor Kislitsyn	a1a854646e	Merge branch 'develop' into use-jobs-in-webpush	2019-04-08 16:29:20 +07:00
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	2019-04-08 12:20:26 +03:00
lambda	b4da2bc1d0	Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' ... # Conflicts: # config/config.exs # docs/config.md	2019-04-08 09:18:01 +00:00
lambda	b177e1e7f3	Merge branch 'scheduled-activities' into 'develop' ... Scheduled activities See merge request pleroma/pleroma!989	2019-04-08 09:08:18 +00:00
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	2019-04-08 16:01:28 +07:00
Sadposter	76fdfd1c7f	Add check on activity visibility in sub notification	2019-04-07 15:11:29 +01:00
Alex S	56c75aec12	credo fix	2019-04-07 20:59:53 +07:00
Alex S	b810aac117	added docs to docs/api/admin_api.md ... code style and little renamings	2019-04-07 19:48:52 +07:00
Ivan Tashkinov	e3328bc138	[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.	2019-04-07 11:08:37 +03:00
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	2019-04-06 22:19:30 +00:00
eugenijm	2056efa714	Add scheduler for sending scheduled activities to the queue	2019-04-06 23:56:29 +03:00
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	2019-04-06 23:55:58 +03:00
eugenijm	b3870df51f	Handle scheduled_at on status creation.	2019-04-06 23:55:58 +03:00
eugenijm	7bf622ce73	Add scheduled activities	2019-04-06 23:55:58 +03:00
eugenijm	7aa53d52bd	Return 403 on oauth token exchange for a deactivated user	2019-04-06 23:27:55 +03:00
Alex S	ce8d457132	little channges	2019-04-06 22:38:35 +07:00
Sadposter	c05fe4da0a	Document subscription endpoints, fix typos ... Also adds a quick error case on the subscription endpoints to avoid 500s	2019-04-06 16:20:06 +01:00
feld	9aeac7dcca	Merge branch 'feature/prometheus' into 'develop' ... Upstream: Metrics and debugging See merge request pleroma/pleroma!1020	2019-04-06 14:51:46 +00:00
Alex S	a53d591ac5	code style	2019-04-06 20:47:05 +07:00
Alex S	7410aee886	Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	2019-04-06 20:34:00 +07:00
Alex S	dcc54f8cfa	admin api endpoints for invites	2019-04-06 20:25:19 +07:00
Alex S	47b07cec49	token -> invite renaming	2019-04-06 20:24:22 +07:00
Alex S	be54e40890	twitter api registration ... fix for twitter api tests	2019-04-06 17:18:59 +07:00
Alex S	0484f3a8b1	generating tokens with mix	2019-04-06 16:58:22 +07:00
Sergey Suprunenko	325a268017	Redirect to the referer url after mastofe authorization	2019-04-05 23:36:42 +00:00
Mark Felder	b5a2d384f7	Redundant Repo.get_by usage was recently removed from the codebase	2019-04-05 11:41:41 -05:00
Roger Braun	7895ee37fa	Add user following / unfollowing to the admin api.	2019-04-05 11:27:07 -05:00
Sadposter	9ca91cbb87	Change relationship direction of subscriptions	2019-04-05 17:02:07 +01:00
Sadposter	d35f6551c1	Move subscriptions endpoint to be under /pleroma	2019-04-05 17:02:02 +01:00
Sadposter	d56866c824	Add subscribed status to user view ... Added in pleroma extensions, but can be moved whenever	2019-04-05 15:30:31 +01:00
Sadposter	316fe20d86	Make subscriptions the same direction as blocks ... That being, user - subscribes to -> users, rather than user - has subscribers -> users	2019-04-05 15:30:26 +01:00
Sadposter	23c4f49494	Fix subscription endpoint return formats	2019-04-05 15:30:24 +01:00
Sadposter	007762e767	Add notification checks	2019-04-05 15:30:23 +01:00
Sadposter	79910ce5cc	Add API endpoints and user column for subscription	2019-04-05 15:30:18 +01:00
Egor Kislitsyn	1c2e4f88d1	fix credo	2019-04-05 19:46:28 +07:00
Egor Kislitsyn	f1712cd2f1	Use PleromaJobQueue in Pleroma.Web.Push	2019-04-05 19:38:44 +07:00
rinpatch	f0f30019e1	Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi	2019-04-05 15:19:44 +03:00
Ivan Tashkinov	47a236f753	[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.	2019-04-05 15:12:02 +03:00
Ivan Tashkinov	3e7f2bfc2f	[#923] OAuthController#callback adjustments (with tests).	2019-04-05 09:19:17 +03:00
Ivan Tashkinov	45765918c3	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-04 23:43:08 +03:00
Ivan Tashkinov	f7cd9131d4	[#923] OAuth consumer controller tests. Misc. improvements.	2019-04-04 22:41:03 +03:00
Mark Felder	69038887b2	Code readability tweak	2019-04-04 12:36:57 -05:00
Egor Kislitsyn	0b5c818cb7	[#1] fix telemetry	2019-04-04 11:35:09 -05:00
href	bc3618a38d	Set up telemetry and prometheus	2019-04-04 11:30:43 -05:00
Egor Kislitsyn	cfa6e7289f	Improve Transmogrifier.upgrade_user_from_ap_id/2	2019-04-04 16:10:43 +07:00
Haelwenn (lanodan) Monnier	af0065a71f	mastodon_api_controller.ex: Add pleroma-tan to initial_state	2019-04-04 09:07:25 +02:00
lambda	3f8be270c6	Merge branch 'feature/robotstxt' into 'develop' ... Generate permissive or restrictive robots.txt in the config generator See merge request pleroma/pleroma!1012	2019-04-03 17:31:34 +00:00
Sachin Joshi	cd41584ac4	Generate permissive or restrictive robots.txt in the config generator	2019-04-03 22:12:58 +05:45
rinpatch	79cb34a4b0	Fix preview not being usable in form data	2019-04-02 23:07:16 +03:00
Haelwenn	0cb94cfa94	Merge branch 'fix-slow-relationships' into 'develop' ... ActivityPub Utils: Greatly speed up the follow / block activity fetching. See merge request pleroma/pleroma!1011	2019-04-02 18:43:48 +00:00
lambda	256b492a58	Merge branch 'bugfix/wrong-date-format' into 'develop' ... Support activities with dates in the Unix timestamp format Closes #763 See merge request pleroma/pleroma!1004	2019-04-02 14:18:23 +00:00
lambda	a79ce94dd4	Merge branch 'feature/fake-statuses' into 'develop' ... Add fake status submit See merge request pleroma/pleroma!995	2019-04-02 14:17:43 +00:00
lain	39bcf93007	Merge remote-tracking branch 'origin/develop' into fix-slow-relationships	2019-04-02 16:10:38 +02:00
lain	fd07745d1b	ActivityPub Utils: Greatly speed up the follow / block activity fetching.	2019-04-02 16:08:55 +02:00
Alex S	fa8483cb80	Merging develop into feature/770-add-emoji-tags ... Conflict test/web/twitter_api/util_controller_test.exs	2019-04-02 20:39:52 +07:00
Alex S	d140738edf	second level of headertext change in doc	2019-04-02 20:36:36 +07:00
lambda	180b87257c	Merge branch 'bugfix/share-mastodon' into 'develop' ... [OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002	2019-04-02 12:47:40 +00:00
lambda	ce9284b36f	Merge branch 'remove-user-activities' into 'develop' ... [#757] Add mix task to delete user's activities See merge request pleroma/pleroma!1008	2019-04-02 12:45:29 +00:00
lambda	b95cf3d490	Merge branch 'get_by_id' into 'develop' ... Replace `Repo.get_by` with existing functions See merge request pleroma/pleroma!1010	2019-04-02 12:43:28 +00:00
Alex S	9e0567ec52	Merge develop into feature/770-add-emoji-tags	2019-04-02 19:16:29 +07:00
rinpatch	fdb4357e9b	Rename fake param to preview and make the tests check that the object was not inserted to the db	2019-04-02 14:31:18 +03:00
Ivan Tashkinov	37925cbe78	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # lib/pleroma/web/oauth/oauth_controller.ex # lib/pleroma/web/router.ex	2019-04-02 14:05:34 +03:00
lambda	091baf9316	Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop' ... MastoAPI 2.6.0 `force_login` option Closes #734 See merge request pleroma/pleroma!999	2019-04-02 10:57:38 +00:00
lambda	26d509cc86	Merge branch 'get_by_id' into 'develop' ... Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible See merge request pleroma/pleroma!1009	2019-04-02 10:52:29 +00:00
cascode	95c92c49c9	Fix account lookup for nicknames beginning with numbers	2019-04-02 10:51:33 +00:00
Ivan Tashkinov	590c935d95	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-02 13:50:12 +03:00
Egor Kislitsyn	88d3cb44c3	replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname)	2019-04-02 17:47:02 +07:00
Egor Kislitsyn	1b3d921921	change Repo.get(User, id) => User.get_by_id(id)	2019-04-02 17:01:26 +07:00
Egor Kislitsyn	4212527928	change Repo.get(Activity, id) => Activity.get_by_id(id)	2019-04-02 16:50:31 +07:00
Sergey Suprunenko	3db9235150	Ignore dates in wrong formats	2019-04-02 11:32:36 +02:00
Egor Kislitsyn	a14742f495	add user delete_activities mix task	2019-04-02 16:30:11 +07:00
Alex S	08d64b977f	little changes and typos	2019-04-02 16:13:34 +07:00
Alex S	9b2188da7c	refactoring of emoji tags config to use groups	2019-04-02 15:44:56 +07:00
Egor Kislitsyn	a1869f5272	Merge remote-tracking branch 'pleroma/develop' into remove-user-activities	2019-04-02 15:41:30 +07:00
Sachin Joshi	f20e8d28de	add support for all status type (ostatus) and replase case with if	2019-04-02 12:18:00 +05:45
Ivan Tashkinov	aac48d0cc6	Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations	2019-04-02 09:19:10 +03:00
Sachin Joshi	6386c1c9c1	fetch url for OStatus to know if it is a/c or status	2019-04-02 10:26:09 +05:45
Haelwenn (lanodan) Monnier	f56eef8d8c	router: Add fake identity proof endpoint	2019-04-02 01:53:38 +02:00
Sergey Suprunenko	b6f9f7b8aa	Handle dates in the Unix timestamp format (Fixes #763)	2019-04-01 22:45:24 +02:00
Sachin Joshi	1d01e8e656	[OStatus] adds status to pleroma instance if the url given is a status	2019-04-01 22:26:58 +05:45
Ivan Tashkinov	6910fb371b	Fixed local MastoFE authentication / force_login option.	2019-04-01 17:25:25 +03:00
Ivan Tashkinov	cbe09d94d1	Added force_login authentication option (previously applied by default).	2019-04-01 14:46:50 +03:00
Alex S	17d3d05a71	code style ... little fix	2019-04-01 17:54:30 +07:00
Alex S	3601f03147	Adding tag to emoji ets table ... changes in apis	2019-04-01 17:17:57 +07:00
rinpatch	fe5145eeaa	Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex	2019-04-01 12:25:53 +03:00
rinpatch	975482f091	insert object defaults for fake activities and make credo happy	2019-04-01 12:16:51 +03:00
rinpatch	d866b59eea	oof	2019-04-01 11:58:08 +03:00
rinpatch	45ba10bf47	Fix the issue with HTML scrubber	2019-04-01 11:55:59 +03:00
Ivan Tashkinov	804173fc92	[#923] Minor code readability fix.	2019-04-01 09:45:44 +03:00
Ivan Tashkinov	eadafc88b8	[#923] Deps config adjustment (no override for httpoison), code analysis issues fixes.	2019-04-01 09:28:56 +03:00
Ivan Tashkinov	baffdcc480	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-01 08:49:32 +03:00
lain	629ad1766c	BBS: Some fixes.	2019-03-31 21:53:17 +02:00
lain	e3bf6655ba	Add replying.	2019-03-31 21:24:29 +02:00
lain	10fdc080a0	BBS: Tests and formatting.	2019-03-31 20:35:10 +02:00
lain	17ab9fa45b	BBS: Some more functionality.	2019-03-31 18:01:16 +02:00
lain	c810fb81a4	Basic SSH daemon.	2019-03-31 14:55:09 +02:00
rinpatch	cd387f8693	Add a fake option to lazy_put_actvity_defaults	2019-03-30 13:57:54 +03:00
rinpatch	1bb4d5d65b	Implement fake status submit	2019-03-29 21:59:04 +03:00
Egor	9a39d1d846	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00
Haelwenn (lanodan) Monnier	c8abef373b	mastodon_api_controller.ex: fallback to first for min_id	2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier	6b407872b4	mastodon_api_controller.ex: Use min_id in link header instead of since_id	2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier	e83ad12c57	pagination.ex: Drop atom keys in params ... Atom keys could also have been transformed to string, or the other way around but this one is more efficient and what we actually expect with the current param_types in Pagination	2019-03-28 17:18:59 +01:00
Haelwenn (lanodan) Monnier	6f15224053	activity_pub.ex: Move limit/max_id restrictions to Pagination helpers	2019-03-28 17:18:59 +01:00
eugenijm	cd90695a34	Add PUT /api/pleroma/notification_settings endpoint	2019-03-28 18:55:16 +03:00
eugenijm	55d086b520	Notification controls ... Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances	2019-03-28 07:52:07 +03:00
eugenijm	10c81fc902	Add user show endpoint for Pleroma admin API	2019-03-27 21:44:15 +03:00
Alex S	3ca6c4f443	password reset page labels align	2019-03-27 22:37:20 +06:30
Ivan Tashkinov	20e0f36605	Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth	2019-03-27 15:41:40 +03:00
Ivan Tashkinov	2a95014b9d	[#923] OAuth consumer improvements, fixes, refactoring.	2019-03-27 15:39:35 +03:00
lambda	926bf114b7	Merge branch 'feature/more-user-filters' into 'develop' ... Add more user filters + move search to its own module See merge request pleroma/pleroma!982	2019-03-27 11:33:13 +00:00
rinpatch	ce6d64bbd8	Fix missing announces in MastoAPI home timeline ... Closes #762	2019-03-27 12:28:53 +03:00
Maxim Filippov	3cf7539bca	Add more user filters + move search to its own module	2019-03-27 03:51:59 +05:00
eugenijm	a4ab60ac54	Add vapid_key to the POST /api/v1/apps response	2019-03-26 23:27:37 +03:00
eugenijm	691d1208b5	Add GET /api/v1/apps/verify_credentials	2019-03-26 21:53:28 +03:00
lambda	ff3b09f6b3	Merge branch 'fix/ap-icon' into 'develop' ... Do not federate instance avatar Closes #759 See merge request pleroma/pleroma!977	2019-03-26 16:12:50 +00:00
lambda	c6ab5ebe7c	Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop' ... Mastodon 2.7.2 instance attributes (registrations, languages) See merge request pleroma/pleroma!979	2019-03-26 16:01:52 +00:00
lain	10a7a4a868	AP UserView: Refactor banner / avatar display code, add test.	2019-03-26 16:59:28 +01:00
lambda	9e3899bf36	Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop' ... Mastodon-based auth error messages. User#auth_active?/1 refactoring. See merge request pleroma/pleroma!978	2019-03-26 15:13:55 +00:00
lambda	21ff78cd40	Merge branch 'replies-count' into 'develop' ... Increment replies_count (MastoAPI) Closes #756 See merge request pleroma/pleroma!974	2019-03-26 14:49:09 +00:00
rinpatch	406d19331f	Remove ActivityRepresenter	2019-03-26 17:16:21 +03:00
Ivan Tashkinov	eef1042b16	Mastodon 2.7.2 instance attributes (registrations, languages).	2019-03-26 16:27:17 +03:00
eugenijm	568e348588	Increment replies_count on replies (MastoAPI)	2019-03-26 15:27:04 +03:00
Ivan Tashkinov	b0759f821b	Comments split.	2019-03-26 15:24:29 +03:00
Ivan Tashkinov	263ca3dea2	Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true.	2019-03-26 15:09:06 +03:00
Mark Felder	c410296120	Try sending an empty map	2019-03-25 19:00:35 -05:00
Mark Felder	6f090f981b	Attempt to fix incorrect federation of default instance avatars	2019-03-25 18:47:04 -05:00
rinpatch	b028b0f97d	Merge branch 'bugfix/missing-announces' into 'develop' ... fix up missing announcements with preloads See merge request pleroma/pleroma!972	2019-03-25 09:24:08 +00:00
William Pitcock	26b0c802c3	fix up missing announcements with preloads	2019-03-25 07:38:09 +00:00
kaniini	bc14c98de1	Merge branch 'features/s3-uploader-digital-ocean' into 'develop' ... add overriding truncated_namespace condition for truncating paths for digital ocean See merge request pleroma/pleroma!969	2019-03-25 02:25:59 +00:00
kaniini	63ffa4842c	Merge branch 'fix/mastoapi-liked' into 'develop' ... Serve non-public activities in /api/v1/favourites Closes #648 See merge request pleroma/pleroma!970	2019-03-25 02:24:27 +00:00
rinpatch	a7f58b3c13	Serve non-public activities in /api/v1/favourites ... Fixes #648	2019-03-25 02:15:45 +03:00
Austin Lanari	6c96d68f77	add overriding truncated_namespace condition for truncating paths for digital ocean	2019-03-24 11:32:09 -07:00
rinpatch	750de7d842	Merge branch 'features/mrf-keyword-nil-summary' into 'develop' ... mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil See merge request pleroma/pleroma!968	2019-03-24 15:02:13 +00:00
Haelwenn (lanodan) Monnier	eab9425cc4	mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil	2019-03-24 15:47:50 +01:00
William Pitcock	4aa699271c	activity: use left join instead of inner join when fetching activities that may or may not have a child object	2019-03-23 03:17:50 +00:00
William Pitcock	332dc1371b	user: use preloads when deleting accounts	2019-03-23 03:06:00 +00:00
William Pitcock	debf7f016d	ostatus: use preload objects with Object.normalize() when opportunistic	2019-03-23 03:05:57 +00:00
William Pitcock	3c2350cbee	object: downgrade normalize warning to debug severity	2019-03-23 03:05:15 +00:00
William Pitcock	8c70156157	activitypub: object view: use preloaded object when possible	2019-03-23 03:05:14 +00:00
William Pitcock	f9d5c13b21	activity: add get_by_ap_id_with_object()	2019-03-23 03:05:13 +00:00
William Pitcock	ce47eb8b29	activitypub: when fetching objects, use the preloaded object from the synthesized activity	2019-03-23 03:05:10 +00:00
William Pitcock	aabcecb269	notification: formatting	2019-03-23 02:30:53 +00:00
William Pitcock	07cdd9ed02	streamer: use the preloaded object if possible	2019-03-23 02:29:01 +00:00
William Pitcock	c62220c500	rich media: helpers: only crawl Create activities	2019-03-23 02:28:59 +00:00
William Pitcock	9a06d9f6e8	notification: preload child objects	2019-03-23 02:28:57 +00:00
William Pitcock	4cedf45423	relay: use preloaded object since we always have it	2019-03-23 02:28:56 +00:00
William Pitcock	e430a71d37	ostatus: fetch preloaded object in note handler for testsuite	2019-03-23 01:17:26 +00:00
William Pitcock	73efe95368	activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)	2019-03-23 01:09:12 +00:00
William Pitcock	ba7299fc87	activitypub: add missing with_preloaded_object()	2019-03-23 00:53:35 +00:00
William Pitcock	e4307cadc8	activitypub: splice in the child object if we have one	2019-03-23 00:40:08 +00:00
William Pitcock	a6973a668e	formatting	2019-03-23 00:28:16 +00:00
William Pitcock	59518cbcd8	activity: fix credo nitpick	2019-03-23 00:26:12 +00:00
William Pitcock	b3bf523c09	rich media: use optimized Object.normalize()	2019-03-23 00:22:57 +00:00
William Pitcock	e75e43b949	common api: use the optimized Object.normalize whenever possible	2019-03-23 00:22:14 +00:00
William Pitcock	9aea7cc224	activitypub: preload child objects when fetching timelines	2019-03-23 00:10:17 +00:00
William Pitcock	092cedede5	activity: add with_preloaded_object() convenience	2019-03-23 00:09:56 +00:00
William Pitcock	62bccddde0	object: add support for preloading objects when walking an activity graph in normal form	2019-03-22 23:51:12 +00:00
rinpatch	1b33986bfa	Fix text being nullable in TwitterAPI	2019-03-23 00:10:50 +03:00
lambda	fee360e581	Merge branch 'safe-mentions' into 'develop' ... NodeInfo: Return safe_dm_mentions feature flag. See merge request pleroma/pleroma!964	2019-03-22 11:03:56 +00:00
lain	e2afce34b6	NodeInfo: Return safe_dm_mentions feature flag.	2019-03-22 11:57:20 +01:00
rinpatch	3229c7a1d6	Ensure fts is prefered over trigram and use union_all instead of union in user search query	2019-03-22 08:39:49 +03:00
William Pitcock	27e03a2177	reports: fix up email generation for remote reports	2019-03-22 01:17:14 +00:00
kaniini	1c3d3d0c2b	Merge branch 'safe-mentions' into 'develop' ... Add safe dm mode option. See merge request pleroma/pleroma!958	2019-03-22 00:50:24 +00:00
William Pitcock	3cc2554fa3	mastodon api: add conversation_id extension (ref #674)	2019-03-21 23:25:41 +00:00
William Pitcock	fea3696799	common api: move context functions from twitterapi	2019-03-21 23:24:04 +00:00
kaniini	bf8b29e080	Merge branch 'feature/move-search-to-db' into 'develop' ... Move gluing search results from application to database and get mutuals a higher score multiplier See merge request pleroma/pleroma!960	2019-03-21 21:41:04 +00:00
rinpatch	88096c65a5	Move gluing search results from application to database and get mutuals ... a higher score multiplier	2019-03-21 23:16:32 +03:00
Quentin Rameau	80bc9ed2ba	Add a gopher url port config option ... This lets the user advertise a different port in the gopher urls, for example listening locally on port 7070 but telling clients to connect to the regular port 70.	2019-03-21 19:59:43 +03:00
rinpatch	b92a16aa00	Merge branch 'ecto-3-migration' into 'develop' ... Ecto 3.0.7 (ecto_sql 3.0.5) migration See merge request pleroma/pleroma!957	2019-03-21 16:24:57 +00:00
lain	bf27190f7f	UtilController: Return state of safe dm mentions.	2019-03-21 16:20:58 +01:00
lain	8468f3f6d4	Add safe dm mode option.	2019-03-20 21:09:36 +01:00
Ivan Tashkinov	af68a42ef7	[#923] Support for multiple OAuth consumer strategies.	2019-03-20 20:25:48 +03:00
rinpatch	19a19bdd81	Fix migration timestamp type	2019-03-20 16:04:59 +03:00
rinpatch	9a7b817c9a	Ecto 3.0.5 migration ... kms	2019-03-20 15:59:54 +03:00
Ivan Tashkinov	e17a9a1f66	[#923] Nickname & email selection for external registrations, option to connect to existing account.	2019-03-20 10:35:31 +03:00
Maxim Filippov	7ac9fff437	Format	2019-03-20 01:40:50 +03:00
Maxim Filippov	ed8a2935f5	Use ILIKE to search users	2019-03-20 01:37:40 +03:00
William Pitcock	1685e4258f	transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection	2019-03-19 18:39:33 +00:00
William Pitcock	67ff8d9311	user: properly cope with actors which do not declare a followers collection	2019-03-19 18:23:06 +00:00
William Pitcock	cd055983c3	transmogrifier: when determining followers collection URI, we may need to fetch the actor	2019-03-19 18:04:57 +00:00
William Pitcock	d487b753c3	activitypub: transmogrifier: do not allow missing lists to be interpreted as nil	2019-03-19 17:30:25 +00:00
William Pitcock	798da28812	activitypub: transmogrifier: ensure as:Public activities are delivered to followers	2019-03-19 17:27:42 +00:00
kaniini	43bd7f47db	Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop' ... Order users by nickname See merge request pleroma/pleroma!945	2019-03-18 23:08:31 +00:00
kaniini	aba4c27120	Merge branch 'masto-api-notifications' into 'develop' ... Add support for exclude_types, limit and min_id in Mastodon notifications See merge request pleroma/pleroma!949	2019-03-18 19:17:36 +00:00
Ivan Tashkinov	40e9a04c31	[#923] Registration validations & unique index on [:user_id, :provider].	2019-03-18 20:31:24 +03:00
Ekaterina Vaartis	a1aacc08a4	Check if the user has indeed not been federated with ... Just updating the user triggered post fetching too, now it shouldn't. It only happened in the AP user fetching since that's what's used to update users	2019-03-18 20:16:31 +03:00
Ivan Tashkinov	8d21859717	[#923] External User registration refactoring, password randomization.	2019-03-18 18:09:53 +03:00
Zachary Dunn	97b35e00b0	Fix with expression always matching	2019-03-18 14:59:52 +00:00
Zachary Dunn	e572786dad	Run	2019-03-18 14:53:30 +00:00
Zachary Dunn	af4338da0c	Use better error message	2019-03-18 14:52:24 +00:00
Ivan Tashkinov	26b6354095	[#923] Support for multiple (external) registrations per user via Registration.	2019-03-18 17:23:38 +03:00
Zachary Dunn	5ba14c664b	Fix missing end brace	2019-03-18 14:05:10 +00:00
Zachary Dunn	a2e03d4f3c	Initial attempt at updating return type	2019-03-18 13:56:59 +00:00
eugenijm	1588688a11	Added support for exclude_types, limit, and min_id in Mastodon ... notifications. Unify Mastodon-compatible pagination logic.	2019-03-18 11:27:27 +03:00
Ivan Tashkinov	2a96283efb	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex	2019-03-18 10:26:41 +03:00
Haelwenn (lanodan) Monnier	f6fab01ba7	Web.Router: Add routes for Conversation mastoAPI	2019-03-17 17:06:28 +01:00
Fong-Wan Chau	4ed2618f6c	Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).	2019-03-17 11:03:19 -04:00
Maxim Filippov	93291c3d7a	Order users by nickname	2019-03-17 13:23:31 +03:00
kaniini	6d6f48d079	Merge branch 'feature/federated-flags' into 'develop' ... Federated reports See merge request pleroma/pleroma!935	2019-03-16 19:27:56 +00:00
lambda	28df397454	Merge branch 'feature/oauth-me' into 'develop' ... oauth: add me property to token responses See merge request pleroma/pleroma!942	2019-03-16 08:44:02 +00:00
kaniini	c69dc2acf1	Merge branch 'feature/reblog-muting' into 'develop' ... Implement mastodon's reblog hiding feature See merge request pleroma/pleroma!916	2019-03-16 04:31:31 +00:00
William Pitcock	e0edc706cf	oauth: add me property to token responses	2019-03-16 01:12:50 +00:00
eugenijm	43fb03be5a	Allow to mark a single notification as read	2019-03-15 23:56:14 +03:00
kaniini	4b3c86c1a6	Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop' ... MediaProxy: parse filename from content-disposition for non-whitelisted types See merge request pleroma/pleroma!936	2019-03-15 20:06:08 +00:00
kaniini	8b352af4dd	Merge branch 'feature/openldap-support' into 'develop' ... OpenLDAP support Closes #203 See merge request pleroma/pleroma!859	2019-03-15 19:57:09 +00:00
Ivan Tashkinov	2739057442	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-03-15 17:11:00 +03:00
Ivan Tashkinov	aacbf0f570	[#923] OAuth: prototype of sign in / sign up with Twitter.	2019-03-15 17:08:03 +03:00
Karen Konou	d8244c2a1b	remove unused function	2019-03-15 15:03:03 +01:00
Karen Konou	dfeb3aec44	fix credo warning	2019-03-15 14:36:07 +01:00
Karen Konou	094e1ef048	formatting	2019-03-15 14:28:14 +01:00
Karen Konou	da53c079db	Refactor to store user ap_id, add tests	2019-03-15 14:20:08 +01:00
Karen Konou	be465c762b	formatting	2019-03-15 14:18:53 +01:00
Karen Konou	15b21d1983	refactor filtering mechanism	2019-03-15 14:18:53 +01:00
Karen Konou	aa71139e4a	Fix elixir 1.8 vs 1.7 format conflict	2019-03-15 14:18:53 +01:00
Karen Konou	fe4c1d26fc	Add ActivityPub.contain_activity checks to streamer	2019-03-15 14:18:53 +01:00
Karen Konou	c8f31e0bc2	Implement mastodon's reblog hiding feature	2019-03-15 14:18:21 +01:00
Haelwenn	41fc67aa49	Merge branch 'mastoapi/mime_type' into 'develop' ... Extend MastoAPI to provide attachment mimetypes See merge request pleroma/pleroma!938	2019-03-15 09:48:50 +00:00
rinpatch	d7a34b604b	Extend MastoAPI to provide attachment mimetypes	2019-03-15 11:58:12 +03:00
rinpatch	d02f1120f9	Content-Disposition regex improvements	2019-03-15 08:29:51 +03:00
kaniini	0f42ea87d6	Merge branch 'notifications-is-seen' into 'develop' ... MastoAPI notifications is_seen See merge request pleroma/pleroma!934	2019-03-15 02:59:17 +00:00
kaniini	c708656b5e	Merge branch 'robotstxt' into 'develop' ... Add robots.txt Closes #723 See merge request pleroma/pleroma!929	2019-03-15 02:50:27 +00:00
William Pearson	3dadaa4432	robots.txt ... Add default robots.txt that allows bots access to all paths. Add mix task to generate robots.txt taht allows bots access to no paths. Document custom emojis, MRF and static_dir static_dir documentation includes docs for the robots.txt Mix task.	2019-03-15 02:28:18 +00:00
rinpatch	958227d556	MediaProxy: parse filename from content-disposition for non-whitelisted types	2019-03-15 01:36:29 +03:00
eugenijm	100413bf2c	Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests	2019-03-15 01:35:48 +03:00
William Pitcock	423fd07928	activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable	2019-03-14 19:52:08 +00:00
William Pitcock	5c7b774f09	reports: unify sending e-mail for both remote and local reports	2019-03-14 19:44:08 +00:00
William Pitcock	64b0120d67	activitypub: add support for forwarding reports	2019-03-14 19:36:17 +00:00
rinpatch	cbdd11c381	Merge develop to bump elixir version in the CI so I don't get failing formatting	2019-03-14 22:33:20 +03:00
William Pitcock	3b48d5f0c2	common api: add support for forwarding reports	2019-03-14 19:29:33 +00:00
William Pitcock	379442ad17	activitypub: utils: also match Activity objects	2019-03-14 19:29:04 +00:00
William Pitcock	0f3ecb2bfb	activitypub: transmogrifier: accept remote Flag activities	2019-03-14 19:06:02 +00:00
William Pitcock	f86f7dbb8f	activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs	2019-03-14 19:05:42 +00:00
rinpatch	e2fe796c63	Add some tests	2019-03-14 22:02:48 +03:00
rinpatch	34fc0dca2e	Merge branch 'hotfix/delete-activities' into 'develop' ... Fix delete activities not federating See merge request pleroma/pleroma!933	2019-03-14 17:49:00 +00:00
rinpatch	e630e5e135	Fix delete activities not federating	2019-03-14 20:43:14 +03:00
link0ff	54e7087ab4	Merge remote-tracking branch 'upstream/develop' into feature/openldap-support	2019-03-14 17:43:30 +02:00
kaniini	59333f2d56	Merge branch 'admin-api-account-view-namespace' into 'develop' ... MastodonAPI.Admin.AccountView → AdminAPI.AccountView See merge request pleroma/pleroma!930	2019-03-14 02:01:10 +00:00
kaniini	86871c8a04	Merge branch 'feature/add-local-to-users-admin-api' into 'develop' ... Add "local" & "tags" to users admin API See merge request pleroma/pleroma!932	2019-03-14 02:00:47 +00:00
Maxim Filippov	f3964f4024	Ensure empty array is returned for tags	2019-03-14 03:17:09 +03:00
Maxim Filippov	257d8e78e5	Add tags	2019-03-14 01:52:24 +03:00
kaniini	4e72762322	Merge branch 'mastofe-content-types' into 'develop' ... Set content types settings on mastofe endpoint. See merge request pleroma/pleroma!894	2019-03-13 22:04:23 +00:00
eugenijm	e416c344dd	Unify unfollow, accept and reject follow requests using CommonAPI	2019-03-13 20:28:36 +03:00
Maxim Filippov	490d9cf7b1	Add "local" to users admin API	2019-03-13 16:04:44 +03:00
Haelwenn (lanodan) Monnier	cc0f2f8ba3	MastodonAPI.Admin.AccountView → AdminAPI.AccountView	2019-03-13 12:17:57 +01:00
Haelwenn (lanodan) Monnier	d43b1c0b5d	Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	4b73ca638e	[Credo][CI] Add readability as it’s fixed	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	23960309a0	[Credo] Change quoted string with 3+ quotes to sigils	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	c42d34b2ec	[Credo] fix Credo.Check.Readability.MaxLineLength	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	8cd3eada7d	[Credo] write large numbers with underscore separation	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	c3d41b2b6e	[Credo] make all variables use snake_case	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	fb82f6fc7c	[Credo] Remove parentesis on argument-less functions	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	a3a9cec483	[Credo] fix Credo.Check.Readability.AliasOrder	2019-03-13 04:26:54 +01:00
Haelwenn (lanodan) Monnier	4c440f12c3	[Credo] Fix the consistency	2019-03-13 04:17:30 +01:00
Haelwenn (lanodan) Monnier	6c8743d0c0	[Credo] Fix the warnings	2019-03-13 04:17:30 +01:00
Maxim Filippov	25eb6cf1cb	Add "roles" to users admin API	2019-03-12 22:15:28 +03:00
kaniini	c231ed610a	Merge branch 'masto-api-followers-following' into 'develop' ... MastoAPI followers/following endpoints See merge request pleroma/pleroma!924	2019-03-12 16:27:47 +00:00
link0ff	9338f061a3	Support LDAP method start_tls	2019-03-12 18:20:02 +02:00
Egor Kislitsyn	16e598ec11	fix wording	2019-03-12 22:12:05 +07:00
Egor Kislitsyn	d013b58e84	add mix pleroma.user delete_activities NICKNAME task	2019-03-12 22:04:08 +07:00
eugenijm	984b5f8adf	MastoAPI followers/following endpoints	2019-03-12 16:01:24 +03:00
rinpatch	92a69bddce	escape quotation marks in Content-Disposition header	2019-03-12 09:21:13 +03:00
rinpatch	5a73cae2be	WIP: Stop mangling filenames	2019-03-12 09:10:19 +03:00
kaniini	4aa285e6ce	Merge branch 'add-screenname-extension-to-masto-api' into 'develop' ... MastoAPI Accounts: Add fetching by nickname. See merge request pleroma/pleroma!922	2019-03-11 21:43:46 +00:00
lain	07277879e5	Linting.	2019-03-11 19:32:21 +01:00
lain	600f428db4	WebPush: Add activity id to the push messages. ... Makes it easier to relate the push to a given status.	2019-03-11 19:23:21 +01:00
Ivan Tashkinov	63ab61ed3f	Sign in via Twitter (WIP).	2019-03-11 20:37:26 +03:00
lain	3474066f6d	MastoAPI Accounts: Add fetching by nickname. ... This is to make it easier for the frontends to handle domain.com/users/nickname urls.	2019-03-11 15:18:32 +01:00
lambda	2c8deecdd2	Merge branch 'add-local-field-to-status' into 'develop' ... MastoAPI StatusView: Add locality indicator. See merge request pleroma/pleroma!920	2019-03-11 13:26:12 +00:00
lambda	d9ae2d00a1	Merge branch 'feat/style-oauth-login-page' into 'develop' ... Style again the OAuth login page to fit pleroma more See merge request pleroma/pleroma!921	2019-03-11 13:19:24 +00:00
Shpuld Shpuldson	50edead11c	Remove chromium input hilight that clashes with our own	2019-03-11 15:10:42 +02:00
Shpuld Shpuldson	8ddbedcd9a	Style again the login page to fit pleroma more	2019-03-11 14:57:04 +02:00
lain	4811eefa6e	MastoAPI StatusView: Add locality indicator.	2019-03-11 13:48:27 +01:00
eugenijm	6038c8a753	Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec	2019-03-11 09:02:03 +03:00
William Pitcock	1f78d23eed	http: connection: unify adapter configuration and defaults	2019-03-08 22:59:10 +00:00
William Pitcock	ba48bd901c	http: connection: relax the timeouts a little	2019-03-08 22:56:16 +00:00
William Pitcock	19afd9f81f	http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout	2019-03-08 22:56:16 +00:00
William Pitcock	773f532b14	http: actually pass the options list to the Connection factory	2019-03-08 22:56:16 +00:00
William Pitcock	50ba4ba2c9	http: connection: merge hackney option lists instead of concatenating them ... this ensures the right pools are used	2019-03-08 22:56:16 +00:00
William Pitcock	2a83c0ba93	http: safely catch erlang exits and elixir errors from hackney (ref #672)	2019-03-08 22:56:16 +00:00
kaniini	46200d8fac	Merge branch 'fix-tlsv1.3' into 'develop' ... Fix supported TLS versions as TLS 1.3 support seems buggy. Closes #708 See merge request pleroma/pleroma!892	2019-03-08 22:53:12 +00:00
kaniini	735f40047a	Merge branch 'delete-status' into 'develop' ... Allow an admin to delete a user status #721 (MastoAPI) See merge request pleroma/pleroma!914	2019-03-08 22:47:41 +00:00
kaniini	130fc9eae6	Merge branch 'fetch-posts-on-first-federation' into 'develop' ... Fetch user's outbox posts on first federation with that user Closes #131 See merge request pleroma/pleroma!907	2019-03-08 22:33:31 +00:00
eugenijm	2827dfea50	Allow an admin to delete a user status	2019-03-08 20:21:56 +03:00
Ekaterina Vaartis	5021b7836f	Fetch user's outbox posts on first federation with that user	2019-03-08 16:27:56 +03:00
William Pitcock	e53a9fd15e	MRF: anti followbot: gracefully handle accounts without a display name	2019-03-07 12:13:48 +00:00
rinpatch	992145e64c	Merge branch 'bugfix/delete-activity-audience' into 'develop' ... expand the audience of delete activities to all recipients of the deleted object Closes #682 See merge request pleroma/pleroma!891	2019-03-07 11:31:08 +00:00
Karen Konou	c2faae70df	Adjust delete activity audience to match the deleted object	2019-03-07 12:26:03 +01:00
Karen Konou	6a69ece437	Revert existing object check	2019-03-07 11:53:15 +01:00
eugenijm	7342b5a45f	Preserve parameters in link headers (Mastodon API)	2019-03-07 09:12:16 +03:00
kaniini	0fe715f3ba	Merge branch 'chore/merge-search-into-list-users' into 'develop' ... Merge search endpoint into /users See merge request pleroma/pleroma!898	2019-03-06 22:27:42 +00:00
kaniini	39b766cc43	Merge branch 'bugfix/connect-src-https' into 'develop' ... Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src See merge request pleroma/pleroma!900	2019-03-06 13:22:02 +00:00
kaniini	07f8c79a69	Merge branch 'bugfix/rel-me_list' into 'develop' ... Web.RelMe: Fix having other values in rel attr See merge request pleroma/pleroma!901	2019-03-06 13:20:51 +00:00
Maksim	bc7570c282	[#647] tests for web push	2019-03-06 13:20:12 +00:00
Haelwenn	96901b6554	Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop' ... Properly escape reserved URI charachters in upload urls Closes #700 See merge request pleroma/pleroma!905	2019-03-06 01:45:17 +00:00
Karen Konou	28d5b40d0a	Add handling of objects not in database	2019-03-05 23:15:22 +01:00
rinpatch	4263edc9c9	Properly escape reserved URI charachters in upload urls	2019-03-05 18:09:23 +03:00
rinpatch	bcd8ef65e0	Merge branch 'add-admin-to-node-info' into 'develop' ... Include admins in nodeinfo Closes #689 See merge request pleroma/pleroma!899	2019-03-05 07:05:44 +00:00
Haelwenn (lanodan) Monnier	788a354ce0	Web.RelMe: Fix having other values in rel attr ... One example of this is Github which puts a rel="nofollow me" on the profile link.	2019-03-05 02:13:22 +01:00
Haelwenn (lanodan) Monnier	fc37e5815f	Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src ... Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469	2019-03-05 01:44:24 +01:00
eugenijm	d1de0a30cc	Include admins in nodeinfo	2019-03-05 03:17:24 +03:00
Maxim Filippov	2d30fc279f	Typo	2019-03-05 02:11:15 +03:00
William Pitcock	b7aa1ea9e6	rich media: helpers: rework validate_page_url()	2019-03-04 18:39:13 +00:00
William Pitcock	9f3cb38012	helpers: use AutoLinker to validate URIs as well as the other tests	2019-03-04 18:31:49 +00:00
William Pitcock	d38d537bee	rich media: don't crawl bogus URIs	2019-03-04 18:31:49 +00:00
kaniini	d45dbdce5a	Merge branch 'feature/add-status-text-to-notifications' into 'develop' ... Add status text to notifications (mentions and reposts) Closes #696 See merge request pleroma/pleroma!897	2019-03-04 18:29:13 +00:00
Maxim Filippov	f620199836	Merge search endpoint into /users	2019-03-04 21:26:32 +03:00
Maxim Filippov	0245ce842f	Remove unused code	2019-03-04 20:49:20 +03:00
Maxim Filippov	cc7b35e097	Add status text to notifications (mentions and reposts)	2019-03-04 20:47:34 +03:00
kaniini	ca5d894e68	Merge branch 'fix/like-adressing' into 'develop' ... Stop adresssing like activities to actor's follower collection on non-public posts See merge request pleroma/pleroma!896	2019-03-04 15:59:57 +00:00
rinpatch	33c614bce0	Stop adresssing like activities to actor's follower collection on non-public posts	2019-03-04 18:09:58 +03:00
Egor Kislitsyn	22ac2288be	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-03-04 20:48:43 +07:00
kaniini	10248d86a2	Merge branch 'unify-follow' into 'develop' ... Unify follow code with CommonAPI Closes #690 See merge request pleroma/pleroma!889	2019-03-04 13:25:32 +00:00
Egor Kislitsyn	eb84de0143	allow users to disable their own account	2019-03-04 19:55:11 +07:00
KokaKiwi	bf43f055dd	Set content types settings on mastofe endpoint.	2019-03-04 12:00:02 +01:00
KokaKiwi	b57913b13a	Fix supported TLS versions as TLS 1.3 support seems buggy.	2019-03-04 11:30:26 +01:00
Karen Konou	1445dc25d4	fix format	2019-03-04 11:18:45 +01:00
Karen Konou	aab86698a5	Expand "to" of delete activities	2019-03-04 11:18:45 +01:00
eugenijm	86e4b48a5e	Fix DM visibility for blocking users	2019-03-04 06:24:27 +03:00
eugenijm	594694607c	Unify Mastodon and Twitter follow implementations using CommonAPI	2019-03-04 01:00:37 +03:00
kaniini	dd5865535e	Merge branch 'muting' into 'develop' ... Don't stream muted accounts See merge request pleroma/pleroma!888	2019-03-03 21:10:10 +00:00
William Pearson	818a7894da	Don't stream muted accounts	2019-03-03 20:54:53 +00:00
link0ff	88a672fe88	Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well	2019-03-03 21:20:36 +02:00
link0ff	19e2b85247	Merge remote-tracking branch 'upstream/develop' into feature/openldap-support	2019-03-03 18:29:37 +02:00
kaniini	ace4231628	Merge branch 'features/bio_rel_me' into 'develop' ... Add rel=me to the User bio Closes #423 See merge request pleroma/pleroma!813	2019-03-03 16:00:49 +00:00
kaniini	6c6a2dbfdd	Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop' ... Add pagination and search to users See merge request pleroma/pleroma!873	2019-03-03 15:59:15 +00:00
kaniini	b531e366df	Merge branch 'get-follow-requests-sql' into 'develop' ... Use sql query in User.get_follow_requests/1 for filtering logic See merge request pleroma/pleroma!883	2019-03-03 15:51:32 +00:00
kaniini	413cf00cc3	Merge branch 'atomic-note-count-updates' into 'develop' ... Atomic update for note count and follower count See merge request pleroma/pleroma!885	2019-03-03 15:50:41 +00:00
kaniini	c93479c6f5	Merge branch 'count-only-public-statuses' into 'develop' ... Increment user note count only on public activities #703 See merge request pleroma/pleroma!884	2019-03-03 15:49:19 +00:00
eugenijm	d5418e9ff7	Remove follow_request_count as it's not needed for FE anymore. ... MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses `GET /api/pleroma/friend_requests` which they query on the initial page load.	2019-03-03 18:42:27 +03:00
eugenijm	af0039a3a0	Use atomic update for note count and follower count	2019-03-03 17:41:34 +03:00
lambda	9b63fda9c7	Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop' ... [#675] Do not show DMs in mentions timeline See merge request pleroma/pleroma!877	2019-03-03 11:13:59 +00:00
eugenijm	c46950d3b1	Increment user note count only on public activities	2019-03-03 14:08:43 +03:00
eugenijm	1a1f4520cd	Use sql query in User.get_follow_requests/1 for filtering logic	2019-03-02 22:18:56 +03:00
Maxim Filippov	2ec8cf5665	Add pagination to search	2019-03-02 17:21:30 +03:00
rinpatch	f38c316e6e	Merge branch 'bugfix/oauth-scopes-join' into 'develop' ... Bugfix: OAuth scopes formatting Closes #702 See merge request pleroma/pleroma!881	2019-03-02 06:39:07 +00:00
Haelwenn (lanodan) Monnier	f2452d5700	Pleroma.User: mix format	2019-03-02 07:04:49 +01:00
Haelwenn (lanodan) Monnier	8e6f7fdb86	RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil	2019-03-02 06:58:42 +01:00
Haelwenn (lanodan) Monnier	39a5bea9b7	Pleroma.User: Fix syntax and user.ap_id call	2019-03-02 06:57:28 +01:00
Haelwenn (lanodan) Monnier	3d22642352	Pleroma.User: Pass an array to profile_urls	2019-03-02 06:33:15 +01:00
Haelwenn (lanodan) Monnier	9b83236fb0	Pleroma.Web.RelMe: fixups	2019-03-02 06:32:03 +01:00
Haelwenn (lanodan) Monnier	56d4e39012	Pleroma.User: Add rel=me to URLs where it linkbacks to the profile	2019-03-02 05:36:48 +01:00
Haelwenn (lanodan) Monnier	b6a001a34c	Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response	2019-03-02 04:04:16 +01:00
Maxim Filippov	f635b675b2	Refactor a little bit	2019-03-01 21:17:23 +03:00
Maxim Filippov	f1a4c3163b	Show current user in users list as well	2019-03-01 20:23:03 +03:00
Maxim Filippov	5b08b470f6	Add "local" params to users search	2019-03-01 20:13:02 +03:00
William Pitcock	689b0730f8	activitypub: fix date header format ... HTTP date header specification says that days must always be two-digit. Accordingly, change the format string used to ensure days are always represented as two-digit (e.g. 01).	2019-03-01 12:22:45 +00:00
lambda	2f00814475	Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop' ... Bugfix #236 Prefer user look-up by nickname See merge request pleroma/pleroma!860	2019-03-01 09:48:24 +00:00
rinpatch	1341ee650e	[#675] Do not show DMs in mentions timeline	2019-03-01 09:37:29 +03:00
William Pitcock	28b4093233	mastodon websocket: return errors using ok, not stop	2019-02-28 16:23:55 +00:00
William Pitcock	388a3f4ca2	mastodon websocket: bring back infinity timeout	2019-02-28 16:23:24 +00:00
Maxim Filippov	46f29b9da1	Add search users endpoint	2019-02-28 19:04:47 +03:00
William Pitcock	f1d37a5e23	mastodon websocket: use pattern match to get query data, robustly handle errors	2019-02-28 16:02:48 +00:00
William Pitcock	bc53dff5b6	mastodon api: websocket: update code for cowboy 2.x	2019-02-28 15:44:12 +00:00
Maxim Filippov	72b7a0797e	Use Mastodon API views in Admin API	2019-02-28 17:43:09 +03:00
href	a47cc5a2cf	Merge branch 'customizable_auth' into 'develop' ... Authenticator tweaks See merge request pleroma/pleroma!875	2019-02-28 11:18:01 +00:00
Ivan Tashkinov	3281a3f074	Renamed *DatabaseAuthenticator to *Authenticator.	2019-02-28 14:12:41 +03:00
Ivan Tashkinov	4e77f68414	Added auth_template/0 to DatabaseAuthenticator.	2019-02-28 13:58:58 +03:00
kaniini	cf426a719d	Merge branch 'with-mutes' into 'develop' ... Add `with_muted` param. Closes #683 See merge request pleroma/pleroma!872	2019-02-28 10:22:19 +00:00
href	90a24fbf95	Merge branch 'customizable_auth' into 'develop' ... Auth customization support See merge request pleroma/pleroma!852	2019-02-28 10:12:26 +00:00
kaniini	089e2588a3	Merge branch 'speedup-follow-requests' into 'develop' ... Speedup follow requests Closes #677 See merge request pleroma/pleroma!871	2019-02-28 10:10:03 +00:00
kaniini	3c849d0438	Merge branch 'deactivated-in-user-view' into 'develop' ... Add activation status to the regular user view See merge request pleroma/pleroma!874	2019-02-28 10:08:31 +00:00
Ivan Tashkinov	b6f915313f	Made auth customization be runtime-configurable.	2019-02-28 13:00:54 +03:00
eugenijm	6b11011039	Added deactivated to the user view	2019-02-28 09:08:34 +03:00
Maxim Filippov	2883f75a3a	Add pagination to users admin API	2019-02-28 01:11:56 +03:00
lain	bbbdbec4fd	Remove parts of the old activity view. ... Not used anymore.	2019-02-27 17:24:51 +01:00
lain	9ade1242c2	Add user muted status info to twitterapi.	2019-02-27 16:52:03 +01:00
lain	c1ae495878	Add user muted status info to MastodonAPI.	2019-02-27 16:46:47 +01:00
lain	c4235f96bd	Add with_muted param.	2019-02-27 16:37:42 +01:00
lain	b24cc44e8d	Follower requests: Utilize object index. ... Closes #677	2019-02-27 15:01:54 +01:00
William Pitcock	1536640962	mastodon api: embed relationship card under account card for Pleroma FE convenience	2019-02-27 13:01:10 +00:00
Egor Kislitsyn	5d961d536c	fix formatter	2019-02-27 15:40:30 +07:00
Egor	c3ac9424d2	AutoLinker	2019-02-26 23:32:26 +00:00
Maxim Filippov	90d0d055fc	Add more admin actions	2019-02-27 00:13:38 +03:00
Ivan Tashkinov	e98d34e5fb	Added missing copyright headers.	2019-02-26 16:26:54 +03:00
Ivan Tashkinov	fd46edb473	Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth	2019-02-26 15:29:43 +03:00
Ivan Tashkinov	e82b70eb53	Database authenticator behaviour / Pleroma implementation refactoring.	2019-02-26 15:27:01 +03:00
William Pitcock	fc9d895ebc	twitter card: remove IO.inspect() spam	2019-02-24 18:56:44 +00:00
11backslashes	efa506b874	delegate user retrieval to the User module	2019-02-24 13:23:47 -05:00
link0ff	e278d47023	OpenLDAP support	2019-02-22 15:03:43 +02:00
lain	9e0686efa6	Move visibility into own module.	2019-02-22 13:29:52 +01:00
lain	62296f5a25	Fix private post card handling.	2019-02-22 12:02:51 +01:00
Ivan Tashkinov	afddce45b3	Minor setting name adjustment (:app_template -> :app_layout).	2019-02-22 11:10:17 +03:00
kaniini	5a4e2905fe	Merge branch 'fix/twittercards' into 'develop' ... Fix Twitter Cards See merge request pleroma/pleroma!815	2019-02-22 04:38:14 +00:00
KZ	7c722c08f5	Fix: Fixing an outbox related bug when local user activity is empty	2019-02-22 04:37:48 +00:00
Ivan Tashkinov	1097ce6d9f	Auth customization support. ... OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.	2019-02-21 18:55:19 +03:00
lambda	2813f28b6f	Merge branch 'bugfix/httpsig-sign-date' into 'develop' ... activitypub: sign date header Closes #649 and #364 See merge request pleroma/pleroma!847	2019-02-21 08:20:06 +00:00
William Pitcock	f8a72f2997	activitypub: sign http date header	2019-02-21 00:23:17 +00:00
William Pitcock	1803d9a022	fix fetching AP objects with application/json	2019-02-20 20:45:40 +00:00
William Pitcock	22e2ed235d	logging: only return ISE reasons in API responses when in dev or test mode	2019-02-20 17:36:47 +00:00
William Pitcock	8b08096436	logging: improve visibility into ISE errors	2019-02-20 17:14:18 +00:00
Egor	bff9eb5ef7	Reports	2019-02-20 16:51:25 +00:00
lain	59c27f29c8	Add some nicer urls in status view.	2019-02-20 17:36:16 +01:00
Ivan Tashkinov	b574d97c2e	[#468] Added support for push OAuth scope (Mastodon 2.4+).	2019-02-20 17:27:41 +03:00
Ivan Tashkinov	6fe7acd58e	[#468] Merged upstream/develop.	2019-02-20 16:48:59 +03:00
lambda	11b3c10c54	Merge branch 'muting' into 'develop' ... Implement muting, add it to the whole mastodon API See merge request pleroma/pleroma!319	2019-02-20 13:19:37 +00:00
Ivan Tashkinov	3ad91ec3c1	[#468] Adjusted scope restriction for MastodonAPIController#index.	2019-02-20 14:05:02 +03:00
Ekaterina Vaartis	5a46d37af9	Update the mute implementation to the current codebase ... Make it part of the info thing (and do a migration to ensure it's there)	2019-02-19 23:09:16 +03:00
Ekaterina Vaartis	465b547c90	Remove unused "muted" parameter, use piping for mute/block fns	2019-02-19 21:49:55 +03:00
Ekaterina Vaartis	092b1b1453	Do not unfollow muted users	2019-02-19 21:49:55 +03:00
Ekaterina Vaartis	da64ea4a55	Implement mastodon mutes endpoint ... Aparently i forgot to add it, it gets a list of muted users	2019-02-19 21:49:55 +03:00
Ekaterina Vaartis	f41f017bbc	Implement muting, add it to the mastodon API	2019-02-19 21:49:55 +03:00
href	f4bfc628ca	Player: allow styles on CSP, loop videos	2019-02-19 18:56:57 +01:00
href	aa9af1d639	CSP: Allow iframes on embed player	2019-02-19 18:19:13 +01:00
Mark Felder	2d21ea1a0e	Merge branch 'develop' into fix/twittercards	2019-02-19 16:58:28 +00:00
href	10a11f083c	Embed player suitable for Twitter Cards	2019-02-19 17:47:48 +01:00
eugenijm	25b9e7a8c3	Added admin API for changing user activation status	2019-02-19 19:37:02 +03:00
Ivan Tashkinov	c0ecbf6669	[#468] Merged upstream/develop.	2019-02-19 19:10:55 +03:00
lambda	1dd718e83c	Merge branch 'set-cache-on-user-tag-update' into 'develop' ... Update user cache when user tags are updated See merge request pleroma/pleroma!840	2019-02-19 14:20:58 +00:00
lambda	f25a3f4f78	Merge branch 'fix/check-follower-collection-in-is_private' into 'develop' ... properly check for follower address in is_private? See merge request pleroma/pleroma!841	2019-02-19 14:08:19 +00:00
lambda	f53dc5ee08	Merge branch 'fix/ap_id-unique_constraint' into 'develop' ... mark ap_id unique_constraint See merge request pleroma/pleroma!842	2019-02-19 14:07:16 +00:00
rinpatch	109b01a631	mark ap_id unique_constraint	2019-02-19 13:52:15 +03:00
rinpatch	96dcacade1	properly check for follower address in is_private?	2019-02-19 13:23:13 +03:00
eugenijm	fc35481445	Update user cache when user tags are updated	2019-02-19 10:43:38 +03:00
kaniini	833161b5d2	Merge branch 'feature/jobs' into 'develop' ... Job Queue See merge request pleroma/pleroma!732	2019-02-18 19:43:06 +00:00
kaniini	a39a094cda	Merge branch 'patch-image-description' into 'develop' ... Patch to support image descriptions for pleroma-fe See merge request pleroma/pleroma!626	2019-02-18 04:11:46 +00:00
kaniini	7456338ed3	Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop' ... Add OAuth tokens endpoint See merge request pleroma/pleroma!805	2019-02-18 04:02:41 +00:00
kaniini	c23bd05737	Merge branch 'features/flavour-switching' into 'develop' ... [MastoAPI] Add switching of frontend flavours See merge request pleroma/pleroma!807	2019-02-18 04:01:51 +00:00
kaniini	cd019a5927	Merge branch 'follow-request-count' into 'develop' ... Follow request count See merge request pleroma/pleroma!817	2019-02-18 04:01:26 +00:00
kaniini	3f38a05571	Merge branch 'csv-export' into 'develop' ... Add option to return all friends in twitter api. Closes #602 See merge request pleroma/pleroma!833	2019-02-18 03:59:46 +00:00
Maxim Filippov	94708d6370	Render only "id", "valid_until" and "app_name" in TokenView	2019-02-17 23:57:35 +03:00
lambda	f26582aae9	Merge branch 'mastoapi-stop-capping-attachments' into 'develop' ... Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon See merge request pleroma/pleroma!834	2019-02-17 17:37:48 +00:00
lambda	ae84af4ad0	Merge branch 'fix/hellthread-policy-recipient-check' into 'develop' ... Fix recipient count in hellthread policy See merge request pleroma/pleroma!836	2019-02-17 16:57:57 +00:00
Ivan Tashkinov	d3fe2c8ec6	[#468] Formatting fix.	2019-02-17 14:07:35 +03:00
Ivan Tashkinov	bc4f77b10b	[#468] Merged upstream/develop, resolved conflicts.	2019-02-17 14:07:04 +03:00
Ivan Tashkinov	dcf24a3233	[#468] Refactored OAuth scopes' defaults & missing selection handling.	2019-02-17 13:49:14 +03:00
rinpatch	8f98d970c1	Fix recipient count in hellthread policy	2019-02-17 13:46:40 +03:00
Haelwenn (lanodan) Monnier	4df455f69b	[MastoAPI] Add switching of frontend flavours	2019-02-16 19:50:13 +01:00
rinpatch	96c725328b	Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon	2019-02-16 20:38:25 +03:00
lain	269d3e1ca6	WelcomeMessage: Get rid of Ecto reference.	2019-02-16 17:24:48 +01:00
lain	38e15930cb	Add option to return all friends in twitter api. ... Mainly useful for user export.	2019-02-16 17:01:15 +01:00
lain	d812a347ca	Add optional welcome message.	2019-02-16 16:42:34 +01:00
Ivan Tashkinov	2a4a4f3342	[#468] Defined OAuth restrictions for all applicable routes. ... Improved missing "scopes" param handling. Allowed "any of" / "all of" mode specification in OAuthScopesPlug. Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.	2019-02-15 19:54:37 +03:00
lambda	1ce1b7b58d	Merge branch 'bugfix/oauth-token-padding' into 'develop' ... oauth: never use base64 padding when returning tokens to applications See merge request pleroma/pleroma!825	2019-02-15 14:58:13 +00:00
rinpatch	921571c19b	Merge branch 'hellthread-filter-fix' into 'develop' ... Hellthread filter fix Closes #634 See merge request pleroma/pleroma!831	2019-02-15 13:18:35 +00:00
Karen Konou	c2e0a0c8d4	Readd threshold is not 0 check, optmization?	2019-02-15 14:05:20 +01:00
Karen Konou	dca6bee2f7	Rename test, add check for follower collection when delisting	2019-02-15 13:43:14 +01:00
rinpatch	b63a5e309d	Merge branch 'bugfix/actor-containment' into 'develop' ... activitypub: correctly handle bare URIs in user lookup Closes #645 See merge request pleroma/pleroma!829	2019-02-15 12:27:03 +00:00
Karen Konou	d943c90249	Add tests, change default config values, fix a bug	2019-02-15 12:47:50 +01:00
eugenijm	ecdf0657ba	Add logic for keeping follow_request_count up-to-date on the follow, ... `approve_friend_request`, and `deny_friend_request` actions. Add follow_request_count to the user view.	2019-02-15 12:20:20 +03:00
William Pitcock	da44cdd381	user: search: use get_or_fetch() instead of get_or_fetch_by_nickname() ... get_or_fetch() handles the nickname verses URI differences transparently.	2019-02-14 20:00:04 +00:00
lambda	ea2698beb7	Merge branch 'bugfix/activitypub-reserialization' into 'develop' ... activitypub transmogrifier: fix reserialization edge cases See merge request pleroma/pleroma!826	2019-02-14 19:54:16 +00:00
William Pitcock	56862f4ce1	activitypub: clean up logging statements a little	2019-02-14 19:42:33 +00:00
Wim Vanderbauwhede	04b1c13554	Merge remote-tracking branch 'upstream/develop' into patch-image-description	2019-02-14 16:41:40 +00:00
Ivan Tashkinov	027adbc9e5	[#468] Refactored OAuth scopes parsing / defaults handling.	2019-02-14 17:03:19 +03:00
Egor Kislitsyn	3f32d7b937	Fix queue name	2019-02-14 17:02:47 +07:00
Egor Kislitsyn	907306174b	fix S3 links encoding in Mediaproxy	2019-02-14 15:55:21 +07:00
William Pitcock	72ba5b4ab7	activitypub: user view: formatting	2019-02-14 03:13:07 +00:00
William Pitcock	5307c211b8	activitypub: user view: report totalItems=0 for follows/followers when hidden	2019-02-14 03:10:00 +00:00
William Pitcock	6542b86292	activitypub: user view: remove totalItems from user outbox ... (this is based on a counter in User.Info, but the counter is not reliable.)	2019-02-14 03:02:45 +00:00
William Pitcock	ee2fa1a314	activitypub: user view: remove totalInbox from user inbox view ... It is not really feasible to quickly calculate the totalItems value and it shouldn't be trusted anyway.	2019-02-14 03:01:39 +00:00
kaniini	bc9e5e6b65	Merge branch 'feature/activitypub-oauth-endpoints' into 'develop' ... ActivityPub C2S oauth endpoints See merge request pleroma/pleroma!821	2019-02-14 02:50:06 +00:00
William Pitcock	64620d8980	activitypub: user view: do not expose oAuth endpoints for instance users	2019-02-14 02:41:21 +00:00
William Pitcock	e9ef4b8da6	oauth: never use base64 padding when returning tokens to applications ... The normal Base64 alphabet uses the equals sign (=) as a padding character. Since Base64 strings are self-synchronizing, padding characters are unnecessary, so don't generate them in the first place.	2019-02-14 01:10:04 +00:00
William Pitcock	e05bf2940f	activitypub: transmogrifier: correctly handle nil inReplyTo value	2019-02-14 00:35:54 +00:00
William Pitcock	94cbbb0e3a	activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects	2019-02-14 00:35:53 +00:00
Mark Felder	f62c1d6266	Improve login error for OAuth flow	2019-02-13 22:33:22 +00:00
Ivan Tashkinov	063baca5e4	[#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.	2019-02-14 00:29:29 +03:00
William Pitcock	9bd6ed975e	activitypub: user view: use route helpers instead of hardcoded URIs	2019-02-13 19:34:43 +00:00
William Pitcock	29e946ace4	activitypub: user view: add oauthRegistrationEndpoint to user profiles	2019-02-13 19:34:43 +00:00
William Pitcock	db8abd958d	activitypub: user view: fix up endpoints rendering	2019-02-13 19:34:43 +00:00
William Pitcock	90facd3598	user view: add AP C2S oauth endpoints to local user profiles	2019-02-13 19:34:43 +00:00
Karen Konou	bef9b9cb66	refactored code	2019-02-13 16:23:09 +01:00
Karen Konou	adcdd21f16	Merge branch 'develop' into hellthread-filter-fix	2019-02-13 16:22:14 +01:00
lain	88a4de24f9	User.follow_all: Respect blocks in both directions.	2019-02-13 13:52:27 +01:00
Maxim Filippov	760fec4cb8	Update token.ex	2019-02-13 12:59:56 +03:00
Maxim Filippov	62a45bdc11	Add revoke token	2019-02-13 12:59:56 +03:00
Maxim Filippov	61a4bc5095	Add OAuth tokens endpoint	2019-02-13 12:59:56 +03:00
hakabahitoyo	b7bc666200	bugfix mdii uploader	2019-02-13 15:46:42 +09:00
Karen Konou	1d727cd069	added checks for public url and follower collections	2019-02-13 00:01:34 +01:00
Haelwenn (lanodan) Monnier	da4c662af3	Plugs.HTTPSecurityPlug: Add webpacker to connect-src	2019-02-12 22:12:12 +01:00
Haelwenn (lanodan) Monnier	00e8f0b07d	Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode ... This is needed to run dev mode mastofe at the same time	2019-02-12 22:12:11 +01:00
Mark Felder	c984e8272a	Formatting	2019-02-12 00:37:22 +00:00
Mark Felder	4956ab5ea3	Fix compile	2019-02-12 00:25:12 +00:00
Mark Felder	ac7ef0999d	WIP: Fix Twitter Cards ... Twitter cards were not passing any useful metadata. A few things were being handled on Twitter's end by trying to match OpenGraph tags with their own, but it wasn't working at all for media. This is an attempt to fix that. Common functions have been pulled out of opengraph and put into utils. Twitter's functionality was entirely replaced with a direct copy of Opengraph's and then modified as needed. Profiles are now represented as Summary Cards Posts with images are now represented as Summart with Large Image Cards Posts with video and audio attachments are represented as Player Cards. This now passes the Twitter Card Validator. Validator and Docs are below https://cards-dev.twitter.com/validator https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards	2019-02-11 23:59:04 +00:00
shibayashi	ea1058929c	Use url[:scheme] instead of protocol to determine if https is enabled	2019-02-12 00:08:52 +01:00
rinpatch	379d04692c	Filter summary in keywordpolicy	2019-02-11 21:35:40 +03:00
rinpatch	39383a6b79	Merge branch 'feature/thread-muting' into 'develop' ... Feature/thread muting See merge request pleroma/pleroma!796	2019-02-11 15:02:14 +00:00
lambda	044616292b	Merge branch 'feature/rich-media-limits' into 'develop' ... rich media: tighten fetching timeouts and size limits See merge request pleroma/pleroma!809	2019-02-11 12:33:58 +00:00
Karen Konou	ac72b578da	Merge branch 'develop' into feature/thread-muting	2019-02-11 12:10:49 +01:00
Karen Konou	c01ef574c1	Refactor as per Rin's suggestions, add endpoint tests	2019-02-11 12:04:02 +01:00
lambda	d53e36bf1e	Revert "Merge branch 'object-creation' into 'develop'" ... This reverts merge request !802	2019-02-11 08:07:39 +00:00
Egor Kislitsyn	305d219413	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ... # Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex	2019-02-11 13:54:21 +07:00
William Pitcock	45e57dd187	rich media: tighten fetching timeouts and size limits	2019-02-10 21:54:08 +00:00
kaniini	6c8d15da11	Merge branch 'fix/credo-issues' into 'develop' ... Fix credo issues See merge request pleroma/pleroma!786	2019-02-10 20:54:21 +00:00
Karen Konou	cc21fc5f53	refactor, status view updating, error handling	2019-02-10 10:42:30 +01:00
rinpatch	e0de0fcf22	Merge branch 'object-creation' into 'develop' ... Do object insertion through Cachex See merge request pleroma/pleroma!802	2019-02-10 07:39:27 +00:00
kaniini	d5fe05c37e	Merge branch 'follow-enhancements' into 'develop' ... Respect blocks in mass follow. See merge request pleroma/pleroma!797	2019-02-09 21:03:42 +00:00
lain	f8388be9c6	Do object insertion through Cachex ... So we don't flood our postgres logs with errors. Should also make things slightly faster.	2019-02-09 22:01:08 +01:00
Karen Konou	6a150de3bd	Add unique index and unique constraint check, uniqueness test fails	2019-02-09 20:52:11 +01:00
Karen Konou	638456ce8f	elixir too new for CI's mix format lol	2019-02-09 18:08:46 +01:00
Karen Konou	a0d732ec55	it works!!	2019-02-09 17:47:57 +01:00
Haelwenn (lanodan) Monnier	6ca633ddd3	Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)	2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier	d924dc73ba	de-group import/s	2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier	6a6a5b3251	de-group alias/es	2019-02-09 16:31:17 +01:00
Ivan Tashkinov	a337bd114c	[#468] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.	2019-02-09 17:32:33 +03:00
Ivan Tashkinov	4ad843fb9d	[#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.	2019-02-09 17:09:08 +03:00
Haelwenn (lanodan) Monnier	381fe44172	HTML.Scrubber.Default: Consistency	2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier	2272934a5e	Stash	2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier	d2e4eb7c74	Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it	2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier	bd9b5fffbc	Mix.Tasks.Pleroma.Uploads: Fix typo in documentation	2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier	473095faf2	Web.Federator: Fix unused variable	2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier	60ea29dfe6	Credo fixes: alias grouping/ordering	2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier	106f4e7a0f	Credo fixes: parameter consistency	2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier	8bcfac93a8	Make credo happy	2019-02-09 14:59:20 +01:00
lain	563f04e81b	Do autofollow first.	2019-02-09 13:39:57 +01:00
lain	bbd0049fae	Respect blocks in mass follow.	2019-02-09 13:24:23 +01:00
lambda	1eecbc1cd1	Merge branch 'feature/keyword-policy' into 'develop' ... Add keyword policy See merge request pleroma/pleroma!794	2019-02-09 11:38:37 +00:00
Karen Konou	7e47a810a2	help i am not good with git	2019-02-08 13:22:29 +01:00
Karen Konou	5c5b228f21	Added thread unmuting (still a bit buggy maybe)	2019-02-08 13:20:40 +01:00
Karen Konou	a44e532fb1	Added thread unmuting (still a bit buggy maybe)	2019-02-08 13:17:11 +01:00
rinpatch	7356659273	wow	2019-02-08 15:12:13 +03:00
Karen Konou	98ec578f4d	Merge branch 'develop' into feature/thread-muting	2019-02-08 12:44:02 +01:00
rinpatch	f88dec8b33	What idiot did that? (me)	2019-02-08 13:16:50 +03:00
rinpatch	6c21f5aa16	Merge branch 'develop' into feature/keyword-policy	2019-02-08 13:12:33 +03:00
rinpatch	8a0b755c19	rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy	2019-02-08 13:12:09 +03:00
rinpatch	2174f6eb4f	Add default config for keyword policy	2019-02-08 12:48:39 +03:00
rinpatch	46aa8c18a2	Add keyword policy	2019-02-08 12:38:24 +03:00
Karen Konou	c43f414a79	Somehow fixed the repo insert [skip-ci]	2019-02-07 23:44:49 +01:00
Karen Konou	7e3ec93ed0	made a silly oopsie	2019-02-07 22:59:53 +01:00
Karen Konou	77448de492	ugghhhh	2019-02-07 22:25:07 +01:00
Ivan Tashkinov	2c68cf7e9e	OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix. ... (`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris, and if that happened before /web/login is accessed for the first time then Pleroma used this externally created record with arbitrary redirect_uris and client_secret known by creator).	2019-02-07 22:14:06 +03:00
Karen Konou	f4ff4ffba2	Migration and some boilerplate stuff	2019-02-07 17:36:14 +01:00
Mark Felder	74518d0b60	hide_followings was renamed to hide_followers in the FE, but never synced up in the BE ... This was a dirty regex replace which worked on my server	2019-02-06 22:34:44 +00:00
Haelwenn	1220a17146	Merge branch 'bugfix/rich-media-card' into 'develop' ... rich media cards: bugfixes and regression tests See merge request pleroma/pleroma!785	2019-02-06 18:39:13 +00:00
kaniini	18e783bcb2	Merge branch 'add-admin-and-moderator-fields' into 'develop' ... Add admin and moderator badges to user view and make their visibility configurable See merge request pleroma/pleroma!767	2019-02-06 18:19:47 +00:00
William Pitcock	65a4b9fbea	mastodon api: rich media: don't clobber %URI struct with a string	2019-02-06 18:02:15 +00:00
rinpatch	f7aedbcc55	Merge branch 'fix/activitypub-user-view-badmap' into 'develop' ... Fix if clause in activity_pub user_view See merge request pleroma/pleroma!783	2019-02-06 17:47:58 +00:00
href	f753043ce0	Fix if clause in activity_pub user_view	2019-02-06 18:42:19 +01:00
Egor Kislitsyn	6f05f448f8	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs	2019-02-06 11:33:00 +07:00
eugenijm	035eaeb9b8	Allow to configure visibility for admin and moderator badges	2019-02-06 06:18:05 +03:00
eugenijm	398c81f9c8	Add is_admin and is_moderator boolean fields to the user view	2019-02-06 02:10:06 +03:00
William Pitcock	d83dbd9070	rich media: parser: reject any data which cannot be explicitly encoded into JSON	2019-02-05 20:50:57 +00:00
kaniini	d120aa63f0	Merge branch 'fix-dm-index' into 'develop' ... Massage index until it actually does the stuff we want. See merge request pleroma/pleroma!772	2019-02-05 20:27:31 +00:00
kaniini	681ba1e52f	Merge branch 'feature/ap-c2s-whoami' into 'develop' ... activitypub: c2s: add /api/ap/whoami endpoint for andstatus See merge request pleroma/pleroma!773	2019-02-05 20:26:31 +00:00
kaniini	eb2b1960e0	Merge branch 'feature/split-hide-network-v2' into 'develop' ... Split hide_network into hide_followers & hide_followings (fixed) See merge request pleroma/pleroma!765	2019-02-05 18:56:59 +00:00
kaniini	ecdb0b7f57	Merge branch 'bugfix/rich-media-image-nil' into 'develop' ... mastodon api: fix rendering of cards without image URLs (closes #597) Closes #597 See merge request pleroma/pleroma!777	2019-02-05 18:53:43 +00:00
William Pitcock	1d94b67e40	mastodon api: fix rendering of cards without image URLs (closes #597)	2019-02-05 18:30:27 +00:00
lambda	f8b831ecfd	Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop' ... activitypub: transmogrifier: fix bare tags See merge request pleroma/pleroma!774	2019-02-05 11:30:18 +00:00
William Pitcock	a2bb5d890d	html: don't attempt to parse nil content	2019-02-05 05:06:17 +00:00
William Pitcock	e71ab5a10f	activitypub: transmogrifier: fix bare tags	2019-02-05 00:43:28 +00:00
William Pitcock	db1165f70f	activitypub: c2s: add /api/ap/whoami endpoint for andstatus	2019-02-04 22:58:29 +00:00
lain	f3c8b02d65	Massage index until it actually does the stuff we want. ... Also makes the index a lot smoler.	2019-02-04 23:47:29 +01:00
Haelwenn	03991e7bc5	Merge branch 'feature/mrf-tag' into 'develop' ... MRF TagPolicy engine See merge request pleroma/pleroma!768	2019-02-04 19:20:11 +00:00
William Pitcock	7d110be119	activitypub: mrf: tag policy: fix force-unlisted and sandbox actions	2019-02-04 19:03:54 +00:00