Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						241b965715 
					 
					
						
						
							
							oEmbed CSS file  
						
						
						
						
					 
					
						2016-03-21 03:12:24 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						980085a8a3 
					 
					
						
						
							
							Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes  
						
						... 
						
						
						
						Conflicts:
	plugins/Minify/extlib/minify/README.txt
	plugins/Minify/extlib/minify/UPGRADING.txt
	plugins/Minify/extlib/minify/min/README.txt
	plugins/Minify/extlib/minify/min/builder/index.php
	plugins/Minify/extlib/minify/min/lib/JSMin.php
	plugins/Minify/extlib/minify/min/lib/Minify.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS.php
	plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php
	plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php
	plugins/Minify/extlib/minify/min/lib/Minify/Packer.php
	plugins/Recaptcha/RecaptchaPlugin.php 
						
						
					 
					
						2016-03-21 03:10:19 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						50a10cf161 
					 
					
						
						
							
							Minify is evil.  
						
						
						
						
					 
					
						2016-03-21 03:02:22 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b7c4c960e2 
					 
					
						
						
							
							Don't use default_port for irc schemes  
						
						
						
						
					 
					
						2016-03-21 02:48:37 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e64c3a1d87 
					 
					
						
						
							
							irc and ircs schemes for HTMLPurifier  
						
						
						
						
					 
					
						2016-03-21 02:46:28 +01:00 
						 
				 
			
				
					
						
							
							
								Bob Mottram 
							
						 
					 
					
						
						
							
						
						11c57e7aee 
					 
					
						
						
							
							Remove Google References  
						
						... 
						
						
						
						This removes most references to Google, with some
remaining since they may point to things which are still
relevant. References to Google Code, Google Buzz and
Google Maps have been removed 
						
						
					 
					
						2016-03-20 13:06:58 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						365f3d2aa5 
					 
					
						
						
							
							Full-content oEmbed html doesn't take up all space (and renders properly)  
						
						
						
						
					 
					
						2016-03-17 12:58:40 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						102f7ab059 
					 
					
						
						
							
							oEmbed neatifying (inspired by Qvitter)  
						
						
						
						
					 
					
						2016-03-17 00:31:45 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b2cfbded2e 
					 
					
						
						
							
							Upgrading from 1.1.x would make uri fields have length=255  
						
						
						
						
					 
					
						2016-03-15 16:54:10 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f4833c6c91 
					 
					
						
						
							
							More verbose salmon debugging  
						
						
						
						
					 
					
						2016-03-15 16:53:19 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f32414dd93 
					 
					
						
						
							
							Upgrading from 1.1.x would make uri fields have length=255  
						
						
						
						
					 
					
						2016-03-15 16:52:57 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						5ca2a28246 
					 
					
						
						
							
							Make oEmbed handle our http/https setting better.  
						
						
						
						
					 
					
						2016-03-10 14:20:21 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						265fa12917 
					 
					
						
						
							
							Relatively experimental change to store thumbnails in 'file/thumb/' (by default)  
						
						
						
						
					 
					
						2016-03-07 22:33:34 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						41b64cb8a3 
					 
					
						
						
							
							static function declaration  
						
						
						
						
					 
					
						2016-03-07 20:09:15 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6ec72b2978 
					 
					
						
						
							
							Move mail_confirm_address out of mail.php  
						
						
						
						
					 
					
						2016-03-06 17:27:40 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e9516ea4dd 
					 
					
						
						
							
							Allow gopher: scheme in link href  
						
						
						
						
					 
					
						2016-03-06 03:39:34 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						a9bdf761e8 
					 
					
						
						
							
							Merge branch 'remote-media-blacklist-mk2' into 'nightly'  
						
						... 
						
						
						
						add server blacklist to StoreRemoteMedia plugin
