| 
								
								
									 stwf | 51bdf0cab6 | use default child_specs | 2019-08-14 11:55:17 -04: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 |  | 
				
					
						| 
								
								
									 kaniini | c3a54cc34d | Merge branch 'feature/mrf-describe' into 'develop' MRF describe API
See merge request pleroma/pleroma!1561 | 2019-08-13 22:46:19 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 83a3de8cc4 | Merge branch 'length-limit-bio' into 'develop' Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515 | 2019-08-13 22:40:13 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 4244e17de0 | fix credo | 2019-08-13 22:36:24 +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 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 7089400675 | test: add mock MRF module for describe() testing | 2019-08-13 21:29: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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Maksim | 11d08c2de0 | tests for Pleroma.Uploaders | 2019-08-10 18:46:26 +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 |  | 
				
					
						| 
								
								
									 Maksim | bb9c539580 | Uploader.S3 added support stream uploads | 2019-08-10 11:27:59 +00: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 | 29807ef6a5 | Merge branch 'feature/digest-email' into 'develop' Feature/digest email
See merge request pleroma/pleroma!1078 | 2019-08-08 14:38:33 +00: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 |  | 
				
					
						| 
								
								
									 Eugenij | 96028cd585 | Remove Reply-To from report emails | 2019-08-04 22:24:50 +00: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 |  | 
				
					
						| 
								
								
									 feld | d93d777915 | Fix/mediaproxy whitelist base url | 2019-08-02 17:07:09 +00:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 9d4f34fbcb | Merge branch 'develop' into feature/digest-email | 2019-08-02 18:16:04 +03:00 |  | 
				
					
						| 
								
								
									 lain | 5ff8f07ca9 | Merge branch 'feature/hide-follows-remote' into 'develop' Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411 | 2019-08-02 11:23:07 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | f98235f2ad | Clean up tests output | 2019-08-01 16:33:36 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 9ca4506355 | Add configurable length limits for User.bioandUser.name | 2019-08-01 15:53:37 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | 6c06529cd4 | Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop' Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512 | 2019-07-31 19:13:56 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 813c686dd7 | Disallow following locked accounts over OStatus | 2019-07-31 22:05:12 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | 6eb33e7303 | test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id | 2019-07-31 18:35:15 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | f72e0b7cad | ostatus: explicitly disallow protocol downgrade from activitypub This closes embargoed bug #1135. | 2019-07-31 18:17:31 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 301ea0dc04 | Add tests for counters being updated on follow | 2019-07-31 21:09:13 +03:00 |  | 
				
					
						| 
								
								
									 Maksim | 58443d0cd6 | tests for TwitterApi/UtilController | 2019-07-31 15:14:36 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | c88a5d3251 | Merge branch 'develop' into feature/hide-follows-remote | 2019-07-31 14:12:29 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 51b3b6d816 | Admin changes | 2019-07-30 16:36:05 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 5835069215 | Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" This reverts merge request !1504 | 2019-07-29 19:42:26 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 5795a890e9 | markdown: clean up html generated by earmark | 2019-07-29 19:09:58 +00:00 |  | 
				
					
						| 
								
								
									 lain | 1dfde4151c | Merge branch 'refactor/use-constants' into 'develop' refactoring: begin to use constants
See merge request pleroma/pleroma!1500 | 2019-07-29 16:30:47 +00:00 |  | 
				
					
						| 
								
								
									 Sergey Suprunenko | c0e258cf21 | Redirect not logged-in users to the MastoFE login page on private instances | 2019-07-29 16:17:22 +00:00 |  | 
				
					
						| 
								
								
									 Maksim | 159bbec570 | added tests for OstatusController | 2019-07-29 05:02:20 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | b93498eb52 | constants: add as_public constant and use it everywhere | 2019-07-29 02:43:19 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 492d854e7a | transmogrifier: use User.delete() instead of handrolled user deletion code for remote users Closes #1104 | 2019-07-28 21:32:04 +00:00 |  | 
				
					
						| 
								
								
									 Sachin Joshi | 242f5c585e | add account confirmation email resend in mastodon api | 2019-07-28 20:30:10 +00:00 |  |