1fc35d5f44  
						 
						
							
							
								
								
								Merge pull request  #2979  from annando/issue-2772  
							
							... 
							
							
							
							Issue 2772: Pending contacts should now be displayed 
							
						 
						
							2016-12-01 08:51:04 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	63389ba23d  
						 
						
							
							
								
								
								Pending or blocked - that's the question ...  
							
							
							
						 
						
							2016-11-30 04:30:48 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	624fabf884  
						 
						
							
							
								
								
								Somehow the changes of pull request 2748 got vanished  
							
							
							
						 
						
							2016-11-29 20:25:27 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3a76a6766f  
						 
						
							
							
								
								
								Issue 2772: Pending contacts should now be displayed  
							
							
							
						 
						
							2016-11-28 22:11:13 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4937a3b7d8  
						 
						
							
							
								
								
								Add the self property to conversation responses  
							
							... 
							
							
							
							- Add a condition to check if the current user is amongst the responses
- Populate the responses array with the self attribute 
							
						 
						
							2016-11-22 18:35:19 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3de862712d  
						 
						
							
							
								
								
								Issue 2772: Posts from pending contacts should be displayed as well.  
							
							
							
						 
						
							2016-11-20 16:52:57 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4b0e76f3b7  
						 
						
							
							
								
								
								Fix Issue  #2803  - Hovercard view profile link and public directory link  
							
							... 
							
							
							
							- Change "Edit Contact" link to "View Contact" in `include/Contact.php`
