| 
								
								
									 Maksim Pechnikov | 85bd8a4e31 | fixed clear config after test | 2019-08-21 21:24:35 +03:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 76bb3572dd | test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1 | 2019-08-20 20:20:12 +00:00 |  | 
				
					
						| 
								
								
									 lain | ef43016b2c | Merge branch 'feature/custom-fields' into 'develop' Add custom profile fields
See merge request pleroma/pleroma!1488 | 2019-08-20 12:44:14 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 75a5dd41ee | Add more tests for Database tasks and DigestEmailWorker | 2019-08-19 16:10:00 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | a320358703 | added test helpers to clear config after tests | 2019-08-19 15:34:29 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | a2fdc32368 | tests: activitypub: fix typo | 2019-08-18 22:31:59 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 18c8c8d176 | Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop' Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575 | 2019-08-18 21:57:55 +00:00 |  | 
				
					
						| 
								
								
									 lain | 7ab2dbbdb6 | Merge branch 'pleroma-conversations' into 'develop' Extended Pleroma Conversations
See merge request pleroma/pleroma!1535 | 2019-08-16 12:55:33 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | a4a3e3becd | Hide muted theads from home/public timelines unless with_mutedis set | 2019-08-15 17:37:30 +03:00 |  | 
				
					
						| 
								
								
									 stwf | d81f63845a | Implement Pleroma.Stats as GenServer | 2019-08-14 11:59:33 -04:00 |  | 
				
					
						| 
								
								
									 lain | 560dbad538 | Merge remote-tracking branch 'origin/develop' into pleroma-conversations | 2019-08-14 15:30:40 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e457fcc479 | Add :max_remote_account_fieldsconfig option | 2019-08-14 14:58:06 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | f7bbf99caa | Use info.fields instead of source_data for remote users | 2019-08-14 14:52:54 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 2c35d4b0b0 | Add configurable account field name length limit | 2019-08-14 14:52:54 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | db3c05f6b4 | Add configurable account field value length limit | 2019-08-14 14:52:54 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 7d6f8a7fd7 | Linkify custom fields values in ActivityPub.UserViewx | 2019-08-14 14:52:54 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 5178f960c3 | Support user attachment update in Transmogrifier | 2019-08-14 14:52:54 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 88598c9baf | Add profile custom fields to ActivityPub.UserView | 2019-08-14 14:52:54 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | d6094b405d | Fix tests | 2019-08-14 14:52:54 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e0ac5c7a66 | Add custom profile fields | 2019-08-14 14:52:54 +07:00 |  | 
				
					
						| 
								
								
									 rinpatch | 9ef31767f2 | Merge branch 'feature/mrf-vocabulary' into 'develop' MRF Vocabulary
See merge request pleroma/pleroma!1559 | 2019-08-13 22:51:15 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 10fef2fcee | tests: fix up nodeinfo tests | 2019-08-13 22:32:40 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | dd0b71ea6d | tests: add tests for MRF.describe() | 2019-08-13 22:19:15 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | fea4d89e9f | tests for Web/ActivityPub/Relay | 2019-08-13 21:12:59 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | 04da1166db | tests for /web/mastodon_api/mastodon_api.ex | 2019-08-13 21:12:37 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | f7e3b7ff75 | tests: add tests for mrf_vocabulary | 2019-08-13 20:55:42 +00:00 |  | 
				
					
						| 
								
								
									 lain | 511ccea5aa | ConversationView: Align parameter names with other views. | 2019-08-12 14:23:06 +02:00 |  | 
				
					
						| 
								
								
									 lain | 60231ec7bd | Conversation: Add endpoint to get a conversation by id. | 2019-08-12 13:58:04 +02:00 |  | 
				
					
						| 
								
								
									 lain | 23c46f7e72 | Conversations: Use 'recipients' for accounts in conversation view. According to gargron, this is the intended usage. | 2019-08-12 12:51:08 +02:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 9cfc289594 | MRF: ensure that subdomain_match calls are case-insensitive | 2019-08-10 21:19:26 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 84808e1697 | Merge branch 'develop' into 'fix/hide-follows-counters' # Conflicts:
#   CHANGELOG.md | 2019-08-10 18:49:04 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | af4cf35e20 | Strip internal fields including likes from incoming and outgoing activities | 2019-08-10 18:47:40 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 0802a08871 | Mastodon API: Fix thread mute detection It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one. | 2019-08-10 16:27:46 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 409bcad54b | Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency. | 2019-08-09 16:53:55 +03:00 |  | 
				
					
						| 
								
								
									 lain | a2b98f6d58 | Merge remote-tracking branch 'origin/develop' into pleroma-conversations | 2019-08-08 16:04:20 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn | aa718ab8f6 | Merge branch 'fix/object-reembeds' into 'develop' Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538 | 2019-08-06 22:14:00 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5329e84d62 | OStatus tests: stop relying on embedded objects | 2019-08-07 00:58:48 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 32018a4ee0 | ActivityPub tests: remove assertions of embedded object being updated, because the objects are no longer supposed to be embedded | 2019-08-07 00:36:13 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | 139b196bc0 | [#1150] fixed parser TwitterCard | 2019-08-06 20:19:28 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | bdc9a7222c | tests for CommonApi/Utils | 2019-08-05 15:37:05 +00:00 |  | 
				
					
						| 
								
								
									 lain | d6fe220e32 | Linting. | 2019-08-05 16:11:23 +02:00 |  | 
				
					
						| 
								
								
									 lain | b64b6fee2a | CommonAPI: Replies to conversations also get the correct context id. | 2019-08-05 15:33:22 +02:00 |  | 
				
					
						| 
								
								
									 lain | 3af6d14da7 | Pleroma Conversations API: Add a way to set recipients. | 2019-08-05 15:09:19 +02:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | e8ad116c2a | Do not add the "next" key to likes.json if there is no more items | 2019-08-04 17:13:06 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | de0f3b73dd | Admin fixes | 2019-08-03 18:16:09 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 040347b248 | Remove spaces from the domain search | 2019-08-03 18:13:20 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | 8b2fa31fed | Handle MRF rejections of incoming AP activities | 2019-08-03 18:12:38 +00:00 |  | 
				
					
						| 
								
								
									 lain | eee98aaa73 | Pleroma API: Add endpoint to get conversation statuses. | 2019-08-02 19:53:08 +02:00 |  | 
				
					
						| 
								
								
									 feld | d93d777915 | Fix/mediaproxy whitelist base url | 2019-08-02 17:07:09 +00:00 |  | 
				
					
						| 
								
								
									 lain | 56b1c3af13 | CommonAPI: Extend api with conversation replies. | 2019-08-02 15:05:27 +02:00 |  |