William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								121c1f6230 
								
							 
						 
						
							
							
								
								twitter api: refactor activity html generation, add support for Articles  
							
							
							
						 
						
							2018-06-27 13:37:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								bd479606ba 
								
							 
						 
						
							
							
								
								utils: make_create_data: add support for Article objects  
							
							
							
						 
						
							2018-06-27 13:37:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								c42f28b82c 
								
							 
						 
						
							
							
								
								transmogrifier: accept Article activities  
							
							
							
						 
						
							2018-06-27 13:37:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								32211c4ada 
								
							 
						 
						
							
							
								
								tests: add default_scope where appropriate  
							
							
							
						 
						
							2018-06-27 13:17:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2f14996d9a 
								
							 
						 
						
							
							
								
								twitter api: allow setting default_scope  
							
							
							
						 
						
							2018-06-27 13:15:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								dcdf7b6686 
								
							 
						 
						
							
							
								
								twitter api: user view: show default message scope if known  
							
							
							
						 
						
							2018-06-27 13:15:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								4f6de34f4f 
								
							 
						 
						
							
							
								
								mastodon api: use info["default_scope"] if available for post scope  
							
							
							
						 
						
							2018-06-27 13:15:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								7c63e70de1 
								
							 
						 
						
							
							
								
								activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:08:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6f4ca7ddf7 
								
							 
						 
						
							
							
								
								ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().  
							
							
							
						 
						
							2018-06-27 13:08:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								5b240c3b18 
								
							 
						 
						
							
							
								
								federator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().  
							
							
							
						 
						
							2018-06-27 13:07:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								bc05548370 
								
							 
						 
						
							
							
								
								ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								49da04c509 
								
							 
						 
						
							
							
								
								common api: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:35 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								15d624e077 
								
							 
						 
						
							
							
								
								activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fb04fecfb4 
								
							 
						 
						
							
							
								
								streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								47189531c5 
								
							 
						 
						
							
							
								
								user: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b036a19c21 
								
							 
						 
						
							
							
								
								activity: add normalize() to find a complete activity given either URI or partial structure  
							
							
							
						 
						
							2018-06-27 13:07:12 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								a200943240 
								
							 
						 
						
							
							
								
								object: add helper functions to handle various forms of a given object and return a normalized one  
							
							
							
						 
						
							2018-06-27 13:06:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								d386e8a825 
								
							 
						 
						
							
							
								
								Merge branch 'features/initial-state_rights' into 'develop'  
							
							... 
							
							
							
							[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
See merge request pleroma/pleroma!236  
							
						 
						
							2018-06-27 12:48:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								dc8ace29d1 
								
							 
						 
						
							
							
								
								use the correct end file  
							
							
							
						 
						
							2018-06-26 15:09:45 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								ca63585a32 
								
							 
						 
						
							
							
								
								maybe I should learn proper elixir ;D  
							
							
							
						 
						
							2018-06-26 14:35:35 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								2df0fd1462 
								
							 
						 
						
							
							
								
								mogrify mix.lock  
							
							
							
						 
						
							2018-06-26 14:16:28 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								d8d43f1173 
								
							 
						 
						
							
							
								
								do the filtering  
							
							
							
						 
						
							2018-06-26 14:03:23 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								c67cf8e9af 
								
							 
						 
						
							
							
								
								format...  
							
							
							
						 
						
							2018-06-26 13:49:57 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								cb21bf5fc2 
								
							 
						 
						
							
							
								
								filter exif data  #187  
							
							
							
						 
						
							2018-06-26 13:45:47 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								beb940a57e 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state  
							
							... 
							
							
							
							Related to https://git.pleroma.social/pleroma/mastofe/issues/20  
							
						 
						
							2018-06-26 20:48:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								fc012491a5 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mutes.json-emptyarray' into 'develop'  
							
							... 
							
							
							
							Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234  
							
						 
						
							2018-06-25 08:45:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc96f222c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/configurable-blocks' into 'develop'  
							
							... 
							
							
							
							Add more configurability to how blocks work
See merge request pleroma/pleroma!203  
							
						 
						
							2018-06-25 06:12:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea214b8ba6 
								
							 
						 
						
							
							
								
								combined outgoing_blocks with statement  
							
							
							
						 
						
							2018-06-24 23:05:44 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								6160a1b3c0 
								
							 
						 
						
							
							
								
								mix format  
							
							
							
						 
						
							2018-06-24 15:24:41 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								92135d00fc 
								
							 
						 
						
							
							
								
								Merge branch 'feature/application-xml-mime' into 'develop'  
							
							... 
							
							
							
							config: add application/xml mimetype support.
See merge request pleroma/pleroma!228  
							
						 
						
							2018-06-24 13:28:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								c3002c583e 
								
							 
						 
						
							
							
								
								Merge branch 'features/glitch-soc-frontend' into 'develop'  
							
							... 
							
							
							
							Empty 2.4.x endpoints and ``api/v2/search``
See merge request pleroma/pleroma!214  
							
						 
						
							2018-06-24 13:17:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								1299bccc7d 
								
							 
						 
						
							
							
								
								return unquoted empty array from /api/qvitter/mutes.json  
							
							
							
						 
						
							2018-06-23 23:20:30 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								6316003946 
								
							 
						 
						
							
							
								
								fixes- found that TwitterAPI.Controller adds .json suffix already  
							
							
							
						 
						
							2018-06-23 23:05:54 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Vivian Lim 
								
							 
						 
						
							
							
							
							
								
							
							
								f2badd4424 
								
							 
						 
						
							
							
								
								return empty array for api/qvitter/mutes.json queries instead of html  
							
							
							
						 
						
							2018-06-23 22:21:39 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4038ede07 
								
							 
						 
						
							
							
								
								fix mind-crushingly dumb syntax error  
							
							
							
						 
						
							2018-06-23 14:32:00 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4990283de 
								
							 
						 
						
							
							
								
								change moved attributes into normal variables  
							
							
							
						 
						
							2018-06-23 14:27:07 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									squidboi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e099fcfa9 
								
							 
						 
						
							
							
								
								move configurable module attributes into relevant functions  
							
							
							
						 
						
							2018-06-23 14:16:08 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a4a45b875 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars  
							
							
							
						 
						
							2018-06-23 16:22:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a05c0ff61d 
								
							 
						 
						
							
							
								
								[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search  
							
							
							
						 
						
							2018-06-23 16:22:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								359093d73b 
								
							 
						 
						
							
							
								
								Fake 2.4.0 API  
							
							
							
						 
						
							2018-06-23 16:12:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c45133377a 
								
							 
						 
						
							
							
								
								lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format  
							
							... 
							
							
							
							Hnng! 
							
						 
						
							2018-06-23 16:12:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								082920044a 
								
							 
						 
						
							
							
								
								Normalize file extension for uploaded files  
							
							
							
						 
						
							2018-06-21 14:04:12 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								ad28854f47 
								
							 
						 
						
							
							
								
								Merge branch 'feature/mrf-simple-accept-lists' into 'develop'  
							
							... 
							
							
							
							mrf simple: add accept lists
See merge request pleroma/pleroma!231  
							
						 
						
							2018-06-21 07:09:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								60d6038be5 
								
							 
						 
						
							
							
								
								mrf simple: add accept lists  
							
							... 
							
							
							
							accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space. 
							
						 
						
							2018-06-19 21:28:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								90cf75f4a7 
								
							 
						 
						
							
							
								
								Merge branch 'features/column_media_streaming' into 'develop'  
							
							... 
							
							
							
							Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225  
							
						 
						
							2018-06-19 09:50:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								be800d7936 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/block-follow-relationships' into 'develop'  
							
							... 
							
							
							
							fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230  
							
						 
						
							2018-06-19 09:42:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								590e8d5555 
								
							 
						 
						
							
							
								
								tests: fix a completely bogus mastodon api test  
							
							
							
						 
						
							2018-06-19 08:53:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								056305dfa7 
								
							 
						 
						
							
							
								
								user: add helper function to fetch a user given only an ap_id (fix tests)  
							
							
							
						 
						
							2018-06-19 08:31:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								db0731b6ac 
								
							 
						 
						
							
							
								
								Merge branch 'feature/exclude-replies-filter' into 'develop'  
							
							... 
							
							
							
							activitypub: support filtering activities by whether or not they are a reply (closes  #109 )
Closes  #109 
See merge request pleroma/pleroma!226  
							
						 
						
							2018-06-19 05:15:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								de80363518 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/as2-contentmap' into 'develop'  
							
							... 
							
							
							
							handle ActivityStreams 2.0 contentMap
See merge request pleroma/pleroma!229  
							
						 
						
							2018-06-19 05:13:00 +00:00