Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						c1e3cfe7a7 
					 
					
						
						
							
							ensureFeedURL will return Ostatus_profile early if already stored  
						
						
						
						
					 
					
						2015-02-20 14:47:12 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						d061e1065e 
					 
					
						
						
							
							Some loose table definitions which needed 191 char indexes  
						
						... 
						
						
						
						because we want utf8mb4 so badly! 
						
						
					 
					
						2015-02-19 21:02:14 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						0590f2975e 
					 
					
						
						
							
							Merge branch 'utf8mb4' into nightly  
						
						... 
						
						
						
						Conflicts because of urlhash fixes:
	classes/File.php
	classes/File_redirection.php
	classes/File_thumbnail.php 
						
						
					 
					
						2015-02-19 20:50:40 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						45dc76de26 
					 
					
						
						
							
							File and File_redirection adhoc storage methods updated for urlhash  
						
						
						
						
					 
					
						2015-02-19 19:05:24 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4ad7e8f459 
					 
					
						
						
							
							UserdirectoryAction now ManagedAction and better SQL  
						
						
						
						
					 
					
						2015-02-18 13:37:06 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						d445e0c877 
					 
					
						
						
							
							No need for return true  
						
						
						
						
					 
					
						2015-02-18 13:18:32 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e64ac4c418 
					 
					
						
						
							
							GroupdirectoryAction now has no direct SQL queries  
						
						... 
						
						
						
						also various fixes uppers 
						
						
					 
					
						2015-02-18 12:17:26 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						a254f38a23 
					 
					
						
						
							
							Turn GroupdirectoryAction into a ManagedAction  
						
						
						
						
					 
					
						2015-02-18 11:15:30 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						52e0ce8b06 
					 
					
						
						
							
							Directory group search code cleanup  
						
						
						
						
					 
					
						2015-02-18 11:13:10 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						b039d960f5 
					 
					
						
						
							
							Make group search in Directory use PEAR::DB  
						
						... 
						
						
						
						No more direct SQL queries please. 
						
						
					 
					
						2015-02-18 11:08:11 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						0deaf6c50c 
					 
					
						
						
							
							use common_purify to purify HTML, one function to rule them all  
						
						
						
						
					 
					
						2015-02-18 00:14:28 +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 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						ef780d5034 
					 
					
						
						
							
							Move people tag autocomplete JS to plugin  
						
						... 
						
						
						
						As discussed in https://gitorious.org/social/mainline/merge_requests/47  
						
						
					 
					
						2015-02-15 19:10:05 -05:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						2b93643277 
					 
					
						
						
							
							Don't default to publishing http: alias!  
						
						... 
						
						
						
						It seems to have caused a problem with at least an older codebase of
remote GNU social sites, but either way we shouldn't present the user
as aliased on an insecure connection if there is no real reason to. 
						
						
					 
					
						2015-02-15 13:33:36 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						396f1e92ca 
					 
					
						
						
							
							Present http:// alias by default in WebFinger output  
						
						... 
						
						
						
						because it might help us (and especially StatusNet sites) to recognize
profiles that have migrated from HTTP to HTTPS! 
						
						
					 
					
						2015-02-15 13:17:51 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						e9457db8b2 
					 
					
						
						
							
							DirectMessages backed up properly for UAS  
						
						
						
						
					 
					
						2015-02-13 11:54:15 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						44191ac81a 
					 
					
						
						
							
							Faves backed up properly to UAS  
						
						
						
						
					 
					
						2015-02-13 11:52:29 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						cdf2b28854 
					 
					
						
						
							
							UAS protected property user solved with getUser()  
						
						
						
						
					 
					
						2015-02-13 11:39:50 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						2f86cd8602 
					 
					
						
						
							
							utf8mb4 conversion on database with index adjusts  
						
						
						
						
					 
					
						2015-02-12 18:18:55 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f5bb0431da 
					 
					
						
						
							
							schemaDef coding style fixes  
						
						
						
						
					 
					
						2015-02-12 17:45:02 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						13f1c2cc55 
					 
					
						
						
							
							Missing uri property of QnA_Answer class  
						
						
						
						
					 
					
						2015-02-12 17:44:05 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						dc495a52ea 
					 
					
						
						
							
							Merge commit 'refs/merge-requests/39' of  https://gitorious.org/social/mainline  into merge-requests/39  
						
						
						
						
					 
					
						2015-02-09 11:35:19 +01:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						74d4e2fa10 
					 
					
						
						
							
							TwitterBridge: don't array_merge() non-arrays  
						
						... 
						
						
						
						Fixes: ErrorException: [2] array_merge(): Argument #2  is not an array 
						
						
					 
					
						2015-02-08 20:11:50 -05:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						55321af4c8 
					 
					
						
						
							
							Make TwitterBridge less noisy  
						
						... 
						
						
						
						Empty timelines are no longer warnings, but debug information 
						
						
					 
					
						2015-02-08 20:07:23 -05:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						c6b1b3e5e3 
					 
					
						
						
							
							Merge commit 'refs/merge-requests/30' of  https://gitorious.org/social/mainline  into merge-requests/30  
						
						
						
						
					 
					
						2015-02-08 23:19:53 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						39dce9e348 
					 
					
						
						
							
							Merge commit 'refs/merge-requests/36' of  https://gitorious.org/social/mainline  into merge-requests/36  
						
						
						
						
					 
					
						2015-02-08 23:11:47 +01:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						11053431d6 
					 
					
						
						
							
							Populate 'created' property on ostatus_source  
						
						... 
						
						
						
						The 'created' column in ostatus_source SQL table has NOT NULL restriction.