allows server admins to block local storage of remote media from particular servers while still allowing a default policy of acceptance
See merge request !114  
						
						
					 
					
						2016-03-03 20:17:23 +00:00 
						 
				 
			
				
					
						
							
							
								Saul St John 
							
						 
					 
					
						
						
							
						
						30e70c4697 
					 
					
						
						
							
							update readme  
						
						
						
						
					 
					
						2016-03-02 16:05:40 +00:00 
						 
				 
			
				
					
						
							
							
								Saul St John 
							
						 
					 
					
						
						
							
						
						43754c7f17 
					 
					
						
						
							
							add blacklist to StoreRemoteMedia plugin  
						
						
						
						
					 
					
						2016-03-02 15:41:17 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						a262c16f06 
					 
					
						
						
							
							Catch exception on delete of Confirm_address in a plugin  
						
						
						
						
					 
					
						2016-03-02 15:37:47 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e4e0a39dad 
					 
					
						
						
							
							Only OStatus distribute if profile hasRight to PUBLICNOTICE  
						
						
						
						
					 
					
						2016-03-02 12:42:09 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b4271a3533 
					 
					
						
						
							
							Stricted typing + protected on FilteringNoticeStream->filter  
						
						
						
						
					 
					
						2016-03-02 11:40:43 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						9a89990293 
					 
					
						
						
							
							Some changes since getFancyName() is longer with full acct: URI  
						
						
						
						
					 
					
						2016-03-02 00:13:28 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						63c087a255 
					 
					
						
						
							
							Consistent behaviour for ScopingNoticeStream $scoped  
						
						... 
						
						
						
						We don't guess the current profile anymore if the value of the profile === -1
Also sets $this->scoped for all ScopingNoticeStream inheritors, which just
like in an Action can be null if we're not scoped in any way (logged in). 
						
						
					 
					
						2016-03-01 14:51:47 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						b9a11f8c21 
					 
					
						
						
							
							Merge branch 'fix-author-fallback' into 'nightly'  
						
						... 
						
						
						
						Fix author fallback
Previously if there was no discernable author the nickname "Array"
would end up used.  This was a bug, obviously.  It is fixed now.
See merge request !111  
						
						
					 
					
						2016-02-28 18:42:36 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						9dc4f13579 
					 
					
						
						
							
							Fix author fallback  
						
						... 
						
						
						
						Previously if there was no discernable author the nickname "Array"
would end up used.  This was a bug, obviously.  It is fixed now. 
						
						
					 
					
						2016-02-26 22:06:04 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						12f1707a74 
					 
					
						
						
							
							Ostatus_source filled no purpose whatsoever  
						
						
						
						
					 
					
						2016-02-26 22:37:26 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b4dc060d75 
					 
					
						
						
							
							Don't auto-silence other users by IP by default  
						
						
						
						
					 
					
						2016-02-26 16:10:03 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						dc51354316 
					 
					
						
						
							
							Merge branch 'readme-plugins' into 'nightly'  
						
						... 
						
						
						
						Readme plugins
* Adds several plugin READMEs
  They are pretty basic, but it's a start.
* Changes status.net/wiki URLs to git.gnu.io
  The status.net wiki is dead.
See merge request !103  
						
						
					 
					
						2016-02-26 12:32:42 +00:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						d500fb8598 
					 
					
						
						
							
							Merge branch 'remove-openid' into 'nightly'  
						
						... 
						
						
						
						Fix: Cannot remove OpenID
OpenidsettingsAction::removeOpenID() was comparing and int with a string
so always displayed "That OpenID does not belong to you."
See merge request !107  
						
						
					 
					
						2016-02-26 12:30:01 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4d17d95335 
					 
					
						
						
							
							Try to get mime data before hashing (cpu intensive)  
						
						
						
						
					 
					
						2016-02-25 22:31:45 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						80f7a5f025 
					 
					
						
						
							
							$metadata->thumbnail_url is not guaranteed to be set  
						
						... 
						
						
						
						We should probably have a separate class for this, so we can more
easily combine different technologies similar to oEmbed/OpenGraph. 
						
						
					 
					
						2016-02-25 19:47:16 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4239c952d2 
					 
					
						
						
							
							$metadata->thumbnail_url is not guaranteed to be set  
						
						... 
						
						
						
						We should probably have a separate class for this, so we can more
easily combine different technologies similar to oEmbed/OpenGraph. 
						
						
					 
					
						2016-02-25 19:46:17 +01:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						99f2aba6e1 
					 
					
						
						
							
							Fix: Cannot remove OpenID  
						
						... 
						
						
						
						OpenidsettingsAction::removeOpenID() was comparing and int with a string
so always displayed "That OpenID does not belong to you." 
						
						
					 
					
						2016-02-24 12:42:41 -05:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e6f07d8554 
					 
					
						
						
							
							Use in_array instead. Now we get third party responses to contextually interesting threads  
						
						... 
						
						
						
						I think this solves much of the "third party conversation" issues, assuming involved parties
are using modern GNU social instances. 
						
						
					 
					
						2016-02-24 00:19:27 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						31c9b2c1d8 
					 
					
						
						
							
							Check the notice context for users in UsersalmonAction  
						
						
						
						
					 
					
						2016-02-23 23:56:43 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						9319033ff0 
					 
					
						
						
							
							Properly attach activityobjects  
						
						... 
						
						
						
						For some reason they were written to ->object, which is incorrect as
we use the objects[] array (which usually just holds one entry though) 
						
						
					 
					
						2016-02-23 23:50:57 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						0eb5122817 
					 
					
						
						
							
							Check that the user is in the context of a salmon slap  
						
						
						
						
					 
					
						2016-02-23 23:42:41 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						d672547112 
					 
					
						
						
							
							getAliases should be only a list (numeric array)  
						
						
						
						
					 
					
						2016-02-23 14:33:09 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e16f7d04a8 
					 
					
						
						
							
							Let OpenID match against aliases (fix fancyurl stuff etc.)  
						
						
						
						
					 
					
						2016-02-23 14:15:08 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b59dacb806 
					 
					
						
						
							
							getAliases for Profile and Notice  
						
						... 
						
						
						
						Also move fancyurlfix into site-wide $config['fix']['fancyurls']
TODO: getByUri should make use of this directly I guess? 
						
						
					 
					
						2016-02-23 14:00:59 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						c67b89e56b 
					 
					
						
						
							
							Make WebFinger fancyurlfix configurable  
						
						
						
						
					 
					
						2016-02-21 20:05:32 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						ce803f6d06 
					 
					
						
						
							
							WebFinger aliases with 'index.php/'  
						
						
						
						
					 
					
						2016-02-21 20:00:07 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						1edb1bbc17 
					 
					
						
						
							
							Claim that we are the URL without index.php/ in webfinger response  
						
						
						
						
					 
					
						2016-02-21 19:09:39 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						0c17c32267 
					 
					
						
						
							
							Let the WebFingerPlugin lookup profile resources with index.php/ too  
						
						
						
						
					 
					
						2016-02-21 18:48:48 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b23cc7465f 
					 
					
						
						
							
							Keep a unique set of WebFingerResource aliases  
						
						
						
						
					 
					
						2016-02-21 18:47:32 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						ade4518ae4 
					 
					
						
						
							
							Make the Link header give URI for WebFinger lookup  
						
						
						
						
					 
					
						2016-02-17 22:36:33 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						422d475e44 
					 
					
						
						
							
							Differentiate two similar log warning messages  
						
						
						
						
					 
					
						2016-02-17 21:57:52 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e2a090c9cc 
					 
					
						
						
							
							Use NoticeStream::filterVerbs for filtering in noticestreams  
						
						
						
						
					 
					
						2016-02-14 20:46:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						fbcca62ae1 
					 
					
						
						
							
							listGet was not meant for that really  
						
						
						
						
					 
					
						2016-02-13 01:19:47 +01:00