93 commits

Author	SHA1	Message	Date
Egor Kislitsyn	e82e73478e	Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists	2019-05-14 19:00:07 +07:00
Egor Kislitsyn	23276e8d68	Use pseudo ap id of a list in BCC	2019-05-13 16:15:14 +07:00
Haelwenn (lanodan) Monnier	2f76a40d02	formatter.ex: Add get_emoji_map/1	2019-05-03 16:27:50 +02:00
Egor Kislitsyn	a3dc02d282	Add addressable lists	2019-05-01 16:11:17 +07:00
rinpatch	c3e9fcf098	Fix bookmarks depending on embeded object and move checking if the ... status is bookmarked to SQL	2019-04-27 23:06:46 +03:00
Egor	b9cdf6d3b9	Use User.get_cached* everywhere	2019-04-22 07:20:43 +00:00
rinpatch	b09ae02c04	Added some more normalization calls all in mastodon api controller	2019-04-17 13:04:58 +03:00
rinpatch	462028688b	Fix pinned posts relying on embded objects	2019-04-17 12:34:19 +03:00
rinpatch	627e5a0a49	Merge branch 'develop' into feature/database-compaction	2019-04-17 12:22:32 +03:00
Alex S	7410aee886	Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	2019-04-06 20:34:00 +07:00
rinpatch	79cb34a4b0	Fix preview not being usable in form data	2019-04-02 23:07:16 +03:00
rinpatch	fdb4357e9b	Rename fake param to preview and make the tests check that the object was not inserted to the db	2019-04-02 14:31:18 +03:00
Alex S	3601f03147	Adding tag to emoji ets table ... changes in apis	2019-04-01 17:17:57 +07:00
rinpatch	1bb4d5d65b	Implement fake status submit	2019-03-29 21:59:04 +03:00
William Pitcock	a6973a668e	formatting	2019-03-23 00:28:16 +00:00
William Pitcock	e75e43b949	common api: use the optimized Object.normalize whenever possible	2019-03-23 00:22:14 +00:00
lain	8468f3f6d4	Add safe dm mode option.	2019-03-20 21:09:36 +01:00
kaniini	6d6f48d079	Merge branch 'feature/federated-flags' into 'develop' ... Federated reports See merge request pleroma/pleroma!935	2019-03-16 19:27:56 +00:00
Karen Konou	da53c079db	Refactor to store user ap_id, add tests	2019-03-15 14:20:08 +01:00
Karen Konou	c8f31e0bc2	Implement mastodon's reblog hiding feature	2019-03-15 14:18:21 +01:00
William Pitcock	5c7b774f09	reports: unify sending e-mail for both remote and local reports	2019-03-14 19:44:08 +00:00
William Pitcock	3b48d5f0c2	common api: add support for forwarding reports	2019-03-14 19:29:33 +00:00
eugenijm	e416c344dd	Unify unfollow, accept and reject follow requests using CommonAPI	2019-03-13 20:28:36 +03:00
Haelwenn (lanodan) Monnier	c3d41b2b6e	[Credo] make all variables use snake_case	2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier	a3a9cec483	[Credo] fix Credo.Check.Readability.AliasOrder	2019-03-13 04:26:54 +01:00
eugenijm	2827dfea50	Allow an admin to delete a user status	2019-03-08 20:21:56 +03:00
eugenijm	594694607c	Unify Mastodon and Twitter follow implementations using CommonAPI	2019-03-04 01:00:37 +03:00
Egor	c3ac9424d2	AutoLinker	2019-02-26 23:32:26 +00:00
Egor	bff9eb5ef7	Reports	2019-02-20 16:51:25 +00:00
Wim Vanderbauwhede	04b1c13554	Merge remote-tracking branch 'upstream/develop' into patch-image-description	2019-02-14 16:41:40 +00:00
Karen Konou	ac72b578da	Merge branch 'develop' into feature/thread-muting	2019-02-11 12:10:49 +01:00
Karen Konou	c01ef574c1	Refactor as per Rin's suggestions, add endpoint tests	2019-02-11 12:04:02 +01:00
Haelwenn (lanodan) Monnier	6a6a5b3251	de-group alias/es	2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier	60ea29dfe6	Credo fixes: alias grouping/ordering	2019-02-09 14:59:20 +01:00
William Pitcock	9adc80afff	common api: set directMessage flag on our own posts	2019-01-20 02:27:48 +00: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
Mark Felder	8c368d42a2	Make attachment links configurable ... Thanks @href!	2019-01-17 15:48:14 +00:00
Egor Kislitsyn	b594a54d0c	unpin when deleting a status	2019-01-11 12:31:31 +07:00
Egor Kislitsyn	1b06e6fdf3	only non-reblogs, self-authored, public statuses can be pinned	2019-01-09 17:40:15 +07:00
Egor Kislitsyn	380e9fba21	add pinned posts	2019-01-07 20:45:33 +07: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
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
William Pitcock	980b5288ed	update copyright years to 2019	2018-12-31 15:41:47 +00:00
Maxim Filippov	be70272ab0	Treat only true and "true" as true	2018-12-27 13:21:04 +03:00
William Pitcock	2791ce9a1f	add license boilerplate to pleroma core	2018-12-23 20:56:42 +00:00
eal	1ca080c862	Prevent accidental double RTs or favorites	2018-12-14 07:56:49 +02:00
William Pitcock	d6e65f9304	common api: fix up improper Object.normalize() calls	2018-12-04 04:52:09 +00:00