Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						58e852f7f7 
					 
					
						
						
							
							Use the -y parameter for ffmpeg/avconv to be non-interactive  
						
						
						
						
					 
					
						2016-02-07 01:59:21 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						6bec22ea4e 
					 
					
						
						
							
							Write to the tmp file in VideoThumbnails  
						
						
						
						
					 
					
						2016-02-07 01:57:56 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						25f623565a 
					 
					
						
						
							
							Catch http exception in StoreRemoteMedia  
						
						
						
						
					 
					
						2016-02-07 01:54:37 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						098c8b1df4 
					 
					
						
						
							
							NoHttpResponseException extends HTTP_Request2_ConnectionException  
						
						
						
						
					 
					
						2016-02-07 01:52:20 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						55546a5aab 
					 
					
						
						
							
							Support ffmpeg and avconv depending on which you have  
						
						
						
						
					 
					
						2016-02-07 01:02:59 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						1f01356076 
					 
					
						
						
							
							Fix issue  #127  by catching exceptions  
						
						... 
						
						
						
						update-profile-data.php threw exceptions on http connection issues 
						
						
					 
					
						2016-02-04 12:06:35 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						90045d66ea 
					 
					
						
						
							
							HTMLPurifierSchemes plugin to allow geo and magnet URIs  
						
						
						
						
					 
					
						2016-02-03 14:36:51 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						367fc054dc 
					 
					
						
						
							
							Merge branch 'master' into mmn_fixes  
						
						
						
						
					 
					
						2016-01-30 00:03:25 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						a5c1b063fd 
					 
					
						
						
							
							isPerson did not exist for Ostatus_profile  
						
						
						
						
					 
					
						2016-01-29 16:15:06 +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 
							
						 
					 
					
						
						
							
						
						36f099958c 
					 
					
						
						
							
							Don't match @nickname on @nickname@server.com  
						
						
						
						
					 
					
						2016-01-29 15:53:58 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						fb7f572eed 
					 
					
						
						
							
							Purify oembed html (again)  
						
						... 
						
						
						
						For a commit or two we didn't do this, because htmLawed failed to filter
out CDATA javascript properly, but now we use HTML Purifier which works. 
						
						
					 
					
						2016-01-28 19:02:16 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7e6783bb8f 
					 
					
						
						
							
							Replace htmLawed with HTMLPurifier  
						
						
						
						
					 
					
						2016-01-28 19:01:13 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						daea5647b6 
					 
					
						
						
							
							Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into mmn_fixes  
						
						
						
						
					 
					
						2016-01-28 17:27:08 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						9b3cbb373e 
					 
					
						
						
							
							Merge branch 'oembed_fb_wp_branch' into 'nightly'  
						
						... 
						
						
						
						Oembed: Fix UTF-8 bug and better wp&fb data (updated!)
See merge request !97  
						
						
					 
					
						2016-01-28 16:26:33 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						efe23ed404 
					 
					
						
						
							
							updateWithKeys now understands multi-column keys  
						
						... 
						
						
						
						and automatically identifies _which_ columns are the right ones,
so for example 'uri' primary keys don't need to be explicitly set 
						
						
					 
					
						2016-01-28 16:42:59 +01:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						05439831e7 
					 
					
						
						
							
							add comment that DOMDocument('1.0', 'UTF-8') does not work  
						
						
						
						
					 
					
						2016-01-28 15:32:11 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						06e325d61b 
					 
					
						
						
							
							fixes two issues when the oembed thumbnail is blank  
						
						
						
						
					 
					
						2016-01-28 15:19:29 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						7c80c9a1f9 
					 
					
						
						
							
							Meh, let's just remove FirePHP, I don't think anyone uses it  
						
						
						
						
					 
					
						2016-01-28 13:48:44 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						dfc11f99ad 
					 
					
						
						
							
							Merge branch 'update-extlib-firephp' into 'nightly'  
						
						... 
						
						
						
						Update FirefPHP Core to v0.4.0 released on 23 Apr 2013
See merge request !92  
						
						
					 
					
						2016-01-28 12:41:34 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						bb0cb9b3f6 
					 
					
						
						
							
							Manual merge of  !87  Update LDAP2 extlib to 2.2.0 (stable) released on 2015-10-30  
						
						... 
						
						
						
						Thanks postblue 
						
						
					 
					
						2016-01-28 13:35:23 +01:00 
						 
				 
			
				
					
						
							
							
								mmn 
							
						 
					 
					
						
						
							
						
						c01982c917 
					 
					
						
						
							
							Merge branch 'oembed_thumbnail_branch' into 'nightly'  
						
						... 
						
						
						
						add a thumbnail to oembed response
just something i added to quitim
See merge request !85  
						
						
					 
					
						2016-01-26 21:09:07 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						aa76e5863f 
					 
					
						
						
							
							don't mess upp charsets in oembed/og! check for utf-8 in http header and meta tags, and add prolog when loading html with DOMDocument()  
						
						
						
						
					 
					
						2016-01-26 13:37:52 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						b8d1e1f4a6 
					 
					
						
						
							
							silence errors on these xpath queries  
						
						
						
						
					 
					
						2016-01-26 11:28:24 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						884aeb4d2e 
					 
					
						
						
							
							common_purify() doesn't remove wordpress' and facebook's javascript properly, maybe better to keep the data intact, and do strip_tags or something similar when using the data  
						
						
						
						
					 
					
						2016-01-26 01:10:15 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						473f893d04 
					 
					
						
						
							
							detab  
						
						
						
						
					 
					
						2016-01-26 01:07:44 +00:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						76c8139054 
					 
					
						
						
							
							not pretty, but gives us better oembed data for wordpress and facebook  
						
						
						
						
					 
					
						2016-01-26 01:05:53 +00:00 
						 
				 
			
				
					
						
							
							
								Roland Haeder 
							
						 
					 
					
						
						
							
						
						9614aba0e1 
					 
					
						
						
							
							Removed plugin Google-Analytics as this is free/libre and decentralized  
						
						... 
						
						
						
						software and should not promote centralized proprietary software. Please see
