4755 commits

Author	SHA1	Message	Date
feld	ab2ca3038f	Merge branch 'hide-follower-following-count' into 'develop' ... Add a setting to hide follows/followers stats from the user profile See merge request pleroma/pleroma!1663	2019-09-18 21:13:15 +00:00
feld	25b4365656	Merge branch 'admin_api_invite_tokens' into 'develop' ... POST for creating invite tokens in admin api See merge request pleroma/pleroma!1637	2019-09-18 21:11:37 +00:00
Haelwenn	e32d099a3a	Merge branch 'feature/poll-refresh' into 'develop' ... Poll refetching See merge request pleroma/pleroma!1694	2019-09-18 20:58:53 +00:00
rinpatch	5028b7b578	Fix credo issues	2019-09-18 22:09:03 +03:00
rinpatch	c096dd86e5	Do not refetch local objects	2019-09-18 20:01:26 +03:00
rinpatch	eb87a86b5b	Preserve internal fields when reinjecting	2019-09-18 19:53:51 +03:00
rinpatch	d32894ae51	Move object internal fields to a constant	2019-09-18 19:24:20 +03:00
rinpatch	e3f902b3a1	Set updated_at even if the object stayed the same	2019-09-18 19:07:25 +03:00
rinpatch	a9c700ff15	Fix wrong argument order when calling NaiveDateTime.diff	2019-09-18 18:52:33 +03:00
rinpatch	7ef575d11e	Initial poll refresh support ... Implement refreshing the object with an interval and call the function when getting the poll.	2019-09-18 18:13:21 +03:00
Maxim Filippov	384b7dd40d	Fix response	2019-09-18 18:06:49 +03:00
Maxim Filippov	f89728ad95	Merge branch 'develop' into feature/return-link-for-password-reset	2019-09-18 16:44:11 +03:00
Ivan Tashkinov	e4f3d7f69d	Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex	2019-09-18 10:31:10 +00:00
Ivan Tashkinov	551f2fa59e	[#1234] Added changelog entry, removed admin OAuth scopes.	2019-09-18 12:31:33 +03:00
Ivan Tashkinov	c98e761d28	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions	2019-09-18 12:06:38 +03:00
Alex S	a18f1e7cd7	namings	2019-09-18 10:49:14 +03:00
Alex S	2263c8b6b9	little fixes	2019-09-18 10:49:14 +03:00
Alex S	4faf2b1555	post for creating invite tokens in admin api	2019-09-18 10:49:14 +03:00
Haelwenn (lanodan) Monnier	e501c822c9	markdown.ex: put two-spaces before the description-newline	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	4785596a2c	markdown.ex: end suggestions list with a newline ... Otherwise we end up with suggestion on the same level as the childs Markdown is a fuck…	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	d2097fd0f5	markdown.ex: \n\n on >1 suggestions, 2-spaces on one	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	d6182a3c8f	markdown.ex: Make suggestion(s) plural only if on >1	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	c0c5628200	description.exs: remove empty strings on descriptions	2019-09-17 23:05:26 +02:00
Haelwenn (lanodan) Monnier	106afaed58	markdown.ex: do not fail if there is no children	2019-09-17 23:05:26 +02:00
Haelwenn (lanodan) Monnier	e0d8c8897e	docs/markdown.ex: do no print empty suggestions	2019-09-17 23:05:26 +02:00
Ivan Tashkinov	b4d775161c	[#1234] Undone reordering-related changes in router.ex.	2019-09-17 23:24:55 +03:00
Maxim Filippov	f9dd121ad3	Admin API: Return link alongside with token on password reset	2019-09-17 23:09:08 +03:00
Ivan Tashkinov	01c1078015	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex	2019-09-17 22:53:26 +03:00
Haelwenn (lanodan) Monnier	7f211a48e0	docs/markdown.ex: child header as "- key (type): description"	2019-09-17 21:47:32 +02:00
Maksim Pechnikov	0447c42715	Merge branch 'develop' into issue/733	2019-09-17 22:20:39 +03:00
Ivan Tashkinov	76068873db	[#1234] Defined admin OAuth scopes, refined other scopes. Added tests.	2019-09-17 22:19:39 +03:00
rinpatch	ef2e2c5e12	Merge branch 'feature/return-total-for-reports' into 'develop' ... Admin API: Return total for reports See merge request pleroma/pleroma!1628	2019-09-17 19:09:56 +00:00
Maksim Pechnikov	7dd51652f9	Merge branch 'develop' into issue/733	2019-09-17 21:20:08 +03:00
Steven Fuchs	6193157f19	Fix notification warnings	2019-09-17 18:12:27 +00:00
Haelwenn	2301de3d75	Merge branch 'fix/upgrade_user_from_ap_id' into 'develop' ... Fix `Transmogrifier.upgrade_user_from_ap_id/1` See merge request pleroma/pleroma!1677	2019-09-17 17:16:39 +00:00
rinpatch	95a4a19417	Merge branch 'support/tests' into 'develop' ... add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627	2019-09-17 14:47:26 +00:00
Steven Fuchs	80c5c3495b	remove remaining errors from tests	2019-09-17 14:44:52 +00:00
Roman Chvanikov	9fa2586abd	Refactor SubscriptionNotificationView	2019-09-17 17:44:10 +03:00
Roman Chvanikov	e9f69a3eb7	Move pleroma_api controllers into controllers sub-folders	2019-09-17 16:52:23 +03:00
Roman Chvanikov	7d1773bc6b	Rename SubscriptionNotificationController list and get actions to index and show	2019-09-17 16:48:24 +03:00
Roman Chvanikov	a76168e743	Cleanup PleromaAPIController	2019-09-17 16:44:54 +03:00
Roman Chvanikov	a81f80233d	Apply suggestion to lib/pleroma/web/router.ex	2019-09-17 13:43:10 +00:00
Roman Chvanikov	f9be517c7f	Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex	2019-09-17 13:42:40 +00:00
Roman Chvanikov	c0f776faec	Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex	2019-09-17 13:42:36 +00:00
Roman Chvanikov	2688b876ab	Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex	2019-09-17 13:42:28 +00:00
Ivan Tashkinov	e7afb67c5c	[#1260] Rate-limiting for create authentication and related requests.	2019-09-17 16:16:11 +03:00
eugenijm	450bf7a63c	Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)	2019-09-17 14:45:47 +03:00
rinpatch	a21584556f	Update oban to 0.8.1 ... This version uses a different locking mechanism, which gets rid of `WARNING: you don't own a lock of type ShareLock` log spam	2019-09-17 13:04:43 +03:00
Roman Chvanikov	6042e21b25	Move subscription notifications to a separate controller	2019-09-16 21:59:49 +03:00
Roman Chvanikov	56b60798c2	Code style fixes	2019-09-16 20:50:14 +03:00