mmn 
							
						 
					 
					
						
						
							
						
						c114c6bbad 
					 
					
						
						
							
							Merge branch 'php-minversion-detec' into 'nightly'  
						
						... 
						
						
						
						installer::checkPrereqs bump PHP version to 5.5.0
Related to #102  
See merge request !63  
						
						
					 
					
						2015-12-14 20:37:53 +00:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						129bd1bf03 
					 
					
						
						
							
							Merge branch 'fix-setpassword' into 'nightly'  
						
						... 
						
						
						
						Fix /scripts/setpassword.php
common_munge_password is expecting a Profile, we were passing a user_id.
Thanks @aroque for the fix ( ref. #100  )
See merge request !67  
						
						
					 
					
						2015-12-14 20:37:26 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						d659e0aaf9 
					 
					
						
						
							
							We have to print/echo when outputting json (thanks hannes)  
						
						
						
						
					 
					
						2015-12-14 21:31:10 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						8d1105fe73 
					 
					
						
						
							
							We have to print/echo when outputting json (thanks hannes)  
						
						
						
						
					 
					
						2015-12-14 21:29:39 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						441e2c8d34 
					 
					
						
						
							
							redir_info only has data if we ran discovery  
						
						
						
						
					 
					
						2015-12-08 11:42:09 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4fecda58ff 
					 
					
						
						
							
							Full identifiers for Autocomplete, less confusing  
						
						
						
						
					 
					
						2015-12-05 16:18:59 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						376d545082 
					 
					
						
						
							
							Remember to purify HTML...  
						
						
						
						
					 
					
						2015-12-05 15:56:50 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						c498db147a 
					 
					
						
						
							
							ircs URLs work fine in Firefox at least  
						
						
						
						
					 
					
						2015-12-05 13:02:49 +01:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						10bb4cb659 
					 
					
						
						
							
							Fix /scripts/setpassword.php  
						
						... 
						
						
						
						common_munge_password is expecting a Profile, we were passing a user_id.
Thanks @aroque for the fix ( ref. #100  ) 
						
						
					 
					
						2015-12-04 17:09:06 +00:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						b537696370 
					 
					
						
						
							
							Add icons to group-join approval/rejection buttons  
						
						
						
						
					 
					
						2015-12-04 17:00:35 +00:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						6d9ea620a3 
					 
					
						
						
							
							Fix group-join request rejections  
						
						
						
						
					 
					
						2015-12-04 16:11:15 +00:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						a06dc57621 
					 
					
						
						
							
							Fix "pending members" group list  
						
						
						
						
					 
					
						2015-12-04 15:47:40 +00:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						3e16e31080 
					 
					
						
						
							
							installer::checkPrereqs bump PHP version to 5.5.0  
						
						
						
						
					 
					
						2015-12-04 15:22:58 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						831e9db7ec 
					 
					
						
						
							
							Various minor theme enhancements in neo-gnu  
						
						
						
						
					 
					
						2015-11-30 02:31:51 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4479d780e5 
					 
					
						
						
							
							List groups with nickname instead of full name in sidebar  
						
						
						
						
					 
					
						2015-11-30 02:21:17 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						334a0d56e7 
					 
					
						
						
							
							Oembed slimmed to only do discovery (soon we get og: discovery too)  
						
						
						
						
					 
					
						2015-11-30 02:06:04 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						8bab642cc7 
					 
					
						
						
							
							quickGetJson for HTTP requests to return json objects  
						
						
						
						
					 
					
						2015-11-30 02:05:06 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b7edac2610 
					 
					
						
						
							
							HTTPClient get $params array and oEmbedHelper uses it  
						
						
						
						
					 
					
						2015-11-30 01:28:18 +01:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						c95f74018d 
					 
					
						
						
							
							Add AtomPub, Twitter-compat. API documentation to doc-src/  
						
						
						
						
					 
					
						2015-11-24 13:00:32 -05:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						fbe0e68617 
					 
					
						
						
							
							Events listing, but the stream will change soon  
						
						
						
						
					 
					
						2015-11-23 14:40:59 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						5b847eff12 
					 
					
						
						
							
							bump beta version number  
						
						
						
						
					 
					
						2015-11-23 00:42:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						bca4bb8373 
					 
					
						
						
							
							allow form ->li() to set $class  
						
						
						
						
					 
					
						2015-11-23 00:40:28 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b01484a0a3 
					 
					
						
						
							
							Managed_DataObject::newUri was called improperly  
						
						
						
						
					 
					
						2015-11-23 00:39:49 +01:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						5c4a7a1052 
					 
					
						
						
							
							make sure returned notice is a repeat, i.e. not a delete activity notice  
						
						
						
						
					 
					
						2015-11-22 20:28:07 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						1eba33590b 
					 
					
						
						
							
							ActivityVerb::SHARE instead of  http://activitystrea.ms/schema/1.0/share  
						
						
						
						
					 
					
						2015-11-22 20:26:08 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						70695a1463 
					 
					
						
						
							
							make sure the notice is a repeat, i.e. not a delete activity notice that also can have a repeat_of set  
						
						
						
						
					 
					
						2015-11-22 18:59:56 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						1630424797 
					 
					
						
						
							
							Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly  
						
						
						
						
					 
					
						2015-11-20 18:50:26 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						b33b40db45 
					 
					
						
						
							
							Merge branch 'refactor-file-processNew' into 'nightly'  
						
						... 
						
						
						
						Refactor on File::processNew
The code was so involved there was even a comment asking for a refactor.
Now, File_redirection::where always returns a nice File_redirection
object instead of an array or string or nothing.  The object is
either one which already existed or else a new, unsaved object.
Instead of duplicating "does it exist" checks everywhere, do it in
File_redirection::where.  You either get what exists or something to save.
An unsaved File_redirection may be paired with an unsaved File.
You will want to save the File first (using ->saveFile()) and put the
id in File_redirection#file_id before saving.
See merge request !57  
						
						
					 
					
						2015-11-20 17:50:01 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						38c84a92c7 
					 
					
						
						
							
							Merge request  #59  which was directed at master  
						
						
						
						
					 
					
						2015-11-20 18:47:21 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						5d548d157f 
					 
					
						
						
							
							Merge branch 'master' into 'master'  
						
						... 
						
						
						
						block check can't be done inside the same try-expression as Subscription::getSub…
…scription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them.
See merge request !59  
						
						
					 
					
						2015-11-20 17:46:53 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						abb8d1273e 
					 
					
						
						
							
							block check can't be done inside the same try-expression as Subscription::getSubscription(), since if that throws a NoResultException, the block check will not be done. and if you're blocking someone you are not subscribing to them.  
						
						
						
						
					 
					
						2015-11-19 15:55:11 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						4f0fae9e90 
					 
					
						
						
							
							Show better source for linback items  
						
						
						
						
					 
					
						2015-11-12 19:07:26 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						11810bbf54 
					 
					
						
						
							
							Update conversation when we update reply_to  
						
						... 
						
						
						
						Or repeat_of 
						
						
					 
					
						2015-11-12 19:06:17 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						47db1ab063 
					 
					
						
						
							
							Autodiscovery header for webmention  
						
						
						
						
					 
					
						2015-11-12 19:06:17 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						f09a82268f 
					 
					
						
						
							
							Ignore self pings  
						
						
						
						
					 
					
						2015-11-12 19:06:17 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						b95b318052 
					 
					
						
						
							
							That never was meant to be in that if  
						
						
						
						
					 
					
						2015-11-12 19:06:16 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						6aba21fcd8 
					 
					
						
						
							
							Use author-declared URL as URI  
						
						... 
						
						
						
						Will make brid.gy work better, for example. 
						
						
					 
					
						2015-11-12 19:06:16 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						fa1e4620cf 
					 
					
						
						
							
							Add pingback frontend  
						
						
						
						
					 
					
						2015-11-12 19:06:16 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						aa4d880148 
					 
					
						
						
							
							Search in sub-items for links to the target as well  
						
						
						
						
					 
					
						2015-11-12 19:06:16 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						96e0819f00 
					 
					
						
						
							
							Catch exception that this generates when there is no result  
						
						
						
						
					 
					
						2015-11-12 19:06:16 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						c5bdf6924d 
					 
					
						
						
							
							Fix duplicate detection  
						
						
						
						
					 
					
						2015-11-12 19:06:16 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						64ac344efa 
					 
					
						
						
							
							Update on duplicate linkback  
						
						... 
						
						
						
						This especially allows mentioning mulitple users, etc. 
						
						
					 
					
						2015-11-12 19:06:16 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						b9971e8a80 
					 
					
						
						
							
							Linkback to user should work  
						
						
						
						
					 
					
						2015-11-12 19:06:15 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						1e3cf08d82 
					 
					
						
						
							
							Ignore non-local notices as targets  
						
						
						
						
					 
					
						2015-11-12 19:06:15 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						dbfb698859 
					 
					
						
						
							
							Webmention frontend  
						
						
						
						
					 
					
						2015-11-12 19:06:15 +00:00 
						 
				 
			
				
					
						
							
							
								Stephen Paul Weber 
							
						 
					 
					
						
						
							
						
						96fb18da3f 
					 
					
						
						
							
							Initial helpers for verification and microformats  
						
						... 
						
						
						
						This will form the backend of all incoming linkbacks.
We verify the linkback is real and then try to form a rich notice
out of it. 
						
						
					 
					
						2015-11-12 19:06:15 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						d0e7203d88 
					 
					
						
						
							
							Make it clearer that we're handling group IDs  
						
						
						
						
					 
					
						2015-11-08 23:31:45 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						acd4980ab4 
					 
					
						
						
							
							Fix federation issue with groups (bad list order)  
						
						
						
						
					 
					
						2015-11-08 23:31:23 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						844670f88d 
					 
					
						
						
							
							Ooops, copypasted something into the wrong place.  
						
						
						
						
					 
					
						2015-11-08 23:24:20 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						65184782aa 
					 
					
						
						
							
							OStatus usage of static Validate::* calls fixed  
						
						
						
						
					 
					
						2015-11-08 10:33:41 +01:00