Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7af3dd01d8
						 | 
						
							
							
								
								
								Poller: Check the number of used database connections
							
							
							
							
							
						 | 
						
							2016-02-09 06:42:00 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	d408cea871
						 | 
						
							
							
								
								
								DFRN import has now gone live
							
							
							
							
							
						 | 
						
							2016-02-05 21:25:20 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2bd36e5628
						 | 
						
							
							
								
								
								Feed should work now as well
							
							
							
							
							
						 | 
						
							2016-02-04 23:52:06 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	3a649047df
						 | 
						
							
							
								
								
								DFRN: Contact-id is now stored depending on the author/Some more bugfixes
							
							
							
							
							
						 | 
						
							2016-02-04 12:51:34 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2d0c2990ea
						 | 
						
							
							
								
								
								Differences fixed between old and new code
							
							
							
							
							
						 | 
						
							2016-02-03 23:04:52 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	d9b5d6d5f5
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
							
							
							
							
							
						 | 
						
							2016-02-03 08:34:11 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	47d2e3b142
						 | 
						
							
							
								
								
								Added some documentation
							
							
							
							
							
						 | 
						
							2016-02-03 05:00:26 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	f604f13d7d
						 | 
						
							
							
								
								
								New method to create a guid if none was given
							
							
							
							
							
						 | 
						
							2016-02-02 20:57:19 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	eb17fe7324
						 | 
						
							
							
								
								
								Some missing parts added
							
							
							
							
							
						 | 
						
							2016-01-30 14:13:58 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	69457a4a5b
						 | 
						
							
							
								
								
								DFRN import seems to work. Improvements are possible :-)
							
							
							
							
							
						 | 
						
							2016-01-30 02:57:40 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	8412eb7066
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
							
							
							
							
							
						 | 
						
							2016-01-29 10:59:06 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	863d49ccd0
						 | 
						
							
							
								
								
								Merge pull request #2300 from annando/1601-gcontact-guessing
							
							
							
							
							
							
							
							gcontact-id now depends on the owner, not the author of a post 
							
						 | 
						
							2016-01-29 05:27:58 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b3e86f4e6b
						 | 
						
							
							
								
								
								There is now a central function for item notifications
							
							
							
							
							
						 | 
						
							2016-01-28 22:58:05 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	a93d35bfda
						 | 
						
							
							
								
								
								gcontact-id now depends on the owner, not the author of a post
							
							
							
							
							
						 | 
						
							2016-01-28 18:06:17 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	afed5f3afc
						 | 
						
							
							
								
								
								Test code for the DFRN import
							
							
							
							
							
						 | 
						
							2016-01-27 11:30:12 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	62de6be495
						 | 
						
							
							
								
								
								Switched to static methods for DFRN
							
							
							
							
							
						 | 
						
							2016-01-25 15:20:58 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	44091aa631
						 | 
						
							
							
								
								
								Removed unused functions
							
							
							
							
							
						 | 
						
							2016-01-24 00:11:16 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7371318376
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
							
							
							
							
							
						 | 
						
							2016-01-23 18:50:14 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	61cebdb75e
						 | 
						
							
							
								
								
								Workaround for the case when items are stored without a contact id
							
							
							
							
							
						 | 
						
							2016-01-23 12:39:37 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c66b4387bf
						 | 
						
							
							
								
								
								dfrn functions could now work/Removed unused code
							
							
							
							
							
						 | 
						
							2016-01-22 20:26:11 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	fe5705e547
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1601-dfrn
							
							
							
							
							
						 | 
						
							2016-01-21 23:05:02 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	98ccefebcf
						 | 
						
							
							
								
								
								Reworked check for double encoded Diaspora signatures
							
							
							
							
							
						 | 
						
							2016-01-20 16:00:43 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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
								
							 
						 | 
						
							
							
								
							
							
	d5e1f33506
						 | 
						
							
							
								
								
								OEmbed and parse_url are now cached in dedicated tables
							
							
							
							
							
						 | 
						
							2016-01-14 23:59:51 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c4ba035ee3
						 | 
						
							
							
								
								
								Add some analysing stuff, rendered value is written now more often
							
							
							
							
							
						 | 
						
							2016-01-14 21:56:37 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2bad2cdd91
						 | 
						
							
							
								
								
								More fields in gcontact, contact search respects "hide" setting
							
							
							
							
							
						 | 
						
							2016-01-06 14:13:59 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	75e2ec01fe
						 | 
						
							
							
								
								
								The gcontact will now be connected to the items
							
							
							
							
							
						 | 
						
							2016-01-05 15:34:27 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c8449e6019
						 | 
						
							
							
								
								
								Code cleanup
							
							
							
							
							
						 | 
						
							2016-01-04 20:41:24 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	fba08409b4
						 | 
						
							
							
								
								
								Some more places that need to be adjusted
							
							
							
							
							
						 | 
						
							2016-01-03 00:28:11 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6c3d0f82c2
						 | 
						
							
							
								
								
								Bugfix: The duplicate check for likes wasn't reliable
							
							
							
							
							
						 | 
						
							2016-01-03 00:17:28 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	3df5c17124
						 | 
						
							
							
								
								
								reformat todo according to doxygen style
							
							
							
							
							
						 | 
						
							2015-12-25 23:17:34 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	f42a7a3469
						 | 
						
							
							
								
								
								Just one more place where we had forgotten to use the bbcode function for the about text
							
							
							
							
							
						 | 
						
							2015-12-15 00:11:19 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	1a170c8743
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
							
							
							
							
							
							
							
							Conflicts:
	mod/contacts.php
	mod/crepair.php 
							
						 | 
						
							2015-12-03 14:38:04 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b0898cc461
						 | 
						
							
							
								
								
								Bugfix: The duplicate check sometimes seemed to have scrambled the posts
							
							
							
							
							
						 | 
						
							2015-11-30 23:13:56 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	79092f149c
						 | 
						
							
							
								
								
								Requests for soapbox and freelove accounts are automatically accepted
							
							
							
							
							
						 | 
						
							2015-11-28 01:03:26 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	a9b2b48d08
						 | 
						
							
							
								
								
								Some small improvements to the OStatus export
							
							
							
							
							
						 | 
						
							2015-11-27 23:16:54 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6b5ea74bbd
						 | 
						
							
							
								
								
								Deactivated some attachment part in the old functions
							
							
							
							
							
						 | 
						
							2015-11-25 08:28:17 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b53ae0d42a
						 | 
						
							
							
								
								
								Bugfix: The own avatar was (sometimes?) changed back when it was changed.
							
							
							
							
							
						 | 
						
							2015-11-17 08:39:09 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6ddf62bdf7
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1511-avatar
							
							
							
							
							
						 | 
						
							2015-11-13 09:48:34 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c951123b76
						 | 
						
							
							
								
								
								Cleaned code
							
							
							
							
							
						 | 
						
							2015-11-13 09:45:15 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	11905c0bec
						 | 
						
							
							
								
								
								The avatar picture wasn't updated at the contact table
							
							
							
							
							
						 | 
						
							2015-11-13 08:45:14 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c95afa525e
						 | 
						
							
							
								
								
								Some SQL queries were optimized to reduce the amount of write operations.
							
							
							
							
							
						 | 
						
							2015-11-12 08:59:29 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ecf65e52ee
						 | 
						
							
							
								
								
								OStatus: send the coordinates in an additional field
							
							
							
							
							
						 | 
						
							2015-10-24 20:42:47 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7f9711ffe6
						 | 
						
							
							
								
								
								Delete event when the item is deleted
							
							
							
							
							
						 | 
						
							2015-10-17 01:25:25 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	dd46a6ff68
						 | 
						
							
							
								
								
								Store the event when a summary or a description is set
							
							
							
							
							
						 | 
						
							2015-10-17 00:58:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	fcc185a182
						 | 
						
							
							
								
								
								Unsure to store the guid with new events
							
							
							
							
							
						 | 
						
							2015-10-16 23:50:34 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	649578ae33
						 | 
						
							
							
								
								
								Merge develop-new into event-attendance-new
							
							
							
							
							
							
							
							Conflicts:
	include/conversation.php 
							
						 | 
						
							2015-10-11 19:39:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	9e2b62b082
						 | 
						
							
							
								
								
								Merge pull request #1948 from annando/1510-more-escaping
							
							
							
							
							
							
							
							Handling contact names with > and < 
							
						 | 
						
							2015-10-10 18:48:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ba06d659f1
						 | 
						
							
							
								
								
								Bugfix: Feeds weren't imported if a post with the same URI existed.
							
							
							
							
							
						 | 
						
							2015-10-10 14:26:07 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |