Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						3166a04cef 
					 
					
						
						
							
							actually respond with the error message in text on Salmon calls  
						
						
						
						
					 
					
						2016-06-25 20:50:00 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						16f4583498 
					 
					
						
						
							
							throw ClientException instead of clientError  
						
						
						
						
					 
					
						2016-06-19 03:38:00 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						a1d064129a 
					 
					
						
						
							
							Handle namespaces for new phpseclib  
						
						
						
						
					 
					
						2016-06-17 23:21:34 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						2759c3f0db 
					 
					
						
						
							
							Debugging output in OStatus for easier reading+greping  
						
						
						
						
					 
					
						2016-03-23 17:52:02 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						8c6d0759c7 
					 
					
						
						
							
							If upgraded from http to https, keep hubsub->topic up to date too (thanks hannes2peer)  
						
						
						
						
					 
					
						2016-03-23 15:37:55 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						14cb2d5398 
					 
					
						
						
							
							Merge branch 'master' into mmn_fixes  
						
						
						
						
					 
					
						2016-03-21 12:27:04 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						afdd6d39ec 
					 
					
						
						
							
							Some Google stuff that need to be there (or comments)  
						
						... 
						
						
						
						Note that these won't be shown to the enduser and will never be accessed automatically.
We should put the salmon-protocol stuff on ostatus.org 
						
						
					 
					
						2016-03-21 12:25:04 +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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						f4833c6c91 
					 
					
						
						
							
							More verbose salmon debugging  
						
						
						
						
					 
					
						2016-03-15 16:53:19 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						31c9b2c1d8 
					 
					
						
						
							
							Check the notice context for users in UsersalmonAction  
						
						
						
						
					 
					
						2016-02-23 23:56:43 +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 
							
						 
					 
					
						
						
							
						
						098c8b1df4 
					 
					
						
						
							
							NoHttpResponseException extends HTTP_Request2_ConnectionException  
						
						
						
						
					 
					
						2016-02-07 01:52:20 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						689e277c62 
					 
					
						
						
							
							Allow @localuser@mysite.example to be looked up as a mention  
						
						
						
						
					 
					
						2016-01-29 16:06:16 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6dc0477c00 
					 
					
						
						
							
							Let the remote side know the Salmon was accepted (sorta)  
						
						
						
						
					 
					
						2016-01-16 22:39:59 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						deda83fdef 
					 
					
						
						
							
							Distinguish notice saving errors from others for Salmon  
						
						
						
						
					 
					
						2016-01-16 22:39:04 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f53ebdeadb 
					 
					
						
						
							
							Start handling salmon entries directly with Notice::saveActivity  
						
						... 
						
						
						
						More to come... 
						
						
					 
					
						2016-01-16 17:25:29 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						2b67b53112 
					 
					
						
						
							
							In very specific circumstances we can bulkDistribute 0 notices  
						
						... 
						
						
						
						Seems to be what caused an infinite loop on quitter.es, or I guess so anyway. 
						
						
					 
					
						2016-01-16 17:18:14 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						2f1bfe126b 
					 
					
						
						
							
							Debug message formatting gone wrong  
						
						
						
						
					 
					
						2016-01-14 13:52:11 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						bacd49a6a8 
					 
					
						
						
							
							Don't try to replace http with https if https already exists  
						
						
						
						
					 
					
						2016-01-14 13:06:37 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						83cb1dfa68 
					 
					
						
						
							
							Salmon debugging  
						
						
						
						
					 
					
						2016-01-14 03:48:41 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						cf7d2f4d0f 
					 
					
						
						
							
							Salmon queue handler getByID for exception throwing  
						
						
						
						
					 
					
						2016-01-14 01:51:00 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						99da1ebe41 
					 
					
						
						
							
							Catch NoHttpResponseException when using HTTPClient  
						
						
						
						
					 
					
						2016-01-13 14:17:49 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						3ed632decf 
					 
					
						
						
							
							NoHttpResponseException needed instead of HTTP_Request2_Exception  
						
						... 
						
						
						
						HTTP_Request2_Exception assumed an HTTP response status code/line 
						
						
					 
					
						2016-01-13 14:08:48 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e75472f460 
					 
					
						
						
							
							Use the upstream function to get effectiveUrl  
						
						
						
						
					 
					
						2016-01-13 14:00:05 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b13f8df79b 
					 
					
						
						
							
							HTTPClient would return null instead of exception  
						
						... 
						
						
						
						This caused $response->isOK() tests to call a function on a non-existing object, causing all hell to break loose. 
						
						
					 
					
						2016-01-11 02:36:59 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						42dff2742a 
					 
					
						
						
							
							Put salmon slaps in queues before pushing user Atom feed  
						
						
						
						
					 
					
						2016-01-10 00:29:32 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4e0ed61f7c 
					 
					
						
						
							
							OStatus queue handler uses Notice->getAttentionProfiles()  
						
						... 
						
						
						
						and lots more debugging for LOG_DEBUG 
						
						
					 
					
						2016-01-08 01:31:47 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						306df3dc3b 
					 
					
						
						
							
							Logging fixes  
						
						
						
						
					 
					
						2015-12-26 16:27:06 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7ccd36849e 
					 
					
						
						
							
							Merge branch 'master' of git.gnu.io:gnu/gnu-social into nightly  
						
						... 
						
						
						
						Conflicts:
	plugins/OStatus/OStatusPlugin.php