and `include/conversation.php`
- Add zrl parameter to public directory on single user instances
- Improved formatting of modified functions 
							
						 
						
							2016-10-22 22:49:12 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	252f1827c1  
						 
						
							
							
								
								
								correction of typos  
							
							
							
						 
						
							2016-09-24 08:08:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	1cb6043aea  
						 
						
							
							
								
								
								Attachments are now displayed again.  
							
							
							
						 
						
							2016-09-04 18:06:07 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c02b1c3f36  
						 
						
							
							
								
								
								The "tagged with" message now works again.  
							
							
							
						 
						
							2016-09-03 12:48:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	c1555b623a  
						 
						
							
							
								
								
								best_link_url: don't use redirect for pending contacts  
							
							
							
						 
						
							2016-08-26 15:47:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0a46a3d10e  
						 
						
							
							
								
								
								Bugfix: Avatar pictures of mail contacts weren't displayed correctly  
							
							
							
						 
						
							2016-07-11 20:42:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	073f520cee  
						 
						
							
							
								
								
								add missing strings for frio  
							
							
							
						 
						
							2016-06-25 12:21:13 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0adff6f6b8  
						 
						
							
							
								
								
								Fix for author-thumb/owner-thumb - DFRN: Relocate stuff  
							
							
							
						 
						
							2016-06-19 20:01:25 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	91db7a549c  
						 
						
							
							
								
								
								Optimised the amount of function for the item query  
							
							
							
						 
						
							2016-06-19 08:32:38 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e512a83ecc  
						 
						
							
							
								
								
								Massively updated avatar handling  
							
							
							
						 
						
							2016-06-19 01:07:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7f5a2d5c23  
						 
						
							
							
								
								
								Categories were missing  
							
							
							
						 
						
							2016-06-14 09:50:17 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2815173a52  
						 
						
							
							
								
								
								Bugfix: Items weren't sorted correctly  
							
							
							
						 
						
							2016-06-13 22:20:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	125d80292b  
						 
						
							
							
								
								
								Some cleanup  
							
							
							
						 
						
							2016-06-12 23:06:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c05898c57d  
						 
						
							
							
								
								
								The queries for items are unified (a little bit)  
							
							
							
						 
						
							2016-06-12 21:04:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	3e7e866e13  
						 
						
							
							
								
								
								Baseurl removed  
							
							
							
						 
						
							2016-06-05 21:22:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ea3a6ec6eb  
						 
						
							
							
								
								
								Some more cleanup and code removal.  
							
							
							
						 
						
							2016-06-05 20:01:38 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	71d3274841  
						 
						
							
							
								
								
								Unified contact data handling  
							
							
							
						 
						
							2016-06-05 13:57:11 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4a388e84af  
						 
						
							
							
								
								
								Frio: Adopt changes to search_item.tpl as well.  
							
							
							
						 
						
							2016-05-28 13:08:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7d4c99ebbc  
						 
						
							
							
								
								
								"get_baseurl" and "z_root" are disappearing ...  
							
							
							
						 
						
							2016-02-17 23:47:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c5b724828a  
						 
						
							
							
								
								
								Just some more removed baseurls ...  
							
							
							
						 
						
							2016-02-17 08:08:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	092c2e5433  
						 
						
							
							
								
								
								Removed some test code  
							
							
							
						 
						
							2016-01-15 23:32:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	90a8d6f0f5  
						 
						
							
							
								
								
								Several performance improvements  
							
							
							
						 
						
							2016-01-15 23:27:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c4ba035ee3  
						 
						
							
							
								
								
								Add some analysing stuff, rendered value is written now more often  
							
							
							
						 
						
							2016-01-14 21:56:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	5758302f21  
						 
						
							
							
								
								
								small doxigen comment fix  
							
							
							
						 
						
							2016-01-02 12:53:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	143e1a4a83  
						 
						
							
							
								
								
								Bugfix: Warning because of undefined constant  
							
							
							
						 
						
							2015-12-13 09:43:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	42d903dd68  
						 
						
							
							
								
								
								Redesign of the contact pages, new tab for contact statuses  
							
							
							
						 
						
							2015-11-29 23:22:05 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	37f466d16e  
						 
						
							
							
								
								
								Prevention of endless loops in the conversation  
							
							
							
						 
						
							2015-11-18 23:57:53 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	642f3fca1a  
						 
						
							
							
								
								
								fix translation bug for likers  
							
							
							
						 
						
							2015-10-14 19:48:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	5c2923869a  
						 
						
							
							
								
								
								this got lost by merge  
							
							
							
						 
						
							2015-10-11 20:00:54 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	649578ae33  
						 
						
							
							
								
								
								Merge develop-new into event-attendance-new  
							
							... 
							
							
							
							Conflicts:
	include/conversation.php 
							
						 
						
							2015-10-11 19:39:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	48309a25ec  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu  
							
							... 
							
							
							
							Conflicts:
	include/conversation.php 
							
						 
						
							2015-10-11 05:11:46 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	27fa20ab22  
						 
						
							
							
								
								
								Merge pull request  #1947  from annando/1510-diaspora-follower  
							
							... 
							
							
							
							Reworked contact relations between Diaspora and Friendica 
							
						 
						
							2015-10-10 18:50:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	bb0dff2c75  
						 
						
							
							
								
								
								Improved contact menu  
							
							
							
						 
						
							2015-10-10 16:23:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	efbdb57f92  
						 
						
							
							
								
								
								Reworked contact relations between Friendica and Diaspora  
							
							
							
						 
						
							2015-10-10 11:06:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	0eae67ea48  
						 
						
							
							
								
								
								update attendance state on profile wall  
							
							
							
						 
						
							2015-10-09 14:20:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	16da708e07  
						 
						
							
							
								
								
								Contact names with ">" and "<" are a problem ...  
							
							
							
						 
						
							2015-10-09 07:39:38 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	ba1207e6e1  
						 
						
							
							
								
								
								translate attendance with localize_item()  
							
							
							
						 
						
							2015-10-08 22:23:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	61c3ce7a21  
						 
						
							
							
								
								
								Bugfix: The contact names had to be escaped  
							
							
							
						 
						
							2015-10-08 00:25:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	1f0b759e2f  
						 
						
							
							
								
								
								Added resize possibility to proxy function  
							
							
							
						 
						
							2015-10-07 08:25:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a663e4693f  
						 
						
							
							
								
								
								Further improvement of the contact menu  
							
							
							
						 
						
							2015-10-04 23:41:13 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b037f977fa  
						 
						
							
							
								
								
								The contact menu is now improved (for example a "Follow" link)  
							
							
							
						 
						
							2015-10-04 21:17:28 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	7cb4ea52fd  
						 
						
							
							
								
								
								port of the event attendance feature of red matrix with example implementation for vier theme.  
							
							
							
						 
						
							2015-09-30 16:58:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	2ff67ef5ed  
						 
						
							
							
								
								
								fixes like/dislike for photos  
							
							
							
						 
						
							2015-09-30 14:39:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	f5c7006f30  
						 
						
							
							
								
								
								rest of the consensus porting work and integration into friendica  
							
							... 
							
							
							
							Credits to Mike Macgirvin for the code 
							
						 
						
							2015-09-30 14:38:13 +02:00