3227 Commits

Author	SHA1	Message	Date
William Pitcock	dbc4e92509	activitypub: transmogrifier: do not clobber the addressing on relayed announcements	2019-01-17 23:21:31 +00:00
William Pitcock	33b473cc02	activitypub: allow is_public?() to work on any type of map representing an AS2 object	2019-01-17 23:21:31 +00:00
William Pitcock	8e9f1d5587	activitypub: relay: chase selective public announce changes	2019-01-17 23:21:31 +00:00
William Pitcock	2479e88815	activitypub: announce: add new public parameter	2019-01-17 23:21:31 +00:00
kaniini	98d9dcd509	Merge branch '502_instance_stats_active_users_count_fix' into 'develop' ... [#502] Fixed `user_count` in `/api/v1/instance` to include only active local users Closes #502 See merge request pleroma/pleroma!678	2019-01-17 19:27:15 +00:00
kaniini	ae8a5942cf	Merge branch 'bad-copy-paste' into 'develop' ... Fix bad link in likes collection See merge request pleroma/pleroma!679	2019-01-17 19:22:21 +00:00
sxsdv1	948fba6f76	Fix bad link in likes collection ... Don't copy and paste, mkay	2019-01-17 18:21:43 +01:00
rinpatch	a95d5da607	Don't show content if empty or zero width space	2019-01-17 20:18:28 +03:00
Ivan Tashkinov	954dc4a4ad	[#502] Fixed user_count in /api/v1/instance to include only active local users.	2019-01-17 19:16:02 +03:00
Mark Felder	849c83ed46	formatting	2019-01-17 16:10:26 +00:00
Mark Felder	6bc9a641ba	Default to disabled in the code in case the setting is absent from config.exs	2019-01-17 16:01:25 +00:00
rinpatch	388ceb6a7d	Fix the issue with get_by_nickname never being called	2019-01-17 19:00:08 +03:00
Mark Felder	8c368d42a2	Make attachment links configurable ... Thanks @href!	2019-01-17 15:48:14 +00:00
Ivan Tashkinov	2bfae25a1f	[#491] Made user bio preserve full nicknames (nick@host).	2019-01-17 18:03:49 +03:00
rinpatch	4d5f15cd42	Introduce optional unfurling of nsfw content	2019-01-17 11:00:02 +03:00
rinpatch	0256bd2f1d	Use object url instead of a hack	2019-01-17 10:34:19 +03:00
rinpatch	fd3a558230	Apply feld's patch	2019-01-17 09:18:46 +03:00
rinpatch	5fa508cc2b	Remove @providers and call Pleroma.config on runtime	2019-01-16 18:04:41 +03:00
rinpatch	bb43f4cee9	Remove useless with in opengraph.ex	2019-01-16 18:02:46 +03:00
rinpatch	9a90b5d91a	oof	2019-01-16 18:01:17 +03:00
rinpatch	8a9f089812	remove id cast	2019-01-16 17:58:11 +03:00
rinpatch	5a08dee379	cache ap_id in id instead of caching user two times	2019-01-16 17:44:08 +03:00
rinpatch	82cf9b9751	forgot to remove this thing	2019-01-16 17:16:28 +03:00
rinpatch	293f6a8b71	join us now and share the software~. Also tests	2019-01-16 17:15:13 +03:00
lain	943324b661	MastoAPI: Don't break on missing users.	2019-01-16 15:13:09 +01:00
rinpatch	b44995866b	Replace map with reduce to remove nils	2019-01-16 16:52:01 +03:00
lambda	608cc65d43	Merge branch 'feature/improve-microformats' into 'develop' ... improve microformats support See merge request pleroma/pleroma!672	2019-01-16 09:06:47 +00:00
lambda	da4b670451	Merge branch '518_instance_stats_fix' into 'develop' ... [#518] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers Closes #518 See merge request pleroma/pleroma!673	2019-01-16 08:59:40 +00:00
rinpatch	ff01fd3c4f	Remove caching because it does not affect performance and may be even worse in some cases	2019-01-16 11:18:25 +03:00
Ivan Tashkinov	90433b988e	[#518] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.	2019-01-16 11:07:46 +03:00
rinpatch	bfe2a11a6b	Add config doc	2019-01-16 10:45:56 +03:00
Ivan Tashkinov	0bc6d30f7d	[#477] Minor refactoring (user search query).	2019-01-16 10:44:32 +03:00
rinpatch	a9c27e137d	Add a fallback function to handle generic params, just in case	2019-01-16 10:38:42 +03:00
rinpatch	a76793006b	Thanks you rinpatch, very cool	2019-01-16 10:35:06 +03:00
rinpatch	0039d45b5b	No need to use activity in the key	2019-01-16 10:30:47 +03:00
rinpatch	70b2bb6ede	add caching	2019-01-16 10:26:01 +03:00
rinpatch	dd1432d695	Disable previews for any activity, but create	2019-01-16 09:42:24 +03:00
William Pitcock	461ab9489d	formatter: improve microformats markup	2019-01-16 03:54:01 +00:00
William Pitcock	1ddab78247	html: allow microformats-related markup through the html filter	2019-01-16 03:54:01 +00:00
rinpatch	565caff3f4	cache HTML in OGP	2019-01-16 00:07:28 +03:00
rinpatch	9aa69e12b8	Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate	2019-01-15 23:25:28 +03:00
lambda	9a444c0d22	Merge branch 'bugfix/websub-hardening' into 'develop' ... websub: improve error handling See merge request pleroma/pleroma!670	2019-01-15 20:02:56 +00:00
rinpatch	2e630bea0d	Add twitter card, filter nsfw	2019-01-15 23:00:22 +03:00
William Pitcock	2d3241753f	http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else	2019-01-15 19:31:13 +00:00
rinpatch	70f140681f	Add space between name and nickname	2019-01-15 21:47:45 +03:00
rinpatch	e8eecd61b4	Formating	2019-01-15 21:20:27 +03:00
rinpatch	410fd9d774	Attach attachments	2019-01-15 21:17:56 +03:00
William Pitcock	17da432dbb	websub: improve error handling	2019-01-15 18:03:49 +00:00
rinpatch	ff6c9a5c96	Introduce get_by_id in Activity, replace newlines with spaces	2019-01-15 20:00:21 +03:00
rinpatch	850912b06b	refactor opengraph to a different module with a behaviour	2019-01-15 19:43:52 +03:00
rinpatch	8745c8c990	remove useless newlines after every tag. Make domain.com/username provide opengraph too	2019-01-15 18:34:47 +03:00
Ivan Tashkinov	5b8f9ff8c1	[#477] User search tests. Normalized search rank in User.search.	2019-01-15 13:05:25 +03:00
rinpatch	2858fd2da2	add a fallback function	2019-01-15 12:11:07 +03:00
rinpatch	6f23139864	please don't bully me for this	2019-01-15 12:02:55 +03:00
rinpatch	4587a5712a	cringe	2019-01-15 11:59:05 +03:00
rinpatch	ce15e0659e	Fix some edge cases [nervous laughter]	2019-01-15 11:56:35 +03:00
lambda	646bb87816	Merge branch 'fix/elixir-1-8-type-annotation' into 'develop' ... Fix Elixir 1.8 type annotation issue Closes #523 See merge request pleroma/pleroma!668	2019-01-15 08:51:59 +00:00
rinpatch	4656f433f9	Move metadata.ex out of ostatus	2019-01-15 11:00:17 +03:00
Haelwenn (lanodan) Monnier	9fcdca1bdc	Upload: Fix uploading with a : in the filename	2019-01-15 07:57:48 +01:00
Haelwenn (lanodan) Monnier	e3eb75bd23	Upload: Fix uploading with a ? in the filename	2019-01-15 07:40:39 +01:00
Maxim Filippov	e8eff9fe03	Fix Elixir 1.8 type annotation issue	2019-01-15 02:58:48 +02:00
rinpatch	f20bfc9ea5	Merge branch 'media-url-escape' into 'develop' ... URI escape file upload URLs See merge request pleroma/pleroma!665	2019-01-14 18:52:23 +00:00
lambda	fd2f1258fb	Merge branch 'load-all-dms' into 'develop' ... Remove recent activity restriction. See merge request pleroma/pleroma!644	2019-01-14 18:49:53 +00:00
Ivan Tashkinov	dc45ec62c2	[#477] User search improvements: tsquery search with field weights, friends & followers boosting.	2019-01-14 20:04:45 +03:00
Shadowfacts	42b7584068	URI escape file upload URLs	2019-01-14 11:31:44 -05:00
kaniini	de1da7b3d1	Merge branch 'feature/add-oembed-parser' into 'develop' ... Add OEmbed parser See merge request pleroma/pleroma!661	2019-01-14 07:28:04 +00:00
kaniini	fa0392e49c	Merge branch 'activitypub-likes' into 'develop' ... Activitypub c2s likes See merge request pleroma/pleroma!658	2019-01-14 07:27:05 +00:00
rinpatch	5f9786288d	Prefer ids to usernames	2019-01-14 09:52:52 +03:00
William Pitcock	6e5b0406b9	mrf: add no placeholder-text policy, strips pointless "." content from posts with images	2019-01-14 05:42:38 +00:00
rinpatch	e4dc3f71ae	Resolve merge conflict	2019-01-13 13:38:28 +03:00
Maxim Filippov	b8a77c5d70	Add OEmbed parser	2019-01-13 02:06:50 +02:00
sxsdv1	868034375c	Add likes to activitypub object representation ... Top level of the likes OrderedCollection is inlined to get immediate access to totalItems. Because the count can be returned without scanning the database for like activities the extra query is saved when the client only wants to display the total.	2019-01-12 20:24:41 +01:00
sxsdv1	581edd5a91	Add route to get object like activities	2019-01-12 20:24:38 +01:00
sxsdv1	36711e1c83	Handle client submitted activitypub like activity	2019-01-12 20:24:35 +01:00
sxsdv1	1eb7318831	Prepare all types objects before serialising ... Activities returned from inbox can include other types of objects like Article	2019-01-12 20:24:32 +01:00
Sadposter	9daf162461	Honour parameters on MastoAPI /favourites	2019-01-12 14:42:52 +00:00
Sadposter	144b48da95	Add link headers to MastoAPI /favourites ... As documented at https://docs.joinmastodon.org/api/rest/favourites/	2019-01-12 14:03:35 +00:00
Egor Kislitsyn	b594a54d0c	unpin when deleting a status	2019-01-11 12:31:31 +07:00
kaniini	e4afe1359b	Merge branch 'activitypub-dereference-activity-id' into 'develop' ... Support activity+json request for activity See merge request pleroma/pleroma!641	2019-01-10 18:42:36 +00:00
Maxim Filippov	1f851a0723	Add Twitter Card parser	2019-01-10 18:09:56 +00:00
kaniini	11d08c6226	Merge branch 'twapi-follower-pagination' into 'develop' ... Twapi follower pagination See merge request pleroma/pleroma!648	2019-01-10 18:03:32 +00:00
Haelwenn	ab4c5f5bf7	Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop' ... common api: fix newlines in markdown code blocks See merge request pleroma/pleroma!651	2019-01-10 03:54:29 +00:00
William Pitcock	0bdbd4f968	common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown ... ok @lanodan	2019-01-10 03:45:58 +00:00
William Pitcock	2ecf81f10c	common api: fix newlines in markdown code blocks	2019-01-10 03:37:37 +00:00
kaniini	7f5efddd6e	Merge branch 'feature/pinned-posts' into 'develop' ... Pinned Statuses Closes #440 See merge request pleroma/pleroma!636	2019-01-10 02:39:53 +00:00
kaniini	f85d108c41	Merge branch 'mass-follow' into 'develop' ... Mass follow See merge request pleroma/pleroma!642	2019-01-10 02:33:11 +00:00
kaniini	d203b0b4d3	Merge branch 'dm-optimizations' into 'develop' ... Add activity visibility index. See merge request pleroma/pleroma!646	2019-01-10 02:31:29 +00:00
rinpatch	b57db828c7	Merge branch 'hotfix/ogp-cachex-fix' into 'develop' ... Rich media: Remove :commit since a tuple is already returned See merge request pleroma/pleroma!649	2019-01-09 18:42:00 +00:00
rinpatch	a2d7f0e0e9	Remove :commit since a tuple is already returned	2019-01-09 21:35:01 +03:00
lain	a99e156f2c	Add integer casts.	2019-01-09 18:17:23 +01:00
lain	7ac152ed38	TwitterAPI: Add follower/following pagination.	2019-01-09 18:14:32 +01:00
lambda	1881680e28	Merge branch 'scarlett/pleroma-summary-html-api' into 'develop' ... Scarlett/pleroma summary html api See merge request pleroma/pleroma!647	2019-01-09 16:26:38 +00:00
lain	5027f82cde	Add activity visibility index.	2019-01-09 16:45:09 +01:00
Egor Kislitsyn	44a1e69484	Add Twitter API for the pinned statuses ... ``` # Only return statuses that have been pinned GET /api/statuses/user_timeline.json?pinned=true # Pin POST /api/statuses/pin/:id # Unpin POST /api/statuses/unpin/:id ```	2019-01-09 19:54:19 +07:00
lain	9854978b8b	Remove recent activity restriction. ... This should be fine now, everything should be covered by indices.	2019-01-09 12:38:23 +01:00
Egor Kislitsyn	1b06e6fdf3	only non-reblogs, self-authored, public statuses can be pinned	2019-01-09 17:40:15 +07:00
lain	65fc2df7cc	Use follow_all in autofollow.	2019-01-09 11:38:45 +01:00
lain	26938d65fd	Add User mass following function.	2019-01-09 11:35:23 +01:00
Egor Kislitsyn	28afcb7c31	move defaults from sample_config.exs to config.exs	2019-01-09 17:02:30 +07:00
Egor Kislitsyn	48591aab98	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts ... # Conflicts: # docs/config.md	2019-01-09 16:56:31 +07:00
sxsdv1	20c0dd1e24	Support activity+json request for activity	2019-01-09 09:33:30 +01:00
kaniini	5c5c8508c2	Merge branch 'hotfix/media-proxy-uri' into 'develop' ... user: fix local vs remote determination in remote_or_auth_active?/1 See merge request pleroma/pleroma!640	2019-01-09 07:09:39 +00:00
William Pitcock	f15183178c	user: fix auth_active?/1 for remote users	2019-01-09 06:45:17 +00:00
William Pitcock	0015d43e13	user: factor out illogical User.Info.superuser?/1. ... any actual callee will be dealing with a User struct to begin with, so just check the child struct inside User.superuser?/1 with pattern matching.	2019-01-09 06:44:50 +00:00
William Pitcock	74f48beec3	user: remove entirely redundant remote_or_auth_active?/1. ... auth_active?/1 can check remote users and return true directly.	2019-01-09 06:36:50 +00:00
William Pitcock	2af67353c5	user: harden auth_active?/1, superuser?/1, visible_for?/1	2019-01-09 06:21:21 +00:00
William Pitcock	595a970493	user: use pattern matching to determine if user is local or remote instead of the previous hairy logic	2019-01-09 06:02:18 +00:00
Egor Kislitsyn	0c750bc432	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts	2019-01-08 16:32:07 +07:00
Egor Kislitsyn	6428ef77ad	add default configuration for the pinned statuses and some doc	2019-01-08 16:11:03 +07:00
lain	0fae04c4e3	Add a setting for users to autofollow on sign up.	2019-01-08 09:57:53 +01:00
Egor Kislitsyn	e679da4c34	add pinned property to StatusView	2019-01-08 15:27:02 +07:00
Egor Kislitsyn	63dbd87568	rename post to status	2019-01-08 15:25:50 +07:00
lain	a16b17cc61	Actually put some onformation in the error user, make it actually properly parse ... in conversations.	2019-01-07 20:59:30 +01:00
kaniini	74e1093732	Merge branch 'resilient-user-view' into 'develop' ... Make TwAPI UserView more resilient to issues. See merge request pleroma/pleroma!634	2019-01-07 17:09:52 +00:00
Egor Kislitsyn	f24087f96e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts	2019-01-07 20:55:32 +07:00
Egor Kislitsyn	380e9fba21	add pinned posts	2019-01-07 20:45:33 +07:00
lain	7382adf407	Make TwAPI UserView more resilient to issues. ... Will work for missing users and badly migrated users.	2019-01-07 12:41:31 +01:00
scarlett	36fa5e8802	Check visible_for_user when performing a search using a direct link.	2019-01-07 10:36:31 +00:00
scarlett	52493467ac	Twitter API: Add a summary_html field. ... The intention here is to allow proper subject copying when it contains emoji, obviously this will require minor frontend changes, though.	2019-01-06 10:19:00 +00:00
Sadposter	042852ecf3	Add check to prevent multiple follow notifications from the same user	2019-01-05 22:54:25 +00:00
kaniini	8d047c7a72	Merge branch 'fix/user-search-null-name' into 'develop' ... fix user search results for users with unset display name Closes #499 See merge request pleroma/pleroma!625	2019-01-05 22:34:47 +00:00
kaniini	0b54c3d643	Merge branch 'fix_486' into 'develop' ... fix 486: Add option --assume-yes to allow mix pleroma.user to work non-interactive See merge request pleroma/pleroma!627	2019-01-05 22:33:38 +00:00
kaniini	576368237c	Merge branch 'activitypub-tombstone-fix' into 'develop' ... Don't crash on AP request for tombstone See merge request pleroma/pleroma!630	2019-01-05 22:29:08 +00:00
scarlett	145d6fe6e9	Merge branch 'emoji-in-summary' into 'develop' ... Strip HTML in and allow emoji in summaries. See merge request pleroma/pleroma!631	2019-01-05 21:52:02 +00:00
scarlett	6556be344d	Resolve some test failures.	2019-01-05 18:20:42 +00:00
scarlett	3c86d907d4	add some brakets to the emoji list.	2019-01-05 17:35:39 +00:00
scarlett	0787f0dfbe	Strip HTML in and allow emoji in summaries.	2019-01-05 17:28:47 +00:00
sxsdv1	2d7da5f437	Don't crash on AP request for tombstone ... Because tombstone objects has no addressing the is_public?-predicate would cause an error that propagated as a 500 error in the api	2019-01-05 11:16:05 +01:00
cascode	a81307251c	Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name	2019-01-04 20:32:55 -08:00
rinpatch	ba17518a0a	Merge branch 'feature/rich-media-cachex' into 'develop' ... rich media: use cachex to avoid flooding remote servers See merge request pleroma/pleroma!629	2019-01-04 23:56:42 +00:00
William Pitcock	487c00d36d	rich media: disable cachex in test mode	2019-01-04 23:53:26 +00:00
kaniini	bf5aaefbb5	Merge branch 'fix/html-cache-content-collision' into 'develop' ... Different caches based on the module. Remove scrubber version since it is not relevant anymore See merge request pleroma/pleroma!628	2019-01-04 23:35:56 +00:00
William Pitcock	0964c207eb	rich media: use cachex to avoid flooding remote servers	2019-01-04 23:32:01 +00:00
Rin Toshaka	1e2d58982e	oopsies	2019-01-05 00:25:31 +01:00
Rin Toshaka	846082e54f	Different caches based on the module. Remove scrubber version since it is not relevant anymore	2019-01-05 00:19:46 +01:00
spctrl	4aa977d3b3	fix 486: Add option --assume-yes to allow it to work non-interactive	2019-01-04 22:11:46 +01:00
kaniini	4258dd8633	Merge branch 'feature/rich-media' into 'develop' ... URL previews in posts Closes #402 See merge request pleroma/pleroma!617	2019-01-04 20:50:18 +00:00
kaniini	ffea81b84f	Merge branch 'activitypub-c2s-delete-activity' into 'develop' ... Activitypub c2s delete activity See merge request pleroma/pleroma!618	2019-01-04 20:32:10 +00:00
Wim Vanderbauwhede	ba93396649	Patch to support image descriptions in Pleroma FE	2019-01-04 16:27:46 +00:00
Wim Vanderbauwhede	4c95545d19	Patch to support image descriptions in Pleroma FE	2019-01-04 15:35:41 +00:00
Wim Vanderbauwhede	fe2dceb66d	Patch to support image descriptions in Pleroma FE	2019-01-04 15:22:02 +00:00
cascode	5b23dfa1c5	handle null	2019-01-04 01:35:26 -08:00
kaniini	d9d62a110c	Merge branch 'mr/retry-queue-remove-fold' into 'develop' ... rewrites List.foldl to Enum.each in RetryQueue See merge request pleroma/pleroma!621	2019-01-03 22:30:02 +00:00
kaniini	eaaf701319	Merge branch 'fix/follow-requests-deleted-accounts' into 'develop' ... user: check that the follow request actually has an active account associated with it See merge request pleroma/pleroma!623	2019-01-03 18:53:30 +00:00
rinpatch	b73a1a33de	Merge branch 'captcha' into 'develop' ... Make captcha (kocaptcha) stateless See merge request pleroma/pleroma!585	2019-01-03 17:04:27 +00:00
William Pitcock	eb1a18d22f	user: check that the follow request actually has an active account associated with it ... because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly filter the follow requests for these failures.	2019-01-02 22:47:12 +00:00
Michael Loftis	943211b035	rewrites List.foldl to Enum.each	2019-01-02 21:21:40 +00:00
Maxim Filippov	48e81d3d40	Add RichMediaController and tests	2019-01-02 17:02:50 +03:00
sxsdv1	4e1cc2bab6	Implement delete activity	2019-01-01 23:20:43 +01:00
sxsdv1	551c3d9391	Split create activity specifics from update_outbox	2019-01-01 23:20:28 +01:00
Maxim Filippov	917d48d09b	Better variable name	2019-01-01 23:29:47 +03:00
Maxim Filippov	2aab4e03c3	Add OGP parser	2019-01-01 23:26:40 +03:00
kaniini	32bed66471	Merge branch 'pool-usage' into 'develop' ... Update of hackney and tesla, removal of superflous default options. See merge request pleroma/pleroma!614	2019-01-01 20:12:34 +00:00
rinpatch	34fa709015	Merge branch 'configurable-federator' into 'develop' ... Make Federator options configurable. See merge request pleroma/pleroma!615	2019-01-01 18:55:59 +00:00
lambda	32541172cd	Merge branch 'cleanup/admin-api-useless-if' into 'develop' ... Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete See merge request pleroma/pleroma!612	2019-01-01 13:48:59 +00:00
lain	400337b0a7	Make Federator options configurable.	2019-01-01 14:46:55 +01:00
lain	096a927805	Merge remote-tracking branch 'origin/develop' into pool-usage	2019-01-01 14:19:55 +01:00
lain	d4799e0dc2	Remove default pool, it's used automatically anyway.	2019-01-01 13:49:24 +01:00
Haelwenn (lanodan) Monnier	1e6c102bfc	Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete	2018-12-31 19:50:14 +01:00
kaniini	90e157ef80	Merge branch 'features/admin-api-user-views' into 'develop' ... User/Account views: Add rights.admin Closes #472 See merge request pleroma/pleroma!589	2018-12-31 15:49:34 +00:00
William Pitcock	980b5288ed	update copyright years to 2019	2018-12-31 15:41:47 +00:00
lambda	33e3a7ba7d	Merge branch 'fix/scrubber-cache' into 'develop' ... [#481] Store scrubbed posts in Cachex Closes #481 See merge request pleroma/pleroma!610	2018-12-31 09:56:26 +00:00
Rin Toshaka	6ed9b31a5f	Eh?	2018-12-31 08:25:48 +01:00
Rin Toshaka	7e09c2bd7d	Move scrubber cache-related functions to Pleroma.HTML	2018-12-31 08:19:48 +01:00
kaniini	8e7da98b18	Merge branch 'mr/retry-queue' into 'develop' ... Improves RetryQueue behavior See merge request pleroma/pleroma!609	2018-12-30 21:47:50 +00:00
Rin Toshaka	dec23500d8	Resolve merge conflict	2018-12-30 21:00:40 +01:00
Rin Toshaka	ab3089d6a7	Fix comment in object.ex	2018-12-30 20:51:31 +01:00
Rin Toshaka	c50353e6ae	shame on me for not testing after revert	2018-12-30 20:44:17 +01:00
Rin Toshaka	3f9da55adc	Fix formating. Aparently my pre-commit hook broke.	2018-12-30 20:16:42 +01:00
Rin Toshaka	62af23bd26	Revert some changes in html.ex	2018-12-30 20:12:12 +01:00
Rin Toshaka	c119ea3a57	Friendship ended with Postgresql now Cachex is my best friend	2018-12-30 20:00:01 +01:00
Rin Toshaka	535fddd286	Friendship ended with Postgresql now Cachex is my best friend	2018-12-30 19:33:36 +01:00
Rin Toshaka	d9f40b05b3	Added get_stripped_html_for_object. Renamed a few things	2018-12-30 16:51:16 +01:00
Michael Loftis	cb286fdeba	Improves RetryQueue behavior ... reduces to one single timer firing once a second switches to a parallel worker model	2018-12-30 15:16:26 +00:00
Rin Toshaka	bce152aba0	Tidy up the code. Rename key to signature	2018-12-30 15:58:19 +01:00
Rin Toshaka	66d1c31461	Fix some stupid typos	2018-12-30 13:51:01 +01:00
sxsdv1	f40562b4e1	Respond with full activity to outbox post	2018-12-30 12:01:39 +01:00
sxsdv1	1e781715c8	Limit activity types accepted to outbox to only 'Create'	2018-12-30 12:01:39 +01:00
sxsdv1	569bad8210	Create activity when client posts to outbox	2018-12-30 12:01:39 +01:00
sxsdv1	26dc2dddab	Implement ActivityPub inbox view ... More or less verbatim copied from the outbox template with only changes to the activities fetched and url reported	2018-12-30 12:01:39 +01:00
Rin Toshaka	a32e23905a	Use Object.change instead of Ecto.Changeset.change	2018-12-30 11:08:19 +01:00
sxsdv1	aa082ca7b6	Wire up stub routes for client calls of activitypub inbox/outbox ... Code style: remove wrapping function of outbox	2018-12-29 22:22:03 +01:00
Rin Toshaka	9a0163db53	use Kernel.put_in instead of Map.merge	2018-12-29 21:50:34 +01:00
vaartis	816db3f494	Remove the debugging IO.inspect	2018-12-29 17:44:26 +00:00
Haelwenn	f5d7b0003e	Merge branch 'fix_485' into 'develop' ... Change 'name' to 'instance_name' so option is used when running non-interactive See merge request pleroma/pleroma!607	2018-12-29 17:30:31 +00:00
Rin Toshaka	19f9889fbe	I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD	2018-12-29 17:45:50 +01:00
kaniini	3dc5f04976	Merge branch 'carrot-bullying' into 'develop' ... Add some hard limits on inserted activities. See merge request pleroma/pleroma!595	2018-12-29 11:46:06 +00:00
spctrl	ab9cda315f	Change 'name' to 'instance_name' so option is used when running non-interactive	2018-12-29 12:43:54 +01:00
kaniini	dd8f2196f6	Merge branch '483_blocks_import_export' into 'develop' ... [#483] Blocked users list import & export Closes #483 See merge request pleroma/pleroma!603	2018-12-29 11:34:51 +00:00
Maksim Pechnikov	523848d1fd	Salmon# fixed publish an activity to remote accounts	2018-12-29 12:48:54 +03:00
Ivan Tashkinov	7bd49a3222	[#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.	2018-12-29 12:26:23 +03:00
Ivan Tashkinov	b3574dccbb	[#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname ... (<nick>@<our_instance_host>).	2018-12-29 12:15:46 +03:00
Ivan Tashkinov	67b4297f4d	[#483] Refactored blocks and follows import, added tests.	2018-12-29 12:02:37 +03:00
kaniini	49cf5f9ce0	Merge branch '471_invalid_accounts_rendering' into 'develop' ... [#471] Prevented rendering of inactive local accounts Closes #471 See merge request pleroma/pleroma!599	2018-12-29 03:03:18 +00:00
Ivan Tashkinov	700661b761	[#483] Blocked users list import (TwitterAPI).	2018-12-28 23:01:03 +03:00
Ivan Tashkinov	0a41786624	[#467] Refactored valid / invalid user rendering.	2018-12-28 22:47:42 +03:00
kaniini	68f483ef4c	Merge branch 'fix/no-attachment-links' into 'develop' ... Treat any present value in "no_attachment_links" as true Closes pleroma-fe#175 See merge request pleroma/pleroma!597	2018-12-28 18:33:14 +00:00
Ivan Tashkinov	6e9a15b181	[#483] Blocked users export for TwitterAPI.	2018-12-28 21:08:07 +03:00
Haelwenn (lanodan) Monnier	b43d630f30	Web.TwitterAPI.UserView: Add rights.admin	2018-12-28 17:38:32 +01:00
Ivan Tashkinov	0d1788ce44	[#471] Factored out User.visible_for?/2.	2018-12-28 14:35:25 +03:00
Vyr Cossont	d8cc96cb1f	Fix Twitter timelines for private instances	2018-12-27 22:43:40 -08:00
kaniini	bee6acd51d	Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop' ... Create tombstone instead of object deletion See merge request pleroma/pleroma!593	2018-12-27 19:37:55 +00:00
kaniini	cff0292d4b	Merge branch 'reserve-user-names' into 'develop' ... Reserve a few user names See merge request pleroma/pleroma!594	2018-12-27 19:35:06 +00:00
Ivan Tashkinov	e6aeb1d4a5	[#471] Prevented rendering of inactive local accounts.	2018-12-27 15:46:18 +03:00
Maxim Filippov	be70272ab0	Treat only true and "true" as true	2018-12-27 13:21:04 +03:00
vaartis	708a228919	Set ttl_interval to the seconds_valid time	2018-12-27 07:42:03 +00:00
Vyr Cossont	e4562105e7	Implement exclude_reblogs and include_rts	2018-12-26 21:38:00 -08:00
Maxim Filippov	838c024231	Treat any present value in "no_attachment_links" as true	2018-12-27 02:39:41 +03:00
Ekaterina Vaartis	448af3601a	Up captcha timer to 60 secs again, save used captchas in cachex	2018-12-27 00:16:43 +03:00
lain	551d80cc01	Expose restricted names in nodeinfo.	2018-12-26 12:46:16 +01:00
lain	5811e65e67	Add some hard limits on inserted activities.	2018-12-26 12:39:35 +01:00
lain	91724d160a	Reserve a few user names ... These are all names that are used for domain.com/:route routes or projected to be.	2018-12-25 20:10:45 +01:00
Maxim Filippov	ca2e9ce9cc	Revert unneeded changes	2018-12-25 03:44:48 +03:00
Maxim Filippov	f75f707f6c	Revert Activity tombstones, add ObjectTombstone struct	2018-12-25 03:00:06 +03:00
Maxim Filippov	2bbec33c71	Fix failing tests	2018-12-25 00:29:13 +03:00
Maxim Filippov	18a4cbb244	Capitalize "tombstone"	2018-12-24 20:09:18 +03:00
Maxim Filippov	0f412cf6e6	Create tombstone instead of object deletion	2018-12-24 02:25:36 +03:00
William Pitcock	69ad1039ba	mix tasks: add legal boilerplate	2018-12-23 20:56:42 +00:00
William Pitcock	2791ce9a1f	add license boilerplate to pleroma core	2018-12-23 20:56:42 +00:00
lambda	005b4194ff	Merge branch 'bugfix/trans_fix_url_videos' into 'develop' ... Fix "url" of Videos in transmogrifier Closes #367 See merge request pleroma/pleroma!459	2018-12-23 14:46:58 +00:00
William Pitcock	34a4ed22c4	twitter api: add "Video" to supported activity types list	2018-12-23 14:00:54 +00:00
William Pitcock	79b51a97fe	twitter api: activity representer: remove peertube hack	2018-12-23 14:00:50 +00:00
William Pitcock	32dfc1d12a	mastodon api: status view: remove obsolete peertube hack	2018-12-23 13:40:33 +00:00
William Pitcock	71f6d9f418	transmogrifier: significantly rework handling of peertube videos, add test	2018-12-23 13:31:08 +00:00
lambda	a3e33fa177	Merge branch 'hotfix/activity-without-content' into 'develop' ... Twitter ActivityView: fix crash with activity without content See merge request pleroma/pleroma!572	2018-12-23 13:17:25 +00:00
Haelwenn (lanodan) Monnier	3aff8067e4	transmogrifier: When it’s a Video move "url" to "attachment"	2018-12-23 13:00:25 +00:00
Karen Konou	a7f07bb6e5	Implement kaniini's tweaks	2018-12-23 12:24:53 +01:00
Karen Konou	c76179419d	Renamed the things	2018-12-23 11:14:29 +01:00
Karen Konou	409ff60bf8	Fix formatting	2018-12-22 23:32:38 +01:00
Karen Konou	92362e1e22	Implement large thread filter	2018-12-22 23:18:31 +01:00
Ekaterina Vaartis	b386e560ba	Move the encryption out of kocaptcha into general captcha module ... That way there won't be a need to reimplement it for other captcha services	2018-12-22 22:42:14 +03:00
Ekaterina Vaartis	336e37d98f	Make captcha (kocaptcha) stateless ... Also rename seconds_retained to seconds_valid since that's how it is now. Put it down from 180 to 20 seconds. The answer data is now stored in an encrypted text transfered to the client and back, so no ETS is needed	2018-12-21 09:55:47 +03:00
kaniini	2e2030ada8	Merge branch '114_email_confirmation' into 'develop' ... [#114] Email confirmation See merge request pleroma/pleroma!546	2018-12-20 13:28:36 +00:00
Ivan Tashkinov	7cab7de9ff	[#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation. ... Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.	2018-12-20 14:48:48 +03:00
Ivan Tashkinov	f69cbf4755	[#114] Added :user_id component to email confirmation path to improve the security. ... Added tests for `confirm_email` action.	2018-12-20 13:41:30 +03:00
Ivan Tashkinov	8adcd1e80f	[#114] Removed flash messages rendering on redirects.	2018-12-20 13:05:42 +03:00
Ivan Tashkinov	501ce34d7f	[#114] Stylistic adjustments.	2018-12-20 12:55:12 +03:00
Maksim	f1b93b5be7	[#413] fix parse mentions	2018-12-20 09:35:01 +00:00
kaniini	fda148a9a2	Merge branch 'documentation/copy-pleroma-api' into 'develop' ... Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints See merge request pleroma/pleroma!571	2018-12-20 04:01:54 +00:00
raeno	652f49d176	Remove extra bracket	2018-12-19 23:06:10 +04:00
raeno	7fb3780431	Merge branch 'develop' into oembed_provider	2018-12-19 22:39:44 +04:00
Ivan Tashkinov	b520d44b58	[#114] mix format	2018-12-19 19:03:39 +03:00
Ivan Tashkinov	279096228c	[#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users ... unless requested by admin or moderator.	2018-12-19 18:56:52 +03:00
Ivan Tashkinov	a532ad5d72	[#114] User.register/1 tweak.	2018-12-19 17:24:55 +03:00
Ivan Tashkinov	968d7490b6	[#114] User.Info: renamed confirmation_update to confirmation_changeset.	2018-12-19 16:31:03 +03:00
Ivan Tashkinov	59fc5d15df	[#114] User.Info: renamed confirmation_update to confirmation_change.	2018-12-19 16:27:16 +03:00
kaniini	f98ee9402f	Merge branch 'userless-admin' into 'develop' ... Add a way to use the admin api without a user. See merge request pleroma/pleroma!576	2018-12-19 00:12:39 +00:00
lain	f3eb414e28	Add a way to use the admin api without a user.	2018-12-18 21:08:52 +01:00
rinpatch	ef318fb8a9	Merge branch 'develop' into fix/formatter-ignore-html-chars	2018-12-18 21:39:36 +03:00
rinpatch	059dd6f681	Ignore HTML characters in formatter.ex	2018-12-18 21:38:15 +03:00
Haelwenn (lanodan) Monnier	a6dfe1fc6b	Documentation: Move generated files to priv/static/doc, add it to endpoint.ex	2018-12-18 17:05:36 +01:00
href	f58f20abbb	Twitter ActivityView: fix crash when activity content is nil	2018-12-18 15:34:27 +01:00
Ivan Tashkinov	3371a45884	[#114] Formatting fix.	2018-12-18 17:30:30 +03:00
Ivan Tashkinov	b096e30cff	[#114] Added email confirmation resend action. Added tests ... for registration, authentication, email confirmation, confirmation resending. Made admin methods create confirmed users.	2018-12-18 17:22:46 +03:00
Ivan Tashkinov	aed0f90287	[#114] Added pleroma.confirmation_pending to user views, adjusted view tests.	2018-12-18 17:22:45 +03:00
Ivan Tashkinov	b86057cc7f	[#114] Refactored User.register_changeset to init confirmation data. ... Introduced User.register/1 to encapsulate User record creation and post-registration actions.	2018-12-18 17:22:42 +03:00
Ivan Tashkinov	1de0aa2f10	[#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.	2018-12-18 17:21:05 +03:00
Ivan Tashkinov	a05cb10a95	[#114] Email confirmation route, action, node setting, User.Info fields.	2018-12-18 17:18:53 +03:00
raeno	a300336459	Merge branch 'develop' into oembed_provider	2018-12-18 14:59:32 +01:00
href	b1860fe85a	Instance/Static runtime plug ... This allows to set-up an arbitrary directory which overrides most of the static files: index.html static/ emoji/ packs/ sounds/ images/ instance/ favicon.png. If the files are not present in the directory, the bundled ones in priv/static will be used.	2018-12-17 22:50:59 +01:00
lambda	3d980daa49	Merge branch '459_fix_user_profile_crash' into 'develop' ... Fix update_profile failing due to OAuth token record in assigns instead of string Closes #459 See merge request pleroma/pleroma!561	2018-12-17 20:16:15 +00:00
Maksim Pechnikov	92a5133c42	fix text field	2018-12-17 22:53:16 +03:00
lambda	52ac7dce5c	Merge branch 'captcha' into 'develop' ... Captcha See merge request pleroma/pleroma!550	2018-12-17 19:45:14 +00:00
lambda	c6d5f189d9	Merge branch 'fix-tags' into 'develop' ... Fix tagging problems for existing instances. See merge request pleroma/pleroma!562	2018-12-17 19:38:24 +00:00
lambda	98c31deaa9	Merge branch 'test-mix-tasks' into 'develop' ... Add tests for Mix tasks See merge request pleroma/pleroma!555	2018-12-17 19:37:05 +00:00
lambda	078b8b6d22	Merge branch 'phoenix14' into 'develop' ... Upgrade to Phoenix 1.4 Closes #451 See merge request pleroma/pleroma!560	2018-12-17 19:30:05 +00:00
lain	e4763cd459	Fix tagging problems for existing instances.	2018-12-17 20:12:01 +01:00
vaartis	35522fef09	Use :ets.match_delete to delete old captchas	2018-12-17 20:35:21 +03:00
href	77b5154c82	Cowboy handler for Mastodon WebSocket	2018-12-17 17:06:18 +01:00
raeno	cc87880488	Support both OAuth token record and token string in UserView	2018-12-17 16:02:26 +01:00
lambda	567359790e	Merge branch 'testfix/webfinger-jrd' into 'develop' ... WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test See merge request pleroma/pleroma!554	2018-12-17 09:19:27 +00:00
Ekaterina Vaartis	ef6829382a	Clean captchas up periodically, not schedule it after theyre created	2018-12-16 23:53:44 +03:00
Ekaterina Vaartis	3a31fdaf06	Change minutes_retained config to seconds_retained	2018-12-16 22:40:44 +03:00
Ekaterina Vaartis	6062885df6	Add a configurable auto-cleanup for captchas	2018-12-16 22:08:17 +03:00
href	5dcb7aecea	More put_view.	2018-12-16 17:51:22 +01:00
link0ff	22d483d4f7	Use bindings dbuser and dbname in sample_psql.eex	2018-12-16 18:25:31 +02:00
href	f672555ad3	Upgrade to Phoenix 1.4	2018-12-16 17:15:07 +01:00
eal	28478a9c4f	Merge branch 'fix/masto-put-settings' into 'develop' ... Mastodon API: Fix PUT /api/web/settings See merge request pleroma/pleroma!557	2018-12-16 11:21:26 +00:00
eal	4c783e35c0	Mastodon API: Fix PUT /api/web/settings	2018-12-16 13:15:34 +02:00
Ekaterina Vaartis	8d55a549e6	Replace HTTPoison with Tesla for kocaptha	2018-12-15 22:43:28 +03:00
Ekaterina Vaartis	23549d3952	Formatting fixes	2018-12-15 22:08:26 +03:00
Ekaterina Vaartis	b5518da904	Separate captcha implementation into a behaviour and use it	2018-12-15 22:07:26 +03:00
Haelwenn (lanodan) Monnier	cddab5700b	WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test	2018-12-15 17:56:12 +01:00
lambda	cc6689cc20	Merge branch 'fix/views-ignore-unhandled-activites' into 'develop' ... TwitterAPI.ActivityView: Ignore unhandled activities See merge request pleroma/pleroma!547	2018-12-15 15:23:51 +00:00
Rin Toshaka	4a895a46d1	Allow port specification in instance.ex	2018-12-15 11:00:54 +01:00
Ekaterina Vaartis	28c43a417e	Add an ability to disabled captcha	2018-12-15 03:12:47 +03:00
Ekaterina Vaartis	a2399c1c7c	Add base CAPTCHA support (currently only kocaptcha)	2018-12-15 03:12:44 +03:00
href	e74f384b68	Merge branch 'fix/issue_433' into 'develop' ... [#433] fix markdown formatting See merge request pleroma/pleroma!545	2018-12-14 20:30:35 +00:00
href	bfe27c1b55	Merge branch '114_email_invites' into 'develop' ... [#114] Email invites See merge request pleroma/pleroma!541	2018-12-14 20:22:24 +00:00
href	acec11626d	Merge branch 'fix/issue_272' into 'develop' ... [#272] fix tags See merge request pleroma/pleroma!540	2018-12-14 20:20:30 +00:00
Maksim Pechnikov	ea72ac549b	fix case when tags is invalid	2018-12-14 23:16:12 +03:00
raeno	30812f8451	Remove domain from sample_config template	2018-12-14 21:08:25 +01:00
raeno	b0c3211984	Scrub html from activity.content or user.bio for opengraph meta	2018-12-14 21:07:06 +01:00
raeno	90b00701ff	Merge branch 'develop' into oembed_provider	2018-12-14 20:28:35 +01:00
Maksim Pechnikov	d3ec09bb38	fix tags	2018-12-14 22:09:04 +03:00
raeno	46486595ff	Handle "users/:id" links as well. Fix comments in MR.	2018-12-14 19:55:40 +01:00
href	980131b4db	Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' ... Improve web push Closes #393, #422, and #452 See merge request pleroma/pleroma!524	2018-12-14 18:50:44 +00:00
Maksim Pechnikov	bc6262d250	fixed typo	2018-12-14 21:21:37 +03:00
href	84b9a9d497	TwitterAPI.ActivityView: Ignore unhandled activities	2018-12-14 18:09:59 +01:00
href	412df2cd38	Warn if push is disabled..	2018-12-14 16:19:28 +01:00
Maksim Pechnikov	baead4ea4b	fix markdown formatting	2018-12-14 16:03:58 +03:00
href	91236c60c7	Merge branch 'feature/file-size-checking' into 'develop' ... [#36] Add warnings when file upload fails See merge request pleroma/pleroma!523	2018-12-14 13:00:24 +00:00
href	0b4c61e8d5	Fix warning	2018-12-14 13:56:42 +01:00
href	ec0e613eca	Pleroma.Activity.mastodon_notification_type/1	2018-12-14 13:22:10 +01:00
href	331396cbcd	Properly disable Web Push if no VAPID key is set	2018-12-14 13:05:51 +01:00
href	6822916183	Typos	2018-12-14 13:05:51 +01:00
href	b1bcd97a0f	Push: respect alerts settings	2018-12-14 13:05:49 +01:00
href	d8984b7bf8	Push: add missing notification_type field	2018-12-14 13:05:48 +01:00
href	7facbb2b8d	Push.Subscription: convert base64 to base64 urlsafe	2018-12-14 13:05:47 +01:00
Egor Kislitsyn	324933a0ac	improve push message format (compatibility with mastodon)	2018-12-14 13:05:46 +01:00
Egor Kislitsyn	658edb166f	fix and improve web push; add configuration docs	2018-12-14 13:05:29 +01:00
Ivan Tashkinov	69fd63e248	[#114] Added invitesEnabled to metadata of nodeinfo.	2018-12-14 14:13:13 +03:00
Ivan Tashkinov	66380b0641	[#114] Removed confirm_email action stub (to be addressed in a separate MR).	2018-12-14 14:01:00 +03:00
Ivan Tashkinov	07e93f9940	[#114] Improved tests.	2018-12-14 13:52:04 +03:00
Ivan Tashkinov	9666376f5f	[#114] Readded invites_enabled config setting, updated readme.	2018-12-14 12:37:06 +03:00
Ivan Tashkinov	a89e3b4b60	[#114] Moved email_invite action to AdminAPIController, adjusted tests.	2018-12-14 12:28:23 +03:00
Ivan Tashkinov	3cbf16a5fe	[#114] Added UserInviteToken creation, adjusted invitation email link to include it.	2018-12-14 12:28:22 +03:00
Ivan Tashkinov	cc83d7ffe7	[#114] Naive implementation of email invitations.	2018-12-14 12:28:14 +03:00
href	30dc81667c	Merge branch '114_user_registration_emails' into 'develop' ... [#114] User registration emails Closes #114 See merge request pleroma/pleroma!531	2018-12-14 09:16:03 +00:00
Ivan Tashkinov	f81213910f	[#114] Addressed MR comments. Removed functionality to be extracted to other MRs.	2018-12-14 12:09:55 +03:00
lambda	262cc6d44b	Merge branch 'fix/double-rt-or-fav' into 'develop' ... Prevent accidental double RTs or favorites See merge request pleroma/pleroma!542	2018-12-14 08:26:08 +00:00
eal	61ad2ce422	TwitterAPI: Include favorited post in json	2018-12-14 08:24:18 +02:00
eal	1ca080c862	Prevent accidental double RTs or favorites	2018-12-14 07:56:49 +02:00
raeno	c5c3ad90d0	Fix tests. Remove oembed template	2018-12-14 03:00:50 +01:00
raeno	b5de7c4c4d	Remove oembed for now, will submit it in another MR. Fix warnings	2018-12-13 22:34:15 +01:00
raeno	018516d3f3	Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links	2018-12-13 22:21:14 +01:00
raeno	49c4f7d604	Set Pleroma.instance.domain when config is generated	2018-12-13 22:17:53 +01:00
raeno	9b3a6cdb07	Extract opengraph/oembed into separate module	2018-12-13 22:17:53 +01:00
raeno	d903e34cac	Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata	2018-12-13 22:17:53 +01:00
raeno	8902942128	WIP. Implement oembed route and handle both json/xml for "Note" type activity	2018-12-13 22:17:53 +01:00
raeno	21afdf6d99	Insert meta tags into static index.html on the fly for OStatus#notice	2018-12-13 22:17:53 +01:00
lambda	b19ee62252	Merge branch 'username-underscores' into 'develop' ... Allow underscores/dashes in usernames. Closes #429 See merge request pleroma/pleroma!537	2018-12-13 15:13:24 +00:00
Ivan Tashkinov	9e689de063	[#114] Removed email_invite implementation (to be addressed separately).	2018-12-13 16:24:30 +03:00
Ivan Tashkinov	18b9467d1a	[#114] Removed email_invite implementation (to be addressed separately).	2018-12-13 16:22:42 +03:00
Ivan Tashkinov	00744c6b03	[#114] Initial implementation of user email invitations.	2018-12-13 14:30:48 +03:00
Ivan Tashkinov	908943352f	[#114] Refactored password_reset (moved to TwitterAPI). Added homepage links to password reset result pages.	2018-12-13 13:17:49 +03:00
href	7214d57463	Extended nicknames: allow dashes.	2018-12-12 21:48:54 +01:00
link0ff	51dd294c48	Allow to set both admin and moderator at the same time in mix task User	2018-12-12 22:45:40 +02:00
link0ff	a40ba3ba57	Fix toggle_activated in mix task User	2018-12-12 22:30:16 +02:00
href	7d9ddbe689	Allow underscores in usernames. ... Fixes #429.	2018-12-12 18:57:33 +01:00
Ivan Tashkinov	bfff2399ff	[#114] Routes and config for confirm_email and email_invite (Twitter API).	2018-12-12 20:15:43 +03:00
Ivan Tashkinov	e3a21bcd45	[#114] Addressed warnings. Fix of with statement clause in password_reset.	2018-12-12 17:14:31 +03:00
Ivan Tashkinov	f5afb11032	[#114] Initial implementation of user password reset emails (user-initiated).	2018-12-12 17:04:39 +03:00
Ivan Tashkinov	12905ce1ad	[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.	2018-12-12 17:02:41 +03:00
Ivan Tashkinov	10c156d98f	[#114] SMTP deps and config.	2018-12-12 17:01:34 +03:00
Maksim Pechnikov	89b3729afa	fix warnings	2018-12-12 09:09:19 +03:00
scarlett	213176c3c3	Add new frontend options to server-side config.	2018-12-10 23:15:01 +00:00
lain	d6bf06ab4f	Fix warnings.	2018-12-10 20:49:06 +01:00
lambda	0863ec2737	Merge branch 'fix_empty_bio_crash' into 'develop' ... Fixes #415. Do not crash during registration when hasn't filled bio field Closes #415 See merge request pleroma/pleroma!529	2018-12-10 19:08:35 +00:00
lambda	8aa646ca31	Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop' ... Mix tasks: improve uploads.ex moduledoc See merge request pleroma/pleroma!528	2018-12-10 19:06:39 +00:00
lambda	ff10b9927b	Merge branch 'support/bugfix_272' into 'develop' ... [#272] fix hashtags in api See merge request pleroma/pleroma!510	2018-12-10 19:05:16 +00:00
lambda	6786ad3d98	Merge branch 'fix/theora-detection-read-bytes' into 'develop' ... Fix Theora detection in mime.ex See merge request pleroma/pleroma!493	2018-12-10 19:04:06 +00:00
lambda	0554d91dcd	Merge branch 'anonymize-filter-text' into 'develop' ... AnonymizeFilename: allow for a pre-defined text instead of random string See merge request pleroma/pleroma!516	2018-12-10 19:03:06 +00:00
lambda	bda25b999b	Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc' ... # Conflicts: # lib/mix/tasks/pleroma/uploads.ex	2018-12-10 18:33:36 +00:00
lain	c81c74d847	Treat warnings as errors outside of tests.	2018-12-10 19:13:53 +01:00
Maksim Pechnikov	e94c3442f4	updates	2018-12-10 13:27:37 +03:00
rinpatch	993c8c8bd4	Keep the shortdoc descriptive	2018-12-10 08:03:17 +03:00
raeno	9ba4a1c5fe	Fixes #415. Properly handle nil and empty string by User.parse_bio	2018-12-10 01:01:43 +04:00
Rin Toshaka	cbe048bb3f	Mix tasks: improve uploads.ex moduledoc	2018-12-09 20:17:35 +01:00
Maksim Pechnikov	074fa790ba	fix compile warnings	2018-12-09 20:50:08 +03:00
Maksim Pechnikov	068353ac0b	formatting	2018-12-09 11:24:46 +03:00
Maksim Pechnikov	9442588ae9	fix hashtags in api response	2018-12-09 11:24:46 +03:00
Rin Toshaka	15616eda5e	Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content	2018-12-08 21:48:49 +01:00
lambda	5436aaad4f	Merge branch 'fix/add-upload.ex' into 'develop' ... Mix Tasks: Add task uploads.ex for migrating local uploads. See merge request pleroma/pleroma!517	2018-12-08 09:12:37 +00:00
lambda	beadeaffa1	Merge branch 'fix/nodeinfo-nil-features' into 'develop' ... Nodeinfo: remove null features; relay feature. See merge request pleroma/pleroma!520	2018-12-08 09:12:06 +00:00
lambda	8fa5c66eab	Merge branch 'fix/media-proxy-url-encoded' into 'develop' ... Media proxy: fix url encoding See merge request pleroma/pleroma!521	2018-12-08 09:11:18 +00:00
lambda	4976a8b05f	Merge branch 'fix/typo-relay-ex' into 'develop' ... [#283] Mix Tasks: Fix a typo in relay.ex See merge request pleroma/pleroma!522	2018-12-08 09:08:56 +00:00
Rin Toshaka	6c73136aec	[#283] Mix Tasks: Fix a typo in relay.ex	2018-12-08 08:30:34 +01:00
href	bdc8112e40	Media proxy: fix url encoding	2018-12-07 21:57:59 +01:00
Rin Toshaka	578051809f	Add uploadlimit to Twitter API config	2018-12-07 20:03:30 +01:00
lambda	7d86c0c53f	Merge branch 'fix/gopher-respect-ip' into 'develop' ... [#155] Fix Gopher server binding only to default value See merge request pleroma/pleroma!518	2018-12-07 18:49:40 +00:00
lambda	94ac0075bf	Merge branch 'media-proxy-follow-redirect' into 'develop' ... Media proxy: follow HTTP redirects by default Closes #421 See merge request pleroma/pleroma!519	2018-12-07 18:48:26 +00:00
href	134cc94cbd	Nodeinfo: remove null features; relay feature.	2018-12-07 19:44:45 +01:00
href	d8fcf7c5cf	Media proxy: follow HTTP redirects by default	2018-12-07 19:36:44 +01:00
lambda	94d8f1ab30	Merge branch '394_user_tags' into 'develop' ... [#394] User tags Closes #394 See merge request pleroma/pleroma!508	2018-12-07 18:25:38 +00:00
Rin Toshaka	09f20de0d7	Make gopher respect ip	2018-12-07 19:21:58 +01:00
Rin Toshaka	fd5c7b445f	Fix a typo	2018-12-07 19:19:14 +01:00
Rin Toshaka	a02e0c18bc	Mix Tasks: Add task uploads.ex for migrating local uploads.	2018-12-07 15:13:57 +01:00
href	3b27f61ffa	AnonymizeFilename: allow for a pre-defined text instead of random string ... Improve docs	2018-12-07 14:07:11 +01:00
href	3c925e9d88	Emojis: Alphabetical ordering	2018-12-07 11:16:27 +01:00
Ivan Tashkinov	1cea97df64	[#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)	2018-12-07 12:27:32 +03:00
lambda	8764f64690	Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop' ... Add mix pleroma.user unsubscribe to mix doc See merge request pleroma/pleroma!512	2018-12-07 09:23:56 +00:00
rinpatch	4e2250b1dd	Fix a typo in relay.ex moduledoc	2018-12-07 11:41:01 +03:00
Ivan Tashkinov	6ed5044c4e	[#394] Refactoring (using Ecto.Multi; "untag" route change).	2018-12-07 11:04:39 +03:00
rinpatch	f7e23aee90	Oops	2018-12-07 10:44:54 +03:00
rinpatch	f661813807	Add mix pleroma.user unsubscribe to mix doc	2018-12-07 10:39:54 +03:00
rinpatch	08e10a70ec	Rename def to defval	2018-12-07 09:46:13 +03:00
Rin Toshaka	1d11c4cf11	add common.ex	2018-12-07 06:12:39 +01:00
Ivan Tashkinov	7a2162bbcb	[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.	2018-12-06 22:26:25 +03:00
Rin Toshaka	71d5cf9ed8	Remove unused vars from user.ex	2018-12-06 18:25:39 +01:00
Ivan Tashkinov	7bcb6a183a	[#394] Refactoring.	2018-12-06 20:23:16 +03:00
Rin Toshaka	66313cda02	Update instance.ex for web push	2018-12-06 18:16:51 +01:00
Rin Toshaka	88f92693f2	Merge develop	2018-12-06 18:11:22 +01:00
Ivan Tashkinov	7b19487389	[#394] Added users.tags and admin routes to tag and untag users. Added tests.	2018-12-06 20:06:50 +03:00
Rin Toshaka	ca7b46fb3b	Refactor common functions to common.ex	2018-12-06 18:01:28 +01:00
Rin Toshaka	4a2a7ce636	Refactor common functions to common.ex	2018-12-06 18:00:24 +01:00
Rin Toshaka	3a84511df1	remove migrate_local_uploads.ex	2018-12-06 17:35:33 +01:00
kaniini	1d531fd2f3	Merge branch 'fix/mastodon-api-settings' into 'develop' ... Fix put_settings and remove info_changeset See merge request pleroma/pleroma!507	2018-12-06 16:01:58 +00:00
kaniini	abead01ab6	Merge branch 'correct-and-improve-http-options' into 'develop' ... Correct and improve http options See merge request pleroma/pleroma!505	2018-12-06 15:57:56 +00:00
kaniini	b0adea30b3	Merge branch 're-mrf' into 'develop' ... Add a MRF Policy for appending re: to identical subjects in replies. See merge request pleroma/pleroma!499	2018-12-06 15:36:41 +00:00
rinpatch	2ae1128d9f	MastoAPI: Fix put_settings	2018-12-06 17:42:07 +03:00
scarlett	d27e3f269f	Rename regular expression 'have_re' to 'reply_prefix'.	2018-12-06 14:00:41 +00:00
Egor Kislitsyn	6f36e903b0	use User.avatar_url	2018-12-06 20:55:46 +07:00
Egor Kislitsyn	79668c08fc	cleanup	2018-12-06 20:50:20 +07:00
scarlett	3dff61ebec	Harden re: detection.	2018-12-06 13:48:12 +00:00
Egor Kislitsyn	3d492795b7	clean up	2018-12-06 20:42:00 +07:00
Egor Kislitsyn	4944498133	Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/plugs/oauth_plug.ex	2018-12-06 20:15:16 +07:00
Egor Kislitsyn	bac58b1524	show warning if VAPID is not set	2018-12-06 19:56:56 +07:00
Egor Kislitsyn	8b4397c704	Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock	2018-12-06 19:55:58 +07:00
Egor Kislitsyn	04a48286e6	Add web push support	2018-12-06 19:29:04 +07:00
scarlett	6a6aaa0e1a	Use object.normalize.	2018-12-06 11:37:29 +00:00
Hakaba Hitoyo	a09ed0f5af	avoid mix format bug	2018-12-06 18:41:29 +09:00
kaniini	ccf0b46dd6	Merge branch '210_twitter_api_uploads_alt_text' into 'develop' ... [#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix. See merge request pleroma/pleroma!496	2018-12-06 07:36:21 +00:00
Ivan Tashkinov	3e90f688f1	[#210] Mastodon: actor storing for media uploads, ownership check to update_media. ... Refactoring.	2018-12-06 10:26:17 +03:00
Hakaba Hitoyo	96ba95df2e	remove follow_redirect options	2018-12-06 11:38:33 +09:00
Hakaba Hitoyo	27792b2d77	remove pool and timeout options which duplicate with the default	2018-12-06 11:23:15 +09:00
Hakaba Hitoyo	505d820827	Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options	2018-12-06 10:48:05 +09:00
kaniini	48a0315646	Merge branch 'follower-hiding' into 'develop' ... Network hiding Closes #356 See merge request pleroma/pleroma!490	2018-12-05 21:41:53 +00:00
Vald	194869c7db	added data attrs to twitter scrubber	2018-12-06 02:14:56 +05:30
lain	7d5720f2e4	Fix merge.	2018-12-05 21:31:02 +01:00
lain	76d6b1c6ab	Merge remote-tracking branch 'origin' into follower-hiding	2018-12-05 21:27:56 +01:00
lain	3ea4476445	MastodonAPI: Show users their own network.	2018-12-05 21:25:06 +01:00
lain	fdac215091	TwitterAPI: Show users their own network.	2018-12-05 21:14:06 +01:00
Vald	3ccfe226c0	added data attrs for user and tag	2018-12-06 01:05:41 +05:30
Ivan Tashkinov	3b5be09f45	[#210] Stylistic change.	2018-12-05 21:48:21 +03:00
lain	839526a913	TwitterAPI: Add network hiding.	2018-12-05 19:22:40 +01:00
Rin Toshaka	dfc9c08796	formating	2018-12-05 19:12:23 +01:00
Rin Toshaka	ffec96d8cc	Everything should use Mix.Task.Run	2018-12-05 19:05:37 +01:00
lambda	5f0c2372bc	Merge branch 'support/oauth_fetch_token' into 'develop' ... [#273] bugfix/273 See merge request pleroma/pleroma!502	2018-12-05 17:55:51 +00:00
Ivan Tashkinov	c4f3c5e939	[#210] Stylistic change.	2018-12-05 20:23:28 +03:00
Rin Toshaka	facfd03bc1	Move relay tasks to relay.ex	2018-12-05 18:11:59 +01:00
Rin Toshaka	e8ba579efe	Switch from User.info_changeset because it is deprecated	2018-12-05 17:58:26 +01:00
Rin Toshaka	c3519132df	Sorry	2018-12-05 16:44:15 +01:00
Rin Toshaka	5427d2af3a	Update mix tasks since User.info.info_changeset is deprecated	2018-12-05 16:41:50 +01:00
Maksim Pechnikov	c524c50509	fix/273	2018-12-05 17:32:06 +03:00
Rin Toshaka	9938fa3293	Merge develop to refactor/mix-tasks	2018-12-05 14:16:55 +01:00
Ivan Tashkinov	848151f7cb	[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check ... to `update_media` action. Added controller tests for `upload` and `update_media` actions. Refactoring.	2018-12-05 13:37:06 +03:00
Ivan Tashkinov	be187f82f7	[#210] Further refactoring.	2018-12-05 11:48:50 +03:00
hakabahitoyo	a418547bdf	debug /api/v1/suggestions	2018-12-05 16:08:34 +09:00
William Pitcock	956f3c75ca	user: put default user info when registering a user	2018-12-05 03:35:41 +00:00
scarlett	8a1df182cf	Add a MRF Policy for appending re: to identical subjects in replies.	2018-12-04 23:35:07 +00:00
kaniini	ec1ec32f20	Merge branch 'optional-retry-queue' into 'develop' ... Make retry queue optional. See merge request pleroma/pleroma!498	2018-12-04 19:00:18 +00:00
lain	925b05054f	Make retry queue optional. ... At the moment, it can use a lot of memory really fast.	2018-12-04 19:54:42 +01:00
kaniini	114b95cee2	Merge branch 'feature/integration_tesla' into 'develop' ... [#354] Move all http interactions to Tesla See merge request pleroma/pleroma!487	2018-12-04 18:41:00 +00:00
William Pitcock	b57d83e3c9	MRF: simple policy: fix media removal	2018-12-04 18:30:01 +00:00
Rin Toshaka	6396f1b58f	change new to gen in instance.ex . Refactor user.ex	2018-12-04 19:00:45 +01:00
Ivan Tashkinov	48e6193bf2	[#210] Refactoring.	2018-12-04 19:24:41 +03:00
Ivan Tashkinov	826fc446d5	[#210] TwitterAPI: implemented /api/media/metadata/create ... to allow uploads description (alt text) setting.	2018-12-04 18:35:57 +03:00
Maksim Pechnikov	50e72f6c48	remove httpoison_mock	2018-12-04 18:09:22 +03:00
Maksim Pechnikov	dd8aee332c	formatting the code	2018-12-04 17:48:55 +03:00
Maksim Pechnikov	a9e4a97586	update test	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	87109482f3	status_code -> status	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	97252a27d9	fix http request in Salmon	2018-12-04 14:04:06 +03:00
Maksim Pechnikov	ec34de0c1f	WebSub fix test	2018-12-04 14:03:32 +03:00
Maksim Pechnikov	3ce16e5a56	init tesla and updated the http requests in Pleroma.Web.Websub	2018-12-04 14:03:32 +03:00
lambda	88b05aeabb	Merge branch 'fix/parse-user-bio' into 'develop' ... Parse user's bio on register See merge request pleroma/pleroma!492	2018-12-03 16:31:00 +00:00
lambda	42ef7cd227	Merge branch 'fix-media-proxy-defaults' into 'develop' ... Fix media proxy config defaults See merge request pleroma/pleroma!495	2018-12-03 16:14:58 +00:00
Maxim Filippov	4b70e5eae9	Parse bio for MastodonAPI	2018-12-03 18:59:50 +03:00
rinpatch	343b0adfa6	Merge branch 'develop' into fix/theora-detection-read-bytes	2018-12-03 00:34:04 +03:00
rinpatch	a3953ca37a	Change @read_bytes to 35	2018-12-03 00:22:19 +03:00
Rin Toshaka	03b2d1016d	F O R M A T I N G	2018-12-02 20:27:49 +01:00
Rin Toshaka	57c71f8468	Move generate_invite to user.ex	2018-12-02 20:26:15 +01:00
Rin Toshaka	d924b6cd3d	Refactor copypasta to a private function in instance.ex	2018-12-02 20:04:33 +01:00
Maxim Filippov	ce98d5eb9b	Parse user's bio on register	2018-12-02 22:03:53 +03:00
Rin Toshaka	cbe22deb51	Lint fix	2018-12-02 19:20:50 +01:00
Rin Toshaka	faf1f2b304	Move gen.instance to instance.ex	2018-12-02 19:18:06 +01:00
lain	8c9a4e8b40	TwitterAPI: Implement hide_network.	2018-12-02 18:14:13 +01:00
Rin Toshaka	7983b0bdfe	Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users.	2018-12-02 18:05:59 +01:00
lain	2a639de9b3	MastodonApi: Implement hide_network.	2018-12-02 17:48:00 +01:00
lain	6be0ab1e55	Hide network in ap.	2018-12-02 17:35:32 +01:00
href	43d5e4f7fa	Fix media proxy config defaults	2018-12-02 11:24:02 +01:00
lain	e3f3d13d99	Add uuid generation extension to sample_psql.eex.	2018-12-02 11:20:49 +01:00
lain	91065e1968	Fix background updating / handling.	2018-12-02 11:20:38 +01:00
Rin Toshaka	31b3ac05ac	Lint fix	2018-12-02 10:01:17 +01:00
Rin Toshaka	a8ef6b1190	Add admin option to pleroma.user new. Add user existence checking to toggle_activated	2018-12-02 09:36:31 +01:00
rinpatch	ae82852330	Move set_admin task to lib/mix/tasks/pleroma/user.ex	2018-12-01 18:55:52 +03:00
rinpatch	6f174cbb71	Delete reactivate user task	2018-12-01 18:34:26 +03:00
rinpatch	5f91d6b859	Fix toggle_deactivated to reactivate a deactivated user	2018-12-01 18:33:53 +03:00
rinpatch	fe2759bc9f	Attempt to resolve merge conflict	2018-12-01 18:12:27 +03:00
lain	f18b86fd5f	More fixes for Info schema.	2018-12-01 12:46:08 +01:00
lain	93f2dc19d9	TwitterAPI: Fix banner and background update.	2018-12-01 12:01:22 +01:00
lain	347df6421d	Fix masto api user updating.	2018-12-01 10:40:01 +01:00
lain	c443c9bd72	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info	2018-12-01 09:55:46 +01:00
lain	1c67277c80	Fix admin api.	2018-12-01 09:03:16 +01:00
href	e9982c521b	Upload filter: anonymize filename ... It replaces the original filename with a randomly generated string.	2018-11-30 19:33:34 +01:00
kaniini	ca24ad2a2b	Merge branch 'feature/reverse-proxy' into 'develop' ... reverse proxy / uploads See merge request pleroma/pleroma!470	2018-11-30 18:15:44 +00:00
href	8e0e20631c	Reverse proxy: default max read duration at 30 secs.	2018-11-30 19:12:03 +01:00
lambda	e99bab8f27	Merge branch 'config-delete' into 'develop' ... Add Pleroma.Config.delete/1 See merge request pleroma/pleroma!484	2018-11-30 17:57:06 +00:00
href	1d94c8f0f0	Fix supervisor order ... This starts `Pleroma.Web.Endpoint` after all other processes and may avoid some weird bugs (especially at start/restart). Also properly ignores starting the gopher's gen_server if disabled.	2018-11-30 18:31:15 +01:00
href	253da275bd	Pleroma.Config.delete/1	2018-11-30 18:27:27 +01:00
href	7282937f33	MIME: video/audio ogg detection	2018-11-30 18:02:52 +01:00
href	680716b3c9	Config docs	2018-11-30 18:02:51 +01:00
href	65e7307d68	Upload: bring back base_url	2018-11-30 18:02:50 +01:00
href	5d92431350	Fix deprecation warnings	2018-11-30 18:02:50 +01:00
href	02d3dc6869	Uploads fun, part. 2	2018-11-30 18:02:37 +01:00
href	97b00d366f	reverse_proxy: more headers	2018-11-30 18:00:57 +01:00
href	a2640c8088	Parse correctly content-type & do not forward content-length	2018-11-30 18:00:57 +01:00
href	b19597f602	reverse proxy / uploads	2018-11-30 18:00:47 +01:00
lain	d0ec2812bd	Merge remote-tracking branch 'origin' into validate-user-info	2018-11-30 17:34:20 +01:00
lain	8f1fffebc6	Fix transmogrifier test.	2018-11-30 17:31:05 +01:00
lain	d088ac6286	Fix OStatus user updates. ... Breaks banner updating.	2018-11-30 17:21:58 +01:00
lain	48b95a9b95	Assorted fixes.	2018-11-30 17:08:02 +01:00
lain	d407f662af	Fix TwitterApiController.	2018-11-30 17:07:37 +01:00
lain	a6812bc9df	Remove "most recent notification" endpoint.	2018-11-30 16:47:37 +01:00
KokaKiwi	87098d1676	Streamer: Don't send unwanted DMs to list streams	2018-11-27 20:50:19 +01:00
lain	e002858071	Fix ostatus test.	2018-11-27 18:37:46 +01:00
lain	3c61df6b9e	Webfinger fixes.	2018-11-27 18:31:44 +01:00
lain	badbe2656c	More fixes.	2018-11-27 18:12:03 +01:00
kaniini	b9bc83097d	Merge branch 'ogg-theora-detection' into 'develop' ... Add Theora detection to upload.ex See merge request pleroma/pleroma!479	2018-11-27 16:55:56 +00:00
lain	ec464ef20a	HTTP sig fixes.	2018-11-27 17:42:45 +01:00
rinpatch	0d229613df	Fix lint error	2018-11-27 19:07:58 +03:00
rinpatch	7f20a3cf1f	Add Theora detection to upload.ex	2018-11-27 17:51:02 +03:00
Haelwenn	5ae6088d37	Merge branch 'feature/mrf-user-allowlist' into 'develop' ... MRF: user allowlist module See merge request pleroma/pleroma!477	2018-11-27 00:12:03 +00:00
kaniini	a76058fc1d	Merge branch 'fix/pleromafe-title' into 'develop' ... Replace hardcoded <title> See merge request pleroma/pleroma!476	2018-11-26 23:59:30 +00:00
William Pitcock	271f9f1335	nodeinfo: add mrf_user_allowlist data	2018-11-26 23:52:19 +00:00
William Pitcock	8c05d19c7f	MRF: add user allowlist module	2018-11-26 23:51:58 +00:00
Mark Felder	6cc94404d7	Replace this hardcoded <title>	2018-11-26 22:51:25 +00:00
Haelwenn (lanodan) Monnier	04daa0fa44	Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https ... This fixes running mastofe with MIX_ENV=dev	2018-11-26 21:41:36 +01:00
shibayashi	591b11eafc	Add manifest-src to allow manifest.json	2018-11-26 20:48:24 +01:00
Haelwenn (lanodan) Monnier	ca029f0b69	Web.Streamer: Get unauthenticated statuses representation	2018-11-24 08:45:45 +01:00
Haelwenn (lanodan) Monnier	d388a99143	Web.MastodonAPI.MastodonSocket: Put access_token at function-level	2018-11-24 06:43:03 +01:00
Haelwenn (lanodan) Monnier	5346fabf14	Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints ... reported by soka on CRTNet	2018-11-24 06:13:36 +01:00
kaniini	675653ceb7	Merge branch 'feature/admin-api' into 'develop' ... Add a admin API See merge request pleroma/pleroma!366	2018-11-22 00:28:04 +00:00
kaniini	182e3e8da2	Merge branch 'feature/improve-version' into 'develop' ... Improved version string See merge request pleroma/pleroma!467	2018-11-21 16:53:38 +00:00
kaniini	a591a044a9	Merge branch 'runtime-fixes' into 'develop' ... Various runtime configuration fixes See merge request pleroma/pleroma!468	2018-11-20 22:25:35 +00:00
lain	0bea0308f1	Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info	2018-11-20 20:16:16 +01:00
lain	d3180e0ccc	Raise on usage of old function.	2018-11-20 20:14:38 +01:00
lain	0896cf4c0f	Fix most mastodon api bugs.	2018-11-20 20:12:39 +01:00
Haelwenn	c7d08bc1cf	Merge branch 'feature/retry-queue' into 'develop' ... Federator: add retry queue. See merge request pleroma/pleroma!323	2018-11-20 19:04:52 +00:00
William Pitcock	3456948cd1	mastodon api: fix up quite a few test failures	2018-11-20 19:02:23 +00:00
William Pitcock	ef6c64a5d2	activitypub: fix restrict_blocked()	2018-11-20 18:58:08 +00:00
William Pitcock	c196754b4d	mastodon api: account view: fix tests	2018-11-20 18:54:48 +00:00
William Pitcock	ece8656733	streamer: fix fetching the user's block list	2018-11-20 18:47:12 +00:00
William Pitcock	3356c7d1e9	oauth plug: fix deactivated check	2018-11-20 18:47:00 +00:00
William Pitcock	4ac849cb4a	common api: fix moderator check when deleting posts	2018-11-20 18:42:28 +00:00
William Pitcock	312676f711	user: fix user.info lookup in User.locked?()	2018-11-20 18:41:44 +00:00
lain	6f0b9a5163	Fix Notification tests.	2018-11-20 19:15:28 +01:00
lain	2887f4ff1d	Fix formatter tests.	2018-11-20 19:07:01 +01:00
href	bc5cf2c192	Improved version string	2018-11-20 17:55:03 +01:00
href	7f4c3a1e99	mediaproxy: fix empty url & add some tests	2018-11-20 17:50:03 +01:00
eal	689b46efc8	RetryQueue: tiny refractor, add tests	2018-11-19 18:08:41 +02:00
href	bcecdc3ab1	Various runtime configuration fixes	2018-11-19 10:09:24 +01:00
lain	fbb70d25fe	Several twitter api fixes.	2018-11-18 22:36:47 +01:00
lain	40d9d2098c	Fix user updating from AP.	2018-11-18 22:15:03 +01:00
lain	cafa15131a	Mix format.	2018-11-18 21:41:35 +01:00
lain	4c918392c6	Fix most User tests.	2018-11-18 21:40:52 +01:00
lain	e7cd6e9739	Fix setting of keys.	2018-11-18 19:33:43 +01:00
lain	fc3bcf335e	Fix following locked users.	2018-11-18 18:53:50 +01:00
lain	d5af41b577	Fix note count update.	2018-11-18 18:52:21 +01:00
lain	6f90ceb2ed	Fix follower count test.	2018-11-18 18:49:17 +01:00
lain	812f5b058a	Fix blocking.	2018-11-18 18:40:31 +01:00
lain	756764266c	Formatting.	2018-11-18 18:27:04 +01:00
lain	b396dba425	Fix follower count setting.	2018-11-18 18:24:16 +01:00
lain	5c8f07f0a8	Fix note counting.	2018-11-18 18:17:56 +01:00
lain	47d883d3ab	Fix User deactivation.	2018-11-18 18:06:02 +01:00
lain	50585d051b	Add User.Info module ... To validate and mutate the user.info field.	2018-11-18 18:04:42 +01:00
eal	62299be094	Federator: add retry queue.	2018-11-18 17:46:29 +02:00
William Pitcock	f6be980f4f	activitypub: object view: avoid leaking private details	2018-11-17 22:30:53 +00:00
William Pitcock	98795172a7	ostatus controller: respond with AS2 objects instead of activities to notice URIs	2018-11-17 22:10:15 +00:00
William Pitcock	dfcfb184b1	activitypub: transmogrifier: make deletes secure	2018-11-17 21:22:57 +00:00
Haelwenn (lanodan) Monnier	0ca00b3a07	Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit	2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier	44b6200103	lib/mix/tasks/relay*: Use a with block	2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier	12ccf0c4f8	Change Relay from status to {status, message}	2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier	4634d99d0d	Web.Router: Change right to permission group (except for function names)	2018-11-17 22:12:13 +01:00
William Pitcock	0d1375f274	federator: return :ok or :error depending on if an AP doc was accepted or not	2018-11-17 21:00:37 +00:00
William Pitcock	3d9266a8cb	federator: do origin containment when processing inbound messages	2018-11-17 20:43:43 +00:00
William Pitcock	c88533209c	activitypub: user fetching: use fetch_and_contain_remote_object_from_id()	2018-11-17 20:16:03 +00:00
William Pitcock	daa8ec3d62	activitypub: factor out AP object fetching to it's own function and add ID-based containment	2018-11-17 20:15:59 +00:00
Haelwenn (lanodan) Monnier	e0b0fde713	Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)	2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier	1a31d71187	lib/mix/tasks/relay_{un,}follow.ex: Use a with block	2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier	ccd6b1956d	lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow	2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier	7fbfd2db96	lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow	2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier	265c8c5209	Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t	2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier	4a79b89dba	lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”	2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier	f9d05902fe	lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves	2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier	a87ed2fad6	Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format	2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier	f48062488e	Add get endpoints for rights [AdminAPI]	2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier	59ce7fedce	Fix connection returns make generic right endpoint [AdminAPI]	2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier	c5a2bd6a65	admin_api_controller.ex: fix remaining params at once	2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier	95b107b6cc	admin_api_controller.ex: Add documentation, fix get_invite_token	2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier	578a911737	admin_api_controller.ex: get_password_reset: fix params and response	2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier	5732eef16b	lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController	2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier	c8b8f1d32c	[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error reporting	2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier	011a2e36b1	lib/mix/tasks/make_admin.ex: New task	2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier	7076d45cb6	lib/pleroma/plugs/user_is_admin_plug.ex: Create	2018-11-17 20:25:52 +01:00
Haelwenn (lanodan) Monnier	77d2fd54dd	admin_api_controller: Have some basic code	2018-11-17 20:25:52 +01:00
Haelwenn (lanodan) Monnier	ee2e1328ad	admin_api_controller.ex: Create	2018-11-17 20:25:52 +01:00
William Pitcock	603fccf175	activitypub: fetch_object_from_id(): prefer actor over attributedTo to avoid spoofing	2018-11-17 18:17:17 +00:00
kaniini	05967472f2	Merge branch 'feature/uploader-mdii' into 'develop' ... Feature / MDII Uploader See merge request pleroma/pleroma!454	2018-11-17 16:41:09 +00:00
hakabahitoyo	59e079f641	fallbacking into local uploader	2018-11-17 20:16:25 +09:00
hakabahitoyo	8fd0556c78	better config reading	2018-11-17 18:14:42 +09:00
lain	f87b315618	TwitterAPI: Fix dm_timeline displaying only half of the conversation.	2018-11-16 19:47:36 +01:00
lambda	2f639ea129	Merge branch 'feature/pleromafe-usersearch' into 'develop' ... Add Twitter / Pleroma API user search See merge request pleroma/pleroma!452	2018-11-16 18:13:47 +00:00
William Pitcock	c07464607d	http security: remove form-action from CSP definitions	2018-11-16 17:40:21 +00:00
lain	e8d8c84f79	Add better test for user search functionlity.	2018-11-16 18:31:32 +01:00
hakabahitoyo	55abd8482e	better config	2018-11-16 20:41:12 +09:00
hakabahitoyo	52224de39f	better extension detection	2018-11-16 20:22:36 +09:00
hakabahitoyo	4fbfacf5e1	debug	2018-11-15 16:08:55 +09:00
hakabahitoyo	8e707aba29	format	2018-11-15 15:11:59 +09:00
Hakaba Hitoyo	ebe658c169	debuf	2018-11-15 14:46:43 +09:00
Hakaba Hitoyo	698cb3587c	omplement mdii uploader	2018-11-15 14:38:45 +09:00
Hakaba Hitoyo	58af0787be	add mdii uploader	2018-11-15 14:19:10 +09:00
lain	27aa136aac	Format.	2018-11-14 20:41:12 +01:00
lain	7b170cd616	Add Pleroma user search api for PleromaFE.	2018-11-14 20:33:23 +01:00
lambda	cc45797f4e	Merge branch 'fix-media-proxy-filename' into 'develop' ... media_proxy: use path only to retrieve filename See merge request pleroma/pleroma!450	2018-11-14 18:17:10 +00:00
kaniini	69d557e86d	Merge branch 'twitter-api-direct-messages' into 'develop' ... Twitter api direct messages See merge request pleroma/pleroma!449	2018-11-14 08:52:08 +00:00
href	f52a1d1ec5	media_proxy: use path only to retrieve filename	2018-11-13 23:41:33 +01:00
lain	ea9a776d7b	TwitterApi: Add direct message endpoint	2018-11-13 20:08:50 +01:00
lain	2cf40237ff	MastodonAPI: Add pagination to private messages.	2018-11-13 19:46:34 +01:00
href	9b553a1087	media_proxy: CSP, content-disposition ... * Adds CSP headers to the media proxy endpoint * Sends `content-disposition: attachment; …` for non-image/video/audio content types The default list can be overwritten with `:media_proxy, :safe_content_types` in the configuration. * Also now appends the filename to the proxy URL (fixes some mobile apps, it was requested a while ago)	2018-11-13 15:58:02 +01:00
shibayashi	87c76a9a2f	Add __Host- prefix when secure flag is enabled	2018-11-13 00:32:38 +01:00
scarlett	0ce5623134	Merge branch 'twitter-api-null-display-name' into 'develop' ... Twitter API: Fall back to user.nickname if user has no name Closes #375 See merge request pleroma/pleroma!444	2018-11-12 17:08:54 +00:00
scarlett	cb6fd73861	Twitter API: Fall back to user.nickname if user has no name	2018-11-12 15:52:13 +00:00
kaniini	54923c2e55	Merge branch 'feature/csp-plug' into 'develop' ... migrate CSP management to CSPPlug See merge request pleroma/pleroma!441	2018-11-12 15:30:42 +00:00
William Pitcock	2829fa4183	sample config: chase http_security change	2018-11-12 15:17:04 +00:00
William Pitcock	ee5932a504	http security: allow referrer-policy to be configured	2018-11-12 15:14:46 +00:00
William Pitcock	fe67665e19	rename CSPPlug to HTTPSecurityPlug.	2018-11-12 15:08:02 +00:00
KokaKiwi	1592fa2bea	Mastodon API: Fix list streaming	2018-11-11 14:18:15 +01:00
William Pitcock	df72978dce	csp plug: add support for certificate transparency	2018-11-11 06:55:44 +00:00
William Pitcock	331cf6ada1	csp plug: add sts support	2018-11-11 06:50:28 +00:00
William Pitcock	a2bf5426cb	sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging)	2018-11-11 06:42:14 +00:00
William Pitcock	f516e317ea	plugs: add CSPPlug	2018-11-11 06:10:21 +00:00
William Pitcock	419ed3a0ca	oauth: fix token decode regression	2018-11-11 05:26:39 +00:00
lambda	f745e823f0	Merge branch 'bugfix/json-ld-object-sanitization' into 'develop' ... JSON-LD: object sanitization See merge request pleroma/pleroma!438	2018-11-10 12:37:18 +00:00
William Pitcock	97e50f3191	activitypub: transmogrifier: sanitize internal representation details from outgoing objects ... this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside projects which tried to parse our internal data. accordingly, it seems better to just remove it.	2018-11-10 12:24:20 +00:00
Haelwenn (lanodan) Monnier	5ecb5629f6	lib/mix/tasks: s/@doc/@moduledoc/	2018-11-10 13:09:39 +01:00
Haelwenn (lanodan) Monnier	5e3207045e	lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy	2018-11-10 13:09:39 +01:00
Haelwenn (lanodan) Monnier	64c0289893	lib/mix/tasks: Add remaining documentation for mix tasks	2018-11-10 13:09:38 +01:00
Haelwenn (lanodan) Monnier	8b2541e4e7	Document the mix tasks in ex_doc instead	2018-11-10 13:09:37 +01:00
Haelwenn (lanodan) Monnier	e1814bb322	Document mix tasks	2018-11-10 13:09:37 +01:00
William Pitcock	f8310114a6	activitypub: object view: sanitize both the activity and the object when an activity is given for rendering	2018-11-10 12:04:09 +00:00
kaniini	c9c1f9dee2	Merge branch 'bugfix/ostatus-as2-reflection' into 'develop' ... ostatus: only federate activities concerning note objects See merge request pleroma/pleroma!437	2018-11-10 11:50:02 +00:00
kaniini	7daa102fa4	Merge branch 'bugfix/local-jsonld-context' into 'develop' ... Host LitePub JSON-LD context locally See merge request pleroma/pleroma!435	2018-11-10 11:37:44 +00:00
William Pitcock	4f87b8362b	endpoint: move CORSPlug in front of Plug.Static	2018-11-10 11:23:50 +00:00
William Pitcock	03a9990baf	endpoint: fix formatting	2018-11-10 11:18:25 +00:00
William Pitcock	e6d246882d	federator: don't federate anything other than Note objects to OStatus	2018-11-10 10:06:10 +00:00
William Pitcock	e4971553c7	activitypub: utils: use same object type list for mention extraction as insertion	2018-11-09 13:40:39 +00:00
William Pitcock	b3c360ce2c	notification: add fallback get_notified_from_activity()	2018-11-09 09:07:40 +00:00
William Pitcock	b9871e7e5a	activitypub: utils: wrap Note objects in a Create when extracting mentions	2018-11-09 09:01:40 +00:00
William Pitcock	8c805ada32	user: remove obsolete User.get_notified_from_activity().	2018-11-09 09:01:40 +00:00
William Pitcock	6cadfcb21e	activitypub: utils: switch to using new Notification.get_notified_from_activity().	2018-11-09 09:01:40 +00:00
William Pitcock	cdfdd77e30	notification: implement new Notification.get_notified_from_activity()	2018-11-09 09:01:36 +00:00
William Pitcock	d26cd6c1bf	user: factor out user set fetching from User.get_notified_from_activity()	2018-11-09 08:23:45 +00:00
William Pitcock	81d6ca1783	user: implement AS2 mention extraction + unify Announce handling	2018-11-08 20:19:56 +00:00
William Pitcock	6b4064fa5d	activitypub: transmogrifier: unify mention extraction	2018-11-08 19:41:36 +00:00
William Pitcock	0a2c1a3419	user: add optional local_only param to get_notified_from_activity()	2018-11-08 19:30:55 +00:00
Haelwenn (lanodan) Monnier	2fab32ab61	Pleroma.Web.Endpoint: Whitelist schemas directory	2018-11-08 20:22:12 +01:00
Haelwenn (lanodan) Monnier	934125695d	Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld	2018-11-08 20:21:45 +01:00
William Pitcock	4e93d6ae14	common api: utils: flip to/cc for mentions	2018-11-08 19:17:01 +00:00
William Pitcock	3e33479c05	activitypub: transmogrifier: only consider to users as mention targets	2018-11-08 18:58:27 +00:00
William Pitcock	144dc048b8	user: only consider to recipients as mention targets	2018-11-08 18:58:24 +00:00
Haelwenn (lanodan) Monnier	abcacec97d	Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one	2018-11-08 19:38:38 +01:00
William Pitcock	da16ada424	utils: use litepub @context instead of that huge mess	2018-11-08 16:52:14 +00:00
William Pitcock	f733470037	user view: unify a @context entry that was missed	2018-11-08 16:51:48 +00:00
lambda	59cf7cf235	Merge branch 'small-jsonld-refactor' into 'develop' ... Small jsonld refactor See merge request pleroma/pleroma!433	2018-11-08 16:23:58 +00:00
lain	34bd411781	Unify json ld header handling.	2018-11-08 16:39:38 +01:00
lain	3b02fd9fb7	Small refactor.	2018-11-08 16:05:28 +01:00
kaniini	4d627a5117	Merge branch 'feature/qvitter-notifications-dismiss' into 'develop' ... qvitter notifications: add new "read notifications" API See merge request pleroma/pleroma!431	2018-11-07 22:33:06 +00:00
kaniini	b451a92d78	Merge branch 'runtime-config' into 'develop' ... Runtime configuration See merge request pleroma/pleroma!430	2018-11-07 22:32:34 +00:00
href	e42f2efae4	/api/v1/accounts/relationships Return an empty array if no id in params ... This copies Mastodon API behaviour & fixes Mastalab app.	2018-11-07 16:32:57 +01:00
href	9070588493	Runtime config: MRF changes	2018-11-07 10:40:24 +01:00
William Pitcock	b2105a3131	twitterapi: add notification read endpoint	2018-11-06 23:25:07 +00:00
William Pitcock	f16c2e0b1b	notification: add Notification.set_read_up_to()	2018-11-06 22:50:43 +00:00
href	5bb88fd174	Runtime configuration ... Related to #85 Everything should now be configured at runtime, with the exception of the `Pleroma.HTML` scrubbers (the scrubbers used can be changed at runtime, but their configuration is compile-time) because it's building a module with a macro.	2018-11-06 19:41:15 +01:00
kaniini	a68c18f0ad	Merge branch 'unify-mastodon-oauth' into 'develop' ... Unify Mastodon Login with OAuth login. See merge request pleroma/pleroma!429	2018-11-06 16:18:12 +00:00
kaniini	0f3e78addb	Merge branch 'runtime-router' into 'develop' ... Runtime configured router See merge request pleroma/pleroma!426	2018-11-06 15:35:19 +00:00
lain	a8f1e30cb8	Formatting.	2018-11-06 16:05:58 +01:00
href	7d328c658d	Small wrapper module around Application.get_env/put_env ... Same API as the old Pleroma.Config	2018-11-06 16:00:48 +01:00
lain	4f640c43ed	Unify Mastodon Login with OAuth login. ... This removes duplication in the login code.	2018-11-06 15:19:11 +01:00
href	2bc924ba45	Get rid of Pleroma.Config in favor of Application ... Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232	2018-11-06 15:12:53 +01:00
href	013f7ba8c1	Add federating plug & public tests	2018-11-06 14:45:04 +01:00
href	83911b1443	Fix wrong return when finmoji is disabled	2018-11-05 21:17:47 +01:00
href	fd0e7d18d9	handle_continue is OTP21+	2018-11-05 18:04:43 +01:00
href	6fe23c5458	Runtime configured router	2018-11-05 15:19:03 +01:00
href	d096bc17bf	revert endpoint position in supervision tree	2018-11-05 14:05:04 +01:00
href	763fc7b44f	Runtime configured emojis ... The changes are a bit heavy since the emojis were loaded into module attributes from filesystem. This introduces a GenServer using an ETS table to cache in memory the emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.	2018-11-05 13:24:00 +01:00
kaniini	007f1c73b1	Merge branch 'feature/cors-again' into 'develop' ... Add CORSPlug to make web-based OAuth easier. See merge request pleroma/pleroma!420	2018-11-03 15:36:23 +00:00
Haelwenn (lanodan) Monnier	3e50bb667f	Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable	2018-11-03 14:42:47 +01:00
lain	e954cfcc2c	Add CORSPlug to make web-based OAuth easier.	2018-11-03 13:38:01 +01:00
lambda	4bcdbb12a4	Merge branch 'fix_hashtag_search' into 'develop' ... Fix hashtag search See merge request pleroma/pleroma!418	2018-11-02 20:05:56 +00:00
Mark Felder	0cca7edbe0	Fix hashtag search ... When we lowercase the search it will succesfully do a case insenstive match. Now #Linux will match #linux and #LINUX whereas previously it would only match the exact case.	2018-11-02 19:38:57 +00:00
lain	45ebc8dd9a	Check for empty string in_reply_to ids.	2018-11-02 17:33:51 +01:00
Haelwenn (lanodan) Monnier	3c7d4ff271	Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo	2018-11-01 15:07:27 +01:00
William Pitcock	24ba08de13	twitter api: add support for rendering Page objects	2018-11-01 10:01:35 +00:00
William Pitcock	4d8f076125	mastodon api: add support for rendering Page objects	2018-11-01 10:00:16 +00:00
William Pitcock	9f03b5c4f7	activitypub: transmogrifier: add support for Page objects	2018-11-01 09:59:43 +00:00
Lee Starnes	585b29337c	Ensure filters have a filter_id	2018-11-01 09:17:02 +00:00
kaniini	eba9a62024	Merge branch 'feature/relay-tests' into 'develop' ... relay tests See merge request pleroma/pleroma!411	2018-11-01 09:10:51 +00:00
Haelwenn	40676d7683	Merge branch 'bugfix/prismo.news_article_url' into 'develop' ... Bugfix/prismo.news article url Closes #352 See merge request pleroma/pleroma!410	2018-11-01 09:05:16 +00:00
lain	1e9ced5af4	Test Relay, switch to runtime configuration.	2018-11-01 09:01:43 +00:00
lain	e6ec01afb6	Start configuration manager.	2018-11-01 09:01:24 +00:00
lain	9b77030d3c	Add basic configuration management module.	2018-11-01 09:01:03 +00:00
Haelwenn (lanodan) Monnier	b2da5262ea	Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty ... Thanks prismo.news, I hate it	2018-11-01 09:56:37 +01:00
Haelwenn (lanodan) Monnier	755f166406	Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string	2018-11-01 09:55:38 +01:00
William Pitcock	2b3a40d038	object: split object_cache from user_cache	2018-11-01 08:41:46 +00:00
William Pitcock	f584a603f9	user: make User.delete() return data consistent with Object.delete()	2018-11-01 07:56:21 +00:00
William Pitcock	2c3bfd7f76	user: delete user_info data in User.invalidate_cache()	2018-11-01 07:52:58 +00:00
William Pitcock	10f3958468	object: return the deleted object as well	2018-11-01 07:47:50 +00:00
William Pitcock	2bf358d7b4	activitypub: use Object.delete() instead of mutating the database and cache directly	2018-11-01 07:29:12 +00:00
William Pitcock	c4e43da63e	object: add safe object deletion function	2018-11-01 07:28:48 +00:00
Haelwenn (lanodan) Monnier	558e6a84d6	[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/346	2018-11-01 06:52:01 +01:00
William Pitcock	47f76bf4b1	common api: allow self-liking objects ... mastodon allows this, for whatever reason. closes #347.	2018-10-31 22:29:49 +00:00
kaniini	5fea3d9eca	Merge branch 'allow-abbr' into 'develop' ... Allow use of the `abbr` HTML tag. See merge request pleroma/pleroma!405	2018-10-30 23:22:48 +00:00
scarlett	795634c90f	Allow use of the abbr HTML tag.	2018-10-30 21:40:06 +00:00
scarlett	b92e38d2d4	Add user reactivation task.	2018-10-29 23:13:15 +00:00
kaniini	a880e0a527	Merge branch 'feature/upload-limits' into 'develop' ... configurable media upload limits Closes #118 See merge request pleroma/pleroma!401	2018-10-29 20:14:10 +00:00
William Pitcock	676c97b8c7	nodeinfo: expose configured upload limits	2018-10-29 20:07:52 +00:00
William Pitcock	36825932eb	s3 uploader: add new feature to force public attachment URIs to go through media proxy	2018-10-29 18:00:59 +00:00
William Pitcock	f407831120	common api: prefer formatting attachments using the attachment's name instead of URI	2018-10-29 17:59:24 +00:00
William Pitcock	784b3a615d	utils: fix another possible leak with private S3 backends using mediaproxy ... same rationale as the other mediaproxy changes	2018-10-29 17:26:15 +00:00
William Pitcock	181f3bb56a	mastodon api: enforce upload limits for avatars and banners	2018-10-29 16:43:05 +00:00
William Pitcock	e12489e2fe	twitter api: enforce upload limits for avatars, banners and backgrounds	2018-10-29 16:43:05 +00:00
William Pitcock	167d3789a5	activitypub: upload: pass through an upload limit if one is provided	2018-10-29 16:43:05 +00:00
William Pitcock	fa483cd7c2	upload: add new optional argument designating an upload size limit	2018-10-29 16:43:00 +00:00
William Pitcock	5c6ec2d9fc	twitter/mastodon api: always use mediaproxy URLs in attachments ... if using local media, the mediaproxy will not replace the URL anyway.	2018-10-29 15:19:32 +00:00
William Pitcock	69192f36ff	mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots)	2018-10-28 19:47:56 +00:00
kaniini	39103a91be	Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop' ... activitypub: fix possible false positives with broken thread filtering See merge request pleroma/pleroma!398	2018-10-28 05:52:51 +00:00
William Pitcock	72ea54de6e	activitypub: fix possible false positives with broken thread filtering	2018-10-28 05:45:33 +00:00
Greizgh	a494508320	Cleanup postgresql setup script ... Drop unused CREATEDB privilege. Do not try to handle multiple run.	2018-10-27 14:31:51 +02:00
kaniini	44762daf51	Merge branch 'feature/broken-thread-filtering' into 'develop' ... broken thread filtering, part 1 See merge request pleroma/pleroma!394	2018-10-26 06:45:38 +00:00
William Pitcock	c302c619b9	http: fix mediaproxy	2018-10-26 06:38:08 +00:00
William Pitcock	26eb11c172	activitypub: add support for filtering broken threads out of timelines	2018-10-26 06:16:51 +00:00
William Pitcock	7338368ad9	http: enable keepalive / connection pooling (closes #336)	2018-10-26 03:06:42 +00:00
William Pitcock	f6cb963df2	activitypub utils: fix recipient check when the message is unaddressed (mastodon)	2018-10-26 01:24:22 +00:00
Haelwenn (lanodan) Monnier	7906dfe5a0	[Pleroma.Web.Nodeinfo.NodeinfoController]: Simplify features strings	2018-10-26 01:06:34 +02:00
Haelwenn (lanodan) Monnier	57330dd91b	[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features	2018-10-26 01:06:19 +02:00
kaniini	9fe9c09883	Merge branch 'finmoji-optional' into 'develop' ... Make finmoji optional See merge request pleroma/pleroma!391	2018-10-25 18:24:07 +00:00
scarlett	ae5beb7b64	Make finmoji optional	2018-10-25 17:58:46 +01:00
William Pitcock	ce70eb8c00	activitypub utils: fix user splicing	2018-10-25 05:24:01 +00:00
William Pitcock	2f1f1a4f30	activitypub: splice users into recipient lists when they receive messages at their personal inbox ... closes #343	2018-10-25 05:02:21 +00:00
kaniini	9e9b1bd5ea	Merge branch 'bugfix/ap-uri-user-search' into 'develop' ... transmogrifier: do not try to contain origin of something which doesn't have one Closes #340 See merge request pleroma/pleroma!389	2018-10-25 04:38:46 +00:00
Haelwenn	79b1e4465f	Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop' ... [Pleroma.Web.MastodonAPI.StatusView]: Add fallback on missing handler for status.json Closes #233 See merge request pleroma/pleroma!257	2018-10-25 04:35:29 +00:00
William Pitcock	5383887bd4	transmogrifier: do not try to contain origin of something which doesn't have one	2018-10-25 04:27:33 +00:00
Haelwenn (lanodan) Monnier	b386888a0e	[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4 ... Better be sure than sorry	2018-10-25 06:21:11 +02:00
William Pitcock	1ed25c963a	twitterapi: activity view: add the other in_reply_to fields	2018-10-25 04:04:04 +00:00
William Pitcock	1b480e3514	user: add helper for fetching profile url (which may be different than ap id)	2018-10-25 04:01:59 +00:00
Haelwenn (lanodan) Monnier	b112112c11	[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4	2018-10-25 05:52:45 +02:00
Haelwenn (lanodan) Monnier	b0a940d5a2	[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments	2018-10-25 05:24:03 +02:00
Haelwenn (lanodan) Monnier	2da0ffeb28	lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil	2018-10-25 05:24:03 +02:00
Haelwenn (lanodan) Monnier	0c10be8731	[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json	2018-10-25 05:24:03 +02:00
Haelwenn (lanodan) Monnier	3b0e9287a5	[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views	2018-10-25 05:24:01 +02:00
William Pitcock	fee43ae5e7	twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper	2018-10-25 02:59:04 +00:00
William Pitcock	f3f736afc4	activity: add helper to fetch an activity's parent	2018-10-25 02:47:55 +00:00
kaniini	945ce9910d	Merge branch 'bugfix/html-scrub-comments' into 'develop' ... html: ensure comments are correctly scrubbed See merge request pleroma/pleroma!384	2018-10-23 00:56:09 +00:00
William Pitcock	8613db0e3b	html: ensure comments are correctly scrubbed	2018-10-23 00:48:49 +00:00
scarlett	a253c1466e	New frontend options	2018-10-21 12:52:52 +01:00
AkiraFukushima	a249cbf187	Add a test for List.get_lists_account_belongs	2018-10-19 21:24:15 +09:00
AkiraFukushima	e8c698af41	Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs	2018-10-19 01:46:26 +09:00
kaniini	ad3181895c	Merge branch 'bugfix/html-scrub-schemes' into 'develop' ... lib/pleroma/html.ex: Fix scheme lists See merge request pleroma/pleroma!377	2018-10-18 14:36:40 +00:00
William Pitcock	595d855f0e	html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility	2018-10-18 14:29:31 +00:00
Haelwenn (lanodan) Monnier	2154c5dcd8	lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes	2018-10-18 07:58:15 +02:00
William Pitcock	582dbe5c8d	formatter: fix matching osada users	2018-10-17 19:15:20 +00:00
scarlett	7562912f6a	Use maybe_direct_follow for follow imports	2018-10-17 04:16:11 +01:00
Haelwenn (lanodan) Monnier	d7654c77de	lib/pleroma/html.ex: Use a function as a variable (broken for some reason)	2018-10-16 03:34:33 +02:00
Haelwenn (lanodan) Monnier	50e0a9ae56	lib/pleroma/html.ex: Fix scheme lists ... Gosh please don’t break ourselves… Also this is copy-paste of the list in lib/pleroma/formatter.ex, I think this should be put in a common variable, but where?	2018-10-16 03:00:37 +02:00
William Pitcock	30efa86c05	common api: enable tag linking in markdown mode	2018-10-14 20:36:11 +00:00
Haelwenn (lanodan) Monnier	eacab0fb05	Delete Tokens and Authorizations on password change ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/320	2018-10-14 02:14:54 +02:00
William Pitcock	51eaece3ea	user: break out local cases for maybe_direct_follow	2018-10-11 10:49:54 +00:00
William Pitcock	2c29329d39	user: local users are always AP-enabled (closes #316)	2018-10-11 10:35:11 +00:00
William Pitcock	111841ad34	common api: take the combination of the subject and content for length limit enforcement ... closes #315	2018-10-10 07:53:44 +00:00
William Pitcock	08d5ad71b6	nodeinfo: allow opting out of MRF transparency	2018-10-07 01:23:38 +00:00
William Pitcock	7b3fff9af8	{mastodon api, twitter api}: make the follow handshake timeout configurable	2018-10-07 01:05:59 +00:00
William Pitcock	7f530f6f80	mastodon api: relationship view: better handle no pre-existing follow activity	2018-10-05 23:50:13 +00:00
William Pitcock	e69faf550c	user: add wait_and_refresh() for async three-way handshake case	2018-10-05 23:40:49 +00:00
William Pitcock	3e751496e3	mastodon api: account view: fetch follow state and use it to populate requested field	2018-10-05 23:31:49 +00:00
William Pitcock	a71b822013	activitypub: always track following state for async reasons	2018-10-05 23:31:00 +00:00
William Pitcock	8ce217776d	activitypub transmogrifier: better manage follow state	2018-10-05 23:30:34 +00:00
William Pitcock	4f7a468659	user: only pre-create follow relationships on OStatus ... closes #306	2018-10-05 22:58:03 +00:00
William Pitcock	bd76d9cee6	nodeinfo: add accepted post formats to metadata	2018-10-05 21:05:37 +00:00
William Pitcock	285ac80c36	config: allow for accepted post formats to be configured	2018-10-05 21:02:17 +00:00
William Pitcock	52b05137c5	formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly	2018-10-05 20:49:34 +00:00
William Pitcock	16307da311	twitterapi: frontend config: add formattingOptionsEnabled	2018-10-05 20:49:34 +00:00
William Pitcock	b1be9415ef	Revert "Merge branch 'revert-a26d5e6b' into 'develop'" ... This reverts commit d31bbb1cfe, reversing changes made to 340ab3cb90.	2018-10-05 20:49:34 +00:00
Haelwenn (lanodan) Monnier	f2efc8dcfb	nodeinfo_controller: Fix JSON rendering ... This is the last noedinfo difference from my own branch	2018-10-05 22:32:53 +02:00
Haelwenn (lanodan) Monnier	28651df478	MRF Transparency	2018-10-05 20:09:08 +02:00
Haelwenn (lanodan) Monnier	56d31db130	Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one	2018-10-05 20:08:55 +02:00
Haelwenn (lanodan) Monnier	8226953f1d	[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple	2018-10-05 20:02:13 +02:00
kaniini	4f03bb2299	Merge branch 'bugfix/fix-mrf-reject-match' into 'develop' ... activitypub: fix error condition match See merge request pleroma/pleroma!365	2018-09-30 05:32:56 +00:00
William Pitcock	4db1bc2c0e	activitypub: fix error condition match	2018-09-30 05:26:13 +00:00
Haelwenn (lanodan) Monnier	a3cffd3566	formatter: Stop using phoenix HTML and format it ourselves ... * Pheonix has an extra scheme whitelist conflicting with ours * Pheonix doesn’t seems to do URL encoding, just HTML encoding Closes: https://git.pleroma.social/pleroma/pleroma/issues/307	2018-09-28 17:32:27 +02:00
Haelwenn	34b6d444d6	Merge branch 'feature/twitter_api/fields' into 'develop' ... [Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields" See merge request pleroma/pleroma!360	2018-09-28 09:25:27 +00:00
Haelwenn (lanodan) Monnier	82b57ebad1	[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"	2018-09-28 10:44:45 +02:00
William Pitcock	707077edde	activitypub: don't fall back to OStatus fetching when MRF rejects an object	2018-09-28 00:45:10 +00:00
William Pitcock	5c312ad677	activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else ... although the previous handling assumed any unsigned/invalid signature message was a Create, lets make it more explicit	2018-09-28 00:03:59 +00:00
Haelwenn (lanodan) Monnier	c739737998	transmogrifier: get_actor called without casting attributedTo in actor and actor is nil	2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier	9446b02bdf	transmogrifier: Just make attachement maps into a list and reroll	2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier	e53da692fb	transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on	2018-09-27 20:00:48 +02:00
William Pitcock	d830a243a3	transmogrifier: more robustly handle dereferencing pointer URIs	2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier	4c3a80de96	transmogrifier: Use oneliners when applicable	2018-09-27 20:00:47 +02:00
William Pitcock	ed8dfa3029	transmogrifier: reformat cond block by hand	2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier	eebe33e86a	transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor	2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier	f3291acc91	transmogrifier: pro-actively add support for Hashtag without array in tag	2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier	22927f3a34	transmogrifier: Use a cond, add proactive support for arrays	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	0aac72f1d3	[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	28e8a8ab36	[Pleroma.Web.ActivityPub.Transmogrifier]: fix emoji in tag when it’s not in a array [kroeg] ... Also simplified the code for name trimming. And not copying the Map.merge part as it looks buggy. See: https://queer.hacktivis.me/objects/a9f21ebc-9a12-4a6c-89d5-3d46955c6ee8	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	f8a0cb9c0b	[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map [kroeg]	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	a4abb124ea	[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg]	2018-09-27 20:00:46 +02:00
Haelwenn (lanodan) Monnier	523757be52	[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]	2018-09-27 20:00:45 +02:00
Martin Kühl	f77ec96707	Uploaders.S3: Replace unsafe characters in object key ... According to [the S3 docs][s3], the characters safe for use in object keys are: * 0-9 * a-z * A-Z * ! * - * _ * . * * * ' * ( * ) (The / character is not listed but mentioned being safe outside of the list.) Several characters that are valid in filenames can cause problems, for example spaces are not valid in URLs and need to be escaped, sequences of spaces can become squeezed by S3, some characters like \ are documented to require “significant special handling”. To avoid these problems, this change encodes the filename before using it as part of the S3 object name by replacing all characters except those documented as “safe” with dashes. [s3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html	2018-09-24 15:38:32 +02:00
Martin Kühl	d94ee5cd50	Mastodon API: Support push subscription CRUD	2018-09-22 07:04:01 +02:00
Martin Kühl	c2d592c9c5	Assign token to connection	2018-09-22 07:04:01 +02:00
William Pitcock	7f0e291483	html: twittertext: add missing catchall scrub function	2018-09-22 03:45:35 +00:00
William Pitcock	56577d8b48	twitter api: add no_rich_text option to userview for account prefs	2018-09-22 03:24:40 +00:00
William Pitcock	df00a364fb	mastodon api: formatting	2018-09-22 02:53:04 +00:00
William Pitcock	c2b69798dd	twitter api: add support for disabling rich text	2018-09-22 02:53:02 +00:00
William Pitcock	958e085acb	mastodon api: add support for user-supplied html policy	2018-09-22 02:53:02 +00:00
William Pitcock	2f5b026548	twitter api: add support for user-specified html policy	2018-09-22 02:53:01 +00:00
William Pitcock	735cdfb848	user: add User.html_filter_policy()	2018-09-22 02:53:00 +00:00
William Pitcock	8ae9424edb	html: default to using normal scrub policy if provided scrub policy is nil	2018-09-22 02:52:59 +00:00
kaniini	4cb6331843	Merge branch 'feature/dynamic-user-refresh' into 'develop' ... user: implement dynamic refresh of profiles See merge request pleroma/pleroma!350	2018-09-21 00:00:28 +00:00
kaniini	0fe165165f	Merge branch 'task-204-on-options-request' into 'develop' ... Return 204 response on options request See merge request pleroma/pleroma!347	2018-09-20 23:54:51 +00:00
William Pitcock	8e28e8a18f	mix: remove fix_ap_users task, now obsolete	2018-09-20 23:50:56 +00:00
William Pitcock	c9f6eb9a41	user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)	2018-09-20 23:50:56 +00:00
Haelwenn (lanodan) Monnier	40c51f118f	[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0	2018-09-20 16:48:12 +02:00
Haelwenn (lanodan) Monnier	f74725df41	[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables	2018-09-20 16:37:18 +02:00
Haelwenn (lanodan) Monnier	33a1e92584	[Pleroma.Web.Router]: Fake /api/v1/endorsements	2018-09-20 16:25:07 +02:00
Haelwenn (lanodan) Monnier	a8eaecadee	[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)	2018-09-20 16:24:29 +02:00
Haelwenn (lanodan) Monnier	43d0b7bf7a	[Pleroma.Web.MastodonAPI.StatusView] add replies_count	2018-09-20 16:10:46 +02:00
William Pitcock	c9585ec007	twitter api: fix mimetype fallback when attachments use a URI instead of a URL object	2018-09-19 04:59:26 +00:00
William Pitcock	0cac493fdc	mastodon api: default attachment type to image if one is not present	2018-09-19 04:59:25 +00:00
Martin Kühl	f4fcea5258	Revert "Mastodon API: Fake support for loading filters" ... This reverts commit c1d07da4e1. The fake support was superseded by 6e030129fb which actually implements the faked filters API. This change removes the fake support and ensures that the actual implementation is used.	2018-09-18 11:59:10 +02:00
Dominique Feyer	9b0f2d572b	Return 204 response on options request	2018-09-17 12:21:01 +02:00
William Pitcock	a7d0ecdc7c	html: add policy which transforms inline images to pass through the media proxy	2018-09-16 02:16:16 +00:00
William Pitcock	cd13fa17fd	html: allow scrubbing policies to be stackable	2018-09-16 02:16:14 +00:00
William Pitcock	342ed84446	MRF: add policy for normalizing HTML markup (local and remote) to a specific policy	2018-09-16 01:25:36 +00:00
William Pitcock	95376ac1fe	html: add the ability to override the default scrub policy	2018-09-16 01:25:35 +00:00
kaniini	c2650f0ffb	Merge branch 'feature/html-scrub-policy' into 'develop' ... html scrub policy See merge request pleroma/pleroma!339	2018-09-16 01:05:09 +00:00
shadowfacts	39aed5348a	Add visible_in_picker to status emojis	2018-09-10 23:32:19 +00:00
William Pitcock	d3248e13e3	activitypub: transmogrifier: allow profile updates from bots	2018-09-10 01:57:03 +00:00
William Pitcock	e0b8c0ccba	MRF: reject non-public: use pattern match to remove unnecessary if block	2018-09-10 01:16:03 +00:00
William Pitcock	88094c266d	MRF: simple policy: refactor module to use guards and pattern matching	2018-09-10 01:16:02 +00:00
William Pitcock	97253df3ee	MRF: simple policy: contain media removal/nsfw ops to create activities only	2018-09-10 01:16:01 +00:00
William Pitcock	e82ce2a4b3	formatting	2018-09-10 00:28:40 +00:00
William Pitcock	358f88e10a	html: allow inline images by default (because of custom emoji)	2018-09-10 00:24:19 +00:00
William Pitcock	40e2f6e500	html: add default scrubbing profile and configuration knobs	2018-09-10 00:14:57 +00:00
William Pitcock	ac486fc59b	everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly	2018-09-10 00:14:47 +00:00
William Pitcock	255f46d7ab	html: new module providing a configurable markup scrubbing policy	2018-09-10 00:13:57 +00:00
Dominique Feyer	801d645c6b	TASK: Fix formatting	2018-09-09 23:42:28 +02:00
Dominique Feyer	b79c126ee0	Add missing URL encoding in create authorization redirect	2018-09-09 23:31:47 +02:00
Hakaba Hitoyo	4e1bb7bccb	make limit for /api/v1/suggestions	2018-09-09 13:57:23 +09:00
lambda	045953225e	Merge branch 'moonman/pleroma-sha512-crypt' into 'develop' ... auth overhaul and legacy GS auth See merge request pleroma/pleroma!331	2018-09-08 09:20:34 +00:00
kaniini	530561a091	Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop' ... Add Secure and SameSite cookie flags See merge request pleroma/pleroma!302	2018-09-07 23:55:42 +00:00
kaniini	3e4f39116b	Merge branch 'feature/custom_media_url' into 'develop' ... [Pleroma.Uploaders.Local]: Add configuration for custom url path See merge request pleroma/pleroma!318	2018-09-07 23:49:36 +00:00
Martin Kühl	c1d07da4e1	Mastodon API: Fake support for loading filters	2018-09-07 16:12:44 +02:00
Martin Kühl	619f67768a	Mastodon API: Add unsupported attributes to relationship responses ... These attributes are documented as required by the Mastodon API. Since we don’t support them (I think?), respond with default values.	2018-09-07 16:12:44 +02:00
lain	70163aec9b	Add LegacyAuthenticationPlug to router.	2018-09-05 22:31:57 +02:00
lain	44b094908c	Update legacy passwords automatically.	2018-09-05 22:30:14 +02:00
lain	3aba585e7a	Add Plugs to router.	2018-09-05 21:57:56 +02:00
lain	e601165426	Add UserEnabledPlug.	2018-09-05 21:53:53 +02:00
lain	5ce1ebb179	Add SetUserSessionIdPlug.	2018-09-05 21:42:42 +02:00