INSERTs fail when running MySQL/MariaDB in strict mode if this is not
populated. 
						
						
					 
					
						2015-02-08 13:41:29 -05:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						305ef6ad85 
					 
					
						
						
							
							Older versions of PHP couldn't do array indexes on function returns.  
						
						
						
						
					 
					
						2015-02-08 11:53:47 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						1bda6fb9be 
					 
					
						
						
							
							General code quality improvement for easier understanding  
						
						... 
						
						
						
						Also made sure we only match local group IDs in recognizedFeed for PushhubAction 
						
						
					 
					
						2015-02-08 11:47:15 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						4b77f88a17 
					 
					
						
						
							
							Merge commit 'refs/merge-requests/34' of  https://gitorious.org/social/mainline  into merge-requests/34  
						
						
						
						
					 
					
						2015-02-08 11:21:36 +01:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						56c0cd621a 
					 
					
						
						
							
							Remove NOT NULL restriction on FeedSub last_update  
						
						... 
						
						
						
						Fixes an issue where INSERTs fail if MySQL/MariaDB runs in "strict
mode". 
						
						
					 
					
						2015-02-07 11:08:03 -05:00 
						 
				 
			
				
					
						
							
							
								Chimo 
							
						 
					 
					
						
						
							
						
						937adf05c9 
					 
					
						
						
							
							Remove NOT NULL restriction on HubSub 'lease'  
						
						... 
						
						
						
						This fixes an issue where INSERTs in HubSub fail if MySQL/MariaDB is
running in "strict mode" since the default lease time in
PushHubAction::subunsub is null.
Permanent subscriptions have been removed in PuSH v0.4, but they are
being kept here for backward-compatibility with previous GS/SN versions. 
						
						
					 
					
						2015-02-07 10:46:13 -05:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f141565104 
					 
					
						
						
							
							Allow delete-inactive for gcfeeds  
						
						... 
						
						
						
						Garbage collecting should also allow to clean up leftover database entries. 
						
						
					 
					
						2015-02-04 16:49:03 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7cce2e17ff 
					 
					
						
						
							
							FavoritePlugin uses getConfigPref for profile setting  
						
						
						
						
					 
					
						2015-02-03 22:02:19 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						3f7a305b2a 
					 
					
						
						
							
							$this out of context (use $rcpt)  
						
						
						
						
					 
					
						2015-02-03 21:15:37 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7666ac34f9 
					 
					
						
						
							
							Revert "Notices for faves are already sent as they are notices now."  
						
						... 
						
						
						
						This reverts commit 636d5141e9 
						
						
					 
					
						2015-02-03 17:50:21 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						9827e6ad84 
					 
					
						
						
							
							The favorite activity is an activity.  
						
						
						
						
					 
					
						2015-02-03 16:53:51 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						636d5141e9 
					 
					
						
						
							
							Notices for faves are already sent as they are notices now.  
						
						
						
						
					 
					
						2015-02-03 16:44:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						adc4dfc081 
					 
					
						
						
							
							Wrong variable name (s/fave/object/)  
						
						
						
						
					 
					
						2015-02-03 16:43:56 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						660e8c6efc 
					 
					
						
						
							
							Fave::addNew now calls Notice::saveActivity  
						
						... 
						
						
						
						as a bonus we've fixed several FIXME issues for favorite email notification
and updated parts of the codebase for these activities to a more modern style. 
						
						
					 
					
						2015-02-03 16:34:11 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						0bcecda177 
					 
					
						
						
							
							more activity-like terminology in variable names  
						
						
						
						
					 
					
						2015-02-03 15:12:29 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						1104ea2a0e 
					 
					
						
						
							
							Fave insert logging directly in insert()  
						
						
						
						
					 
					
						2015-02-03 14:58:22 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						000b7675d8 
					 
					
						
						
							
							Vimeo oEmbed thumbnail host added to whitelist  
						
						
						
						
					 
					
						2015-02-02 11:14:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						acd36698b4 
					 
					
						
						
							
							A bunch of clientError that were called as serverError  
						
						... 
						
						
						
						Calling serverError with a clientError status code (4xx) means it will
automatically default to Internal Server Error (500) which is in the
server error status code range (5xx). That is undesirable. 
						
						
					 
					
						2015-01-29 23:35:49 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						acec8b8cf2 
					 
					
						
						
							
							Default value false for $force on Ostatus updateAvatar  
						
						
						
						
					 
					
						2015-01-27 14:14:24 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						cc996f58db 
					 
					
						
						
							
							Test in Ostatus_profile if avatar is an image before writing to filesystem  
						
						... 
						
						
						
						This clears one FIXME...
We also fix HTTPClient::quickGet() (and a related call in OStatus testfeed.php). 
						
						
					 
					
						2015-01-27 14:00:39 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						cdd3c52633 
					 
					
						
						
							
							Handle groups better in Ostatus_profile->updateAvatar  
						
						
						
						
					 
					
						2015-01-27 13:38:11 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						482f61ac15 
					 
					
						
						
							
							OStatusSub should use inherent attributes  
						
						... 
						
						
						
						No need to make several common_current_user calls and then getProfile
directly after that, since we have stuff like $this->scoped. 
						
						
					 
					
						2015-01-27 13:23:49 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						cf46de6ca7 
					 
					
						
						
							
							Ostatus_profile smarter test if avatar exists  
						
						... 
						
						
						
						If you accidentally deleted a remote user's avatar from filesystem,
it'd take until its URL was updated that you got it back. Now it
happens if the local avatar file doesn't exist. 
						
						
					 
					
						2015-01-26 17:43:09 +01:00