Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	7e83ba090f  
						 
						
							
							
								
								
								Merge branch 'hotfix_diaspora' into develop  
							
							 
							
							
							
						 
						
							2016-01-20 08:50:18 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c6b0e57aa4  
						 
						
							
							
								
								
								Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change  
							
							 
							
							
							
						 
						
							2016-01-20 08:40:04 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6c3d0f82c2  
						 
						
							
							
								
								
								Bugfix: The duplicate check for likes wasn't reliable  
							
							 
							
							
							
						 
						
							2016-01-03 00:17:28 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	38ee2def5d  
						 
						
							
							
								
								
								Don't send messages to contacts that are archived  
							
							 
							
							
							
						 
						
							2016-01-01 13:05:05 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	8d8dc2d060  
						 
						
							
							
								
								
								Merge pull request  #2197  from annando/1512-ostatus-comment  
							
							 
							
							... 
							
							
							
							Reworked delivery and notifier process - changed OStatus behaviour 
							
						 
						
							2015-12-27 15:58:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	3df5c17124  
						 
						
							
							
								
								
								reformat todo according to doxygen style  
							
							 
							
							
							
						 
						
							2015-12-25 23:17:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b9abfd24f0  
						 
						
							
							
								
								
								Rearrangements  
							
							 
							
							
							
						 
						
							2015-12-14 22:39:52 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a1a7bce603  
						 
						
							
							
								
								
								Completely reworked delivery process.  
							
							 
							
							
							
						 
						
							2015-12-14 00:39:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	15063c8d5b  
						 
						
							
							
								
								
								Code cleanup and first steps for a better comment distribition with DFRN and OStatus  
							
							 
							
							
							
						 
						
							2015-12-13 12:15:45 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	bfc0857953  
						 
						
							
							
								
								
								OStatus: Send even Friendica comments to OStatus  
							
							 
							
							
							
						 
						
							2015-12-07 21:52:42 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7d7e2e74f4  
						 
						
							
							
								
								
								The generated XML is now valid and it seems to work.  
							
							 
							
							
							
						 
						
							2015-11-23 23:49:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	75f1a17f7e  
						 
						
							
							
								
								
								New function for creating the OStatus messages  
							
							 
							
							
							
						 
						
							2015-11-23 18:44:47 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	1ea82ea355  
						 
						
							
							
								
								
								Only allow non top level posts to soap boxes  
							
							 
							
							
							
						 
						
							2015-11-12 21:55:33 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	3648094927  
						 
						
							
							
								
								
								Local delivery of comments to soap boxes are working now  
							
							 
							
							
							
						 
						
							2015-11-12 21:43:42 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	6f04c57ed3  
						 
						
							
							
								
								
								correct a little mistake (ACTIVITY_LIKE is supported)  
							
							 
							
							
							
						 
						
							2015-10-11 15:34:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	0b36b09823  
						 
						
							
							
								
								
								don't send attendance activities to diaspora (unsupported)  
							
							 
							
							
							
						 
						
							2015-10-11 13:07:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	69daaa61ba  
						 
						
							
							
								
								
								With the new queue we don't need "delivery_batch_count" anymore  
							
							 
							
							
							
						 
						
							2015-09-13 08:08:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7edce8e266  
						 
						
							
							
								
								
								Don't use a delivery interval when using the worker  
							
							 
							
							
							
						 
						
							2015-09-12 18:08:03 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	3cccb5ecb1  
						 
						
							
							
								
								
								The repair option is added to the settings  
							
							 
							
							
							
						 
						
							2015-09-05 04:54:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b24453f8da  
						 
						
							
							
								
								
								Messages are now sent to the relay server - and the options are configurable  
							
							 
							
							
							
						 
						
							2015-08-09 20:39:11 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d6d51e0259  
						 
						
							
							
								
								
								Don't deliver answers to OStatus messages to Diaspora  
							
							 
							
							
							
						 
						
							2015-07-05 16:27:03 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7581bd0f36  
						 
						
							
							
								
								
								Send a salmon notice whenever an OStatus user is mentioned.  
							
							 
							
							
							
						 
						
							2015-06-25 00:47:59 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	db256217e6  
						 
						
							
							
								
								
								Removed test  
							
							 
							
							
							
						 
						
							2015-06-24 22:51:46 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	87ade53162  
						 
						
							
							
								
								
								Some test code added  
							
							 
							
							
							
						 
						
							2015-06-24 14:21:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9a6511dc38  
						 
						
							
							
								
								
								Send a salmon notification when its a ostatus thread or you reply to an ostatus message  
							
							 
							
							
							
						 
						
							2015-06-13 09:12:28 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	60ad7af6f3  
						 
						
							
							
								
								
								Some bugfixing.  
							
							 
							
							
							
						 
						
							2015-06-12 01:08:06 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ad45ff7eb1  
						 
						
							
							
								
								
								OStatus: Notifier for Friendica, better thread completion  
							
							 
							
							
							
						 
						
							2015-06-12 00:39:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	f1fe38d5c7  
						 
						
							
							
								
								
								Just two to-dos added  
							
							 
							
							
							
						 
						
							2015-06-10 08:36:51 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	cb0351dba0  
						 
						
							
							
								
								
								Send a salmon notification to every mentioned person.  
							
							 
							
							
							
						 
						
							2015-06-09 08:27:04 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2856042824  
						 
						
							
							
								
								
								Send a hubsub notification for every comment  
							
							 
							
							
							
						 
						
							2015-05-31 10:38:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4750775752  
						 
						
							
							
								
								
								Cleaning the code.  
							
							 
							
							
							
						 
						
							2015-05-30 21:00:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e66489d67f  
						 
						
							
							
								
								
								PuSH: Publishing moved to a new process. OStatus comments are now published to all subscribers.  
							
							 
							
							
							
						 
						
							2015-05-30 20:47:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b763c810fb  
						 
						
							
							
								
								
								OStatus: Trying to deliver a comment to all contacts - not only the thread owner. (Not working by now)  
							
							 
							
							
							
						 
						
							2015-05-29 10:35:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	184dcf75a7  
						 
						
							
							
								
								
								Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list.  
							
							 
							
							
							
						 
						
							2015-01-20 22:54:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	beaca70126  
						 
						
							
							
								
								
								OStatus: Replies now arrive their target.  
							
							 
							
							
							
						 
						
							2015-01-12 00:14:51 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	cce561708a  
						 
						
							
							
								
								
								Replaced $argv and $argc with the $_SERVER array  
							
							 
							
							
							
						 
						
							2015-01-04 13:24:16 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a05ed41fb2  
						 
						
							
							
								
								
								Only some code cleanup  
							
							 
							
							
							
						 
						
							2014-06-15 23:33:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2a21fecd79  
						 
						
							
							
								
								
								Only some code beautification. No functional changes.  
							
							 
							
							
							
						 
						
							2014-03-20 18:46:01 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9877e43bda  
						 
						
							
							
								
								
								Search with tags now works fast.  
							
							 
							
							
							
						 
						
							2014-03-18 22:51:50 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6e7bd68ebb  
						 
						
							
							
								
								
								More "LIMIT 1" removed - and some other SQL improvements.  
							
							 
							
							
							
						 
						
							2014-03-11 23:52:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6b8585d48d  
						 
						
							
							
								
								
								Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete.  
							
							 
							
							
							
						 
						
							2014-03-09 09:19:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mats Sjöberg 
								
							 
						 
						
							
							
								
							
							
	2859ce1483  
						 
						
							
							
								
								
								Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work.  
							
							 
							
							
							
						 
						
							2013-11-21 21:44:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	0414e0a316  
						 
						
							
							
								
								
								More "relocate":  
							
							 
							
							... 
							
							
							
							button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server 
							
						 
						
							2013-11-13 06:07:49 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d126924ae0  
						 
						
							
							
								
								
								Vimeo videos are now embedded via SSL.  
							
							 
							
							
							
						 
						
							2013-10-02 22:17:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9a1a666f24  
						 
						
							
							
								
								
								Some changes to let pumpio react similar to facebook.  
							
							 
							
							
							
						 
						
							2013-09-04 00:01:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ed33d28e61  
						 
						
							
							
								
								
								redoing the change concerning the hostname.  
							
							 
							
							
							
						 
						
							2013-08-12 11:09:11 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e746c4955b  
						 
						
							
							
								
								
								Added an option to configure the hostname manually. And there was a problem when APC wasn't present.  
							
							 
							
							
							
						 
						
							2013-08-11 21:19:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	74caf1a4a7  
						 
						
							
							
								
								
								* Add MIME types for file attachments  
							
							 
							
							... 
							
							
							
							* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files 
							
						 
						
							2013-01-12 06:31:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	e684324032  
						 
						
							
							
								
								
								use explicit include paths  
							
							 
							
							
							
						 
						
							2012-12-28 14:51:50 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0a29927e6d  
						 
						
							
							
								
								
								Mail: real threading now works with outgoing mails.  
							
							 
							
							
							
						 
						
							2012-12-19 16:31:06 +01:00