master vs. nightly thing 
						
						
					 
					
						2015-11-05 16:16:02 +01:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						4b31bc3fd2 
					 
					
						
						
							
							Enqueue renewals  
						
						... 
						
						
						
						Better for request times, etc 
						
						
					 
					
						2015-10-21 01:50:03 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						af1b0915f4 
					 
					
						
						
							
							Magic signature discovery and envelope changes  
						
						
						
						
					 
					
						2015-10-04 17:26:35 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6afa091dca 
					 
					
						
						
							
							Change some Salmon events and similar  
						
						... 
						
						
						
						Use Profile instead of User and (if we know it) send along the target
profile, so a Diaspora plugin can encrypt to the receiver. 
						
						
					 
					
						2015-10-04 17:26:23 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						2970333adb 
					 
					
						
						
							
							Set otherwise undiscovered salmonuri on OStatus script update-profile.php  
						
						
						
						
					 
					
						2015-10-04 17:21:56 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						57f26a97fb 
					 
					
						
						
							
							var_export without true  
						
						
						
						
					 
					
						2015-10-04 16:40:21 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						684b9419a0 
					 
					
						
						
							
							Add an event to get plugin discovery hints from XRD  
						
						
						
						
					 
					
						2015-10-04 14:46:45 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						2aed59a02a 
					 
					
						
						
							
							Diaspora plugin is almost there (for remote salmon slaps at least)  
						
						
						
						
					 
					
						2015-10-04 12:06:48 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						9b461db4da 
					 
					
						
						
							
							Send the entire XMLStringer object in MagicEnvelope events.  
						
						
						
						
					 
					
						2015-10-04 09:59:01 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						184293c634 
					 
					
						
						
							
							Break out MagicEnvelope->toXML() functionality to allow for plugin flexibility  
						
						
						
						
					 
					
						2015-10-04 00:17:07 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						30a4393afa 
					 
					
						
						
							
							Move around some code related to Magic_envelope and signing  
						
						
						
						
					 
					
						2015-10-03 23:35:46 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						c5a5eaf288 
					 
					
						
						
							
							Do we update feeduri and salmonuri for Ostatus_profile now?  
						
						... 
						
						
						
						When changing from HTTP to HTTPS, following up on commit
59763ceecb 
						
						
					 
					
						2015-07-11 19:46:01 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						24b1e26406 
					 
					
						
						
							
							MagicEnvelope called DOMDocument::loadXML statically  
						
						... 
						
						
						
						but apparently we shouldn't do this, despite recommended on https://secure.php.net/manual/en/domdocument.loadxml.php  
						
						
					 
					
						2015-07-10 23:24:50 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6478034e92 
					 
					
						
						
							
							Diaspora-compatible Salmon slap receival  
						
						... 
						
						
						
						We're not all the way there yet, there is something which seems to bugger
up profile discovery from their end. 
						
						
					 
					
						2015-06-06 17:14:38 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						faf14197cd 
					 
					
						
						
							
							Diaspora doesn't understand our Salmon POST, so send again  
						
						
						
						
					 
					
						2015-06-06 16:57:29 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4de125dd84 
					 
					
						
						
							
							Moved FeedSubException parent class to own file  
						
						
						
						
					 
					
						2015-06-06 16:02:25 +02:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						8fac7a9f6c 
					 
					
						
						
							
							StatusNet class renamed GNUsocial  
						
						... 
						
						
						
						also added backward compatible StatusNet class for the two calls I know
third party plugins use, isHTTPS and getActivePlugins 
						
						
					 
					
						2015-02-27 12:44:15 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						9aa59c7f62 
					 
					
						
						
							
							forgot primary key column to updateWithKeys in SalmonAction  
						
						
						
						
					 
					
						2015-02-17 21:31:35 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						59763ceecb 
					 
					
						
						
							
							SalmonAction now updates remote URI if it was stale.  
						
						... 
						
						
						
						After doublechecking two identities so that they match (like one that was
previously http:// but now is https://) we update the URI in our database
to match.
This has to be verified so it's not easy to fool our script and thus make
us replace legitimate URIs with fake ones. I believe the callback method
is safe, but I'm not sure how well it handles HTTP MITM attacks etc. 
						
						
					 
					
						2015-02-17 17:35:45 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						aeaee388bf 
					 
					
						
						
							
							Store remote magicsig public keys locally  
						
						
						
						
					 
					
						2015-01-24 13:06:09 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						975ce6d83e 
					 
					
						
						
							
							Documentation update (clarifying need for php5-gmp in comment)  
						
						
						
						
					 
					
						2015-01-24 12:22:29 +01:00