3163 Commits

Author	SHA1	Message	Date
Roman Chvanikov	2662bea4e0	Add accounts and last_status to conversation read response	2019-04-21 20:26:13 +07:00
Roman Chvanikov	24073f829f	Refactor query to return only 1 message instead of 20	2019-04-21 00:40:41 +07:00
lain	76999c73a7	Conversation: Add accounts to output.	2019-04-15 22:28:42 +02:00
lain	0da985182f	Conversation: Return full status object, id is a string.	2019-04-15 21:58:58 +02:00
lain	c1ebb38d3a	Conversation: Also create participations for remote users. ... Needed to get the participating user list.	2019-04-15 21:45:25 +02:00
lain	d115d2a27e	Conversations: Tidying up.	2019-04-10 18:17:22 +02:00
lain	c352a0aba6	Conversations: Make tests run.	2019-04-10 17:48:31 +02:00
lain	cf353514fe	Participations: Add last activity.	2019-04-10 17:28:02 +02:00
lain	20d9b90760	Participation: Get for a user.	2019-04-10 17:05:33 +02:00
lain	280172f6f6	Conversations: Create or bump on inserting a dm.	2019-04-10 16:33:45 +02:00
lain	64c1c3a407	Participations: Add marking as read and unread.	2019-04-10 15:12:01 +02:00
lain	d1da6b155a	Conversation: Add Conversations and Participations.	2019-04-10 15:01:42 +02:00
lain	a9f805c871	Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations	2019-04-08 14:10:51 +02:00
Egor Kislitsyn	9abf832b03	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 18:48:10 +07:00
lambda	e19590c93f	Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' ... Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019	2019-04-08 11:42:20 +00:00
lambda	fd45cab9ec	Merge branch 'twitter_oauth' into 'develop' ... OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923	2019-04-08 11:41:50 +00:00
Alexander Strizhakov	36c0a10fdf	adding language tag	2019-04-08 11:03:10 +00:00
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' ... Feature/770 add emoji tags See merge request pleroma/pleroma!998	2019-04-08 09:50:00 +00:00
Egor Kislitsyn	c3d5c3513a	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 16:46:59 +07:00
Egor Kislitsyn	a1a854646e	Merge branch 'develop' into use-jobs-in-webpush	2019-04-08 16:29:20 +07:00
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	2019-04-08 12:20:26 +03:00
lambda	b4da2bc1d0	Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' ... # Conflicts: # config/config.exs # docs/config.md	2019-04-08 09:18:01 +00:00
lambda	b177e1e7f3	Merge branch 'scheduled-activities' into 'develop' ... Scheduled activities See merge request pleroma/pleroma!989	2019-04-08 09:08:18 +00:00
Ivan Tashkinov	e3328bc138	[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.	2019-04-07 11:08:37 +03:00
feld	fb2040d061	Merge branch 'fix/deactivated-user-error' into 'develop' ... Return 403 for deactivated user on token request Closes #785 See merge request pleroma/pleroma!1031	2019-04-06 22:19:30 +00:00
eugenijm	2056efa714	Add scheduler for sending scheduled activities to the queue	2019-04-06 23:56:29 +03:00
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	2019-04-06 23:55:58 +03:00
eugenijm	b3870df51f	Handle scheduled_at on status creation.	2019-04-06 23:55:58 +03:00
eugenijm	7bf622ce73	Add scheduled activities	2019-04-06 23:55:58 +03:00
eugenijm	7aa53d52bd	Return 403 on oauth token exchange for a deactivated user	2019-04-06 23:27:55 +03:00
feld	9aeac7dcca	Merge branch 'feature/prometheus' into 'develop' ... Upstream: Metrics and debugging See merge request pleroma/pleroma!1020	2019-04-06 14:51:46 +00:00
Alex S	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
Sergey Suprunenko	325a268017	Redirect to the referer url after mastofe authorization	2019-04-05 23:36:42 +00:00
Mark Felder	b5a2d384f7	Redundant Repo.get_by usage was recently removed from the codebase	2019-04-05 11:41:41 -05:00
Roger Braun	7895ee37fa	Add user following / unfollowing to the admin api.	2019-04-05 11:27:07 -05:00
Egor Kislitsyn	1c2e4f88d1	fix credo	2019-04-05 19:46:28 +07:00
Egor Kislitsyn	f1712cd2f1	Use PleromaJobQueue in Pleroma.Web.Push	2019-04-05 19:38:44 +07:00
rinpatch	f0f30019e1	Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi	2019-04-05 15:19:44 +03:00
Ivan Tashkinov	47a236f753	[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.	2019-04-05 15:12:02 +03:00
Ivan Tashkinov	3e7f2bfc2f	[#923] OAuthController#callback adjustments (with tests).	2019-04-05 09:19:17 +03:00
Ivan Tashkinov	45765918c3	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-04 23:43:08 +03:00
Ivan Tashkinov	f7cd9131d4	[#923] OAuth consumer controller tests. Misc. improvements.	2019-04-04 22:41:03 +03:00
Mark Felder	69038887b2	Code readability tweak	2019-04-04 12:36:57 -05:00
Egor Kislitsyn	0b5c818cb7	[#1] fix telemetry	2019-04-04 11:35:09 -05:00
href	bc3618a38d	Set up telemetry and prometheus	2019-04-04 11:30:43 -05:00
Egor Kislitsyn	cfa6e7289f	Improve Transmogrifier.upgrade_user_from_ap_id/2	2019-04-04 16:10:43 +07:00
Haelwenn (lanodan) Monnier	af0065a71f	mastodon_api_controller.ex: Add pleroma-tan to initial_state	2019-04-04 09:07:25 +02:00
lambda	3f8be270c6	Merge branch 'feature/robotstxt' into 'develop' ... Generate permissive or restrictive robots.txt in the config generator See merge request pleroma/pleroma!1012	2019-04-03 17:31:34 +00:00
Sachin Joshi	cd41584ac4	Generate permissive or restrictive robots.txt in the config generator	2019-04-03 22:12:58 +05:45
rinpatch	79cb34a4b0	Fix preview not being usable in form data	2019-04-02 23:07:16 +03:00