the included Piwik plugin for a more decentralized alternative!
Signed-off-by: Roland Haeder <roland@mxchange.org > 
						
						
					 
					
						2016-01-25 13:19:43 +01:00 
						 
				 
			
				
					
						
							
							
								postblue 
							
						 
					 
					
						
						
							
						
						fef52d7b51 
					 
					
						
						
							
							Update FirefPHP Core to v0.4.0 released on 23 Apr 2013  
						
						
						
						
					 
					
						2016-01-24 21:11:38 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						ef005987a1 
					 
					
						
						
							
							Did the OpportunisticQM fixes in the wrong order  
						
						
						
						
					 
					
						2016-01-22 12:26:53 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						1121b38eb1 
					 
					
						
						
							
							use connect_timeout value for execution margin  
						
						
						
						
					 
					
						2016-01-22 12:21:06 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						81f9a59f25 
					 
					
						
						
							
							use connect_timeout value for execution margin  
						
						
						
						
					 
					
						2016-01-22 12:19:17 +01:00 
						 
				 
			
				
					
						
							
							
								hannes 
							
						 
					 
					
						
						
							
						
						d0e2f8745d 
					 
					
						
						
							
							add a thumbnail to oembed response  
						
						
						
						
					 
					
						2016-01-21 18:48:30 +00:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						3f9c1c142a 
					 
					
						
						
							
							Removing unnecessary debug messages etc.  
						
						
						
						
					 
					
						2016-01-21 02:49:34 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						be1759f112 
					 
					
						
						
							
							i18n  
						
						
						
						
					 
					
						2016-01-21 02:37:07 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						81bf0fd261 
					 
					
						
						
							
							Various last fixes to RSVP I think  
						
						
						
						
					 
					
						2016-01-21 02:20:57 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						f74d2d555c 
					 
					
						
						
							
							Working on some RSVP code stuff  
						
						
						
						
					 
					
						2016-01-21 02:10:34 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						45b523bada 
					 
					
						
						
							
							Add xcal namespaces to location and url in event  
						
						... 
						
						
						
						Also, for fun, add stuff for RSS event module, see:
   http://web.resource.org/rss/1.0/modules/event/  
						
						
					 
					
						2016-01-20 21:07:55 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						21cc737f5c 
					 
					
						
						
							
							Cancelling RSVPs now seems to work.  
						
						
						
						
					 
					
						2016-01-20 16:10:10 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						64e74d527f 
					 
					
						
						
							
							Handle exceptions when salmon slapping  
						
						... 
						
						
						
						Make it so notifyDeferred actually _always_ throws exceptions and handle
them in the places it is called. 
						
						
					 
					
						2016-01-20 15:32:39 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						c393bc9563 
					 
					
						
						
							
							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-20 15:32:29 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						912d65c767 
					 
					
						
						
							
							bulkDistribute won't add empty lists to database  
						
						
						
						
					 
					
						2016-01-20 15:32:24 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						fa8e02b832 
					 
					
						
						
							
							Handle exceptions when salmon slapping  
						
						... 
						
						
						
						Make it so notifyDeferred actually _always_ throws exceptions and handle
them in the places it is called. 
						
						
					 
					
						2016-01-20 14:56:24 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						80dc2788dd 
					 
					
						
						
							
							Started fiddling with CancelRSVP but more must be done  
						
						... 
						
						
						
						Remember to make event_uri be the selector for CancelRSVPForm and
preferrably even merge it into RSVPForm! 
						
						
					 
					
						2016-01-19 01:41:06 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						477d71c0bf 
					 
					
						
						
							
							RSVP stuff, mostly forms.  
						
						... 
						
						
						
						Now fix CancelRSVP stuff so it gets by event_uri and can cancel existing RSVP. 
						
						
					 
					
						2016-01-19 01:33:09 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						84dda697d6 
					 
					
						
						
							
							RSVPs seem to be created now, just gotta fix CancelrsvpAction  
						
						
						
						
					 
					
						2016-01-19 01:10:06 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						73992a1ed8 
					 
					
						
						
							
							Use "newer" terminology and throw exceptions  
						
						
						
						
					 
					
						2016-01-19 00:21:16 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						9eea255c79 
					 
					
						
						
							
							Save with options so we get source=web  
						
						
						
						
					 
					
						2016-01-19 00:08:31 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						358684a5ed 
					 
					
						
						
							
							end_str, not start_str  
						
						
						
						
					 
					
						2016-01-19 00:01:30 +01:00 
						 
				 
			
				
					
						
							
							
								Mikael Nordfeldth 
							
						 
					 
					
						
						
							
						
						385705c65b 
					 
					
						
						
							
							Events get rendered.  
						
						
						
						
					 
					
						2016-01-18 23:58:32 +01:00