rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								03ad31328c
								
							
						 | 
						
							
							
								
								OStatus Announce Representer: Do not depend on the object being embedded
							
							
							
							
							
							
							
							in the Create activity 
							
						 | 
						
							2019-08-07 00:23:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								73d8d5c49f
								
							
						 | 
						
							
							
								
								Stop depending on the embedded object in restrict_favorited_by
							
							
							
							
							
						 | 
						
							2019-08-07 00:12:42 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a035ab8c1d
								
							
						 | 
						
							
							
								
								templates/layout/app.html.eex: Style anchors
							
							
							
							
							
							
							
							[ci skip] 
							
						 | 
						
							2019-08-03 23:18:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								86fffe9c27
								
							
						 | 
						
							
							
								
								Merge branch 'patch-2' into 'develop'
							
							
							
							
							
							
							
							Add preferredUsername to service actors so Mastodon can resolve them
See merge request pleroma/pleroma!1526 
							
						 | 
						
							2019-08-03 18:55:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								1fce56c7df
								
							
						 | 
						
							
							
								
								Refactor
							
							
							
							
							
						 | 
						
							2019-08-03 18:37:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								16cfb89240
								
							
						 | 
						
							
							
								
								Only add preferredUsername to service actor json when the underlying user actually has a username
							
							
							
							
							
						 | 
						
							2019-08-03 18:28:08 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								a187dbb326
								
							
						 | 
						
							
							
								
								Add preferredUsername to service actors so Mastodon can resolve them
							
							
							
							
							
						 | 
						
							2019-08-03 17:24:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								d93d777915
								
							
						 | 
						
							
							
								
								Fix/mediaproxy whitelist base url
							
							
							
							
							
						 | 
						
							2019-08-02 17:07:09 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
							
							
								
							
							
								f42719506c
								
							
						 | 
						
							
							
								
								Fix credo issues
							
							
							
							
							
						 | 
						
							2019-07-31 14:20:34 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								3850812503
								
							
						 | 
						
							
							
								
								twitter api: utils: rework do_remote_follow() to use CommonAPI
							
							
							
							
							
							
							
							Closes #1138 
							
						 | 
						
							2019-07-29 20:00:57 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugenij
								
							 
						 | 
						
							
							
							
							
								
							
							
								0bee2131ce
								
							
						 | 
						
							
							
								
								Add mailerEnabled to the NodeInfo metadata
							
							
							
							
							
						 | 
						
							2019-07-29 16:17:40 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a4b8b2681
								
							
						 | 
						
							
							
								
								fixed User.update_and_set_cache for stale user
							
							
							
							
							
						 | 
						
							2019-07-28 20:29:26 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								488c06b6f5
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'develop'
							
							
							
							
							
							
							
							Fix HTTP sig tweak on KeyId
See merge request pleroma/pleroma!1496 
							
						 | 
						
							2019-07-28 20:25:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								02dc651828
								
							
						 | 
						
							
							
								
								Handle 303 redirects
							
							
							
							
							
						 | 
						
							2019-07-28 20:24:39 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Sileo
								
							 
						 | 
						
							
							
							
							
								
							
							
								961e778531
								
							
						 | 
						
							
							
								
								Fix HTTP sig tweak on KeyId
							
							
							
							
							
						 | 
						
							2019-07-28 14:17:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b77a88365
								
							
						 | 
						
							
							
								
								[#1097] added redirect: /pleroma/admin -> /pleroma/admin/
							
							
							
							
							
						 | 
						
							2019-07-26 20:27:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								41e0304757
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/hide-follows-remote
							
							
							
							
							
						 | 
						
							2019-07-25 18:43:30 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								19835be067
								
							
						 | 
						
							
							
								
								Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
							
							
							
							
							
							
							
							Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472 
							
						 | 
						
							2019-07-24 19:29:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								b20020da16
								
							
						 | 
						
							
							
								
								Show the url advertised in the Activity in the Status JSON response
							
							
							
							
							
						 | 
						
							2019-07-24 19:28:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								84fca14c3c
								
							
						 | 
						
							
							
								
								Do not prepend /media/ when using base_url
							
							
							
							
							
							
							
							This ensures admin has full control over the path where media resides. 
							
						 | 
						
							2019-07-24 15:35:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kPherox
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ac27b94ffa
								
							
						 | 
						
							
							
								
								Change to not require magic-public-key on WebFinger
							
							
							
							
							
						 | 
						
							2019-07-25 00:21:32 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								55341ac717
								
							
						 | 
						
							
							
								
								tests WebFinger
							
							
							
							
							
						 | 
						
							2019-07-24 15:13:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugenij
								
							 
						 | 
						
							
							
							
							
								
							
							
								4504135894
								
							
						 | 
						
							
							
								
								Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)
							
							
							
							
							
						 | 
						
							2019-07-24 15:12:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5d574f4ed
								
							
						 | 
						
							
							
								
								check both item and parent domain blocks
							
							
							
							
							
						 | 
						
							2019-07-24 11:35:16 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								48bd3be9cb
								
							
						 | 
						
							
							
								
								move domain block check to with block
							
							
							
							
							
						 | 
						
							2019-07-24 11:11:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								4af4f6166b
								
							
						 | 
						
							
							
								
								honour domain blocks on streaming notifications
							
							
							
							
							
						 | 
						
							2019-07-24 11:09:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c6357324e
								
							
						 | 
						
							
							
								
								Merge branch 'feature/admin-api-user-statuses' into 'develop'
							
							
							
							
							
							
							
							Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413 
							
						 | 
						
							2019-07-23 23:59:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3bdb8e704
								
							
						 | 
						
							
							
								
								rich media: parser: splice the given URL into the result
							
							
							
							
							
						 | 
						
							2019-07-23 23:51:29 +00:00 | 
						
						
							
							
							
								
							
							
						 |