Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9c0d2c31e8  
						 
						
							
							
								
								
								Replace AND and OR in PHP conditions by && and ||  
							
							
							
						 
						
							2017-06-07 22:00:59 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2c11e91e65  
						 
						
							
							
								
								
								The first queries are replaced with the new functions. More to come ...  
							
							
							
						 
						
							2017-05-07 20:52:00 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	1d427aa214  
						 
						
							
							
								
								
								Standards: Remove EOF closing PHP tags  
							
							
							
						 
						
							2017-05-02 23:36:56 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	7b352f3f74  
						 
						
							
							
								
								
								Revert "Coding convention applied - part 1"  
							
							
							
						 
						
							2017-03-21 12:02:59 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	c2d8738285 
 
						 
						
							
							
								
								
								added spaces (coding convention)  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:51:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	cc86d8ea14  
						 
						
							
							
								
								
								Language data won't be displayed anymore (it was experimental stuff)  
							
							
							
						 
						
							2017-02-27 23:59:05 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	9ca789b952 
 
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-12-31 17:59:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	93666b5a8d  
						 
						
							
							
								
								
								Disable some features  
							
							
							
						 
						
							2016-12-30 22:54:16 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ce4c542e37  
						 
						
							
							
								
								
								Support for threaded comments  
							
							
							
						 
						
							2016-12-27 12:59:15 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ad20c5504d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/diaspora.php
	object/Item.php 
							
						 
						
							2016-12-22 11:33:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c0df692f5f  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/diaspora.php
	object/Item.php 
							
						 
						
							2016-12-22 11:29:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5d0db51fdf  
						 
						
							
							
								
								
								Beatification/coding convention:  
							
							... 
							
							
							
							- added a lot spaces to make it look nicer
- added curly braces (coding convention)
- added needed spaces (coding convention)get_id
- removed obsolete $a = get_app() call
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-22 11:22:07 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	41da37ae67  
						 
						
							
							
								
								
								Beatification/coding convention:  
							
							... 
							
							
							
							- added a lot spaces to make it look nicer
- added curly braces (coding convention)
- added needed spaces (coding convention)get_id
- removed obsolete $a = get_app() call
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-22 11:21:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	e8e1f9253d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links  
							
							... 
							
							
							
							# Conflicts:
#	include/follow.php 
							
						 
						
							2016-12-20 12:50:36 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4a7c3b9eef  
						 
						
							
							
								
								
								Diaspora: Fix class name case + add self  
							
							
							
						 
						
							2016-12-20 12:44:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	65e1cd728c  
						 
						
							
							
								
								
								Coding convention:  
							
							... 
							
							
							
							- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 10:40:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a5e4882e25  
						 
						
							
							
								
								
								Coding convention:  
							
							... 
							
							
							
							- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 10:35:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6a8a36f12d  
						 
						
							
							
								
								
								More usage of dbm::is_result($r) instead of count($r):  
							
							... 
							
							
							
							- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-13 10:44:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c02b1c3f36  
						 
						
							
							
								
								
								The "tagged with" message now works again.  
							
							
							
						 
						
							2016-09-03 12:48:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0a46a3d10e  
						 
						
							
							
								
								
								Bugfix: Avatar pictures of mail contacts weren't displayed correctly  
							
							
							
						 
						
							2016-07-11 20:42:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e512a83ecc  
						 
						
							
							
								
								
								Massively updated avatar handling  
							
							
							
						 
						
							2016-06-19 01:07:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	098a8ac6c2  
						 
						
							
							
								
								
								Bugfix: In threads the contact data from users weren't taken.  
							
							
							
						 
						
							2016-06-08 22:50:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4b640dbd97  
						 
						
							
							
								
								
								Fetching of profile data improved  
							
							
							
						 
						
							2016-06-05 21:17:55 +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 
								
							 
						 
						
							
							
								
							
							
	56cb6cc897  
						 
						
							
							
								
								
								Removed just more old diaspora function calls.  
							
							
							
						 
						
							2016-03-14 20:53:44 +01: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 
								
							 
						 
						
							
							
								
							
							
	f7537c9e90  
						 
						
							
							
								
								
								Remove the baseurl where possible to avoid mixed content  
							
							
							
						 
						
							2016-02-17 00:01:24 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	316276cb6d  
						 
						
							
							
								
								
								Editing an item with an event is now opeing the event edit form.  
							
							
							
						 
						
							2015-10-17 08:27:33 +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 
								
							 
						 
						
							
							
								
							
							
	16da708e07  
						 
						
							
							
								
								
								Contact names with ">" and "<" are a problem ...  
							
							
							
						 
						
							2015-10-09 07:39:38 +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 
								
							 
						 
						
							
							
								
							
							
	d0ae5ce326  
						 
						
							
							
								
								
								Show more information when following a new contact  
							
							
							
						 
						
							2015-10-04 14:41:39 +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 
								
							 
						 
						
							
							
								
							
							
	a13280ac4a  
						 
						
							
							
								
								
								revert little rebase mistake  
							
							
							
						 
						
							2015-09-30 15:30:13 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	0077494396  
						 
						
							
							
								
								
								make event confirmation work  
							
							
							
						 
						
							2015-09-30 14:35:17 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	37fccee503  
						 
						
							
							
								
								
								first work for consensus  
							
							
							
						 
						
							2015-09-30 14:34:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	fca8aecc9b  
						 
						
							
							
								
								
								Show "Redmatrix" as network name.  
							
							
							
						 
						
							2015-07-16 10:09:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	179201d2bf  
						 
						
							
							
								
								
								Merge pull request  #1750  from annando/1507-contact-update  
							
							... 
							
							
							
							Automatic contact update 
							
						 
						
							2015-07-12 15:32:29 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c8fdff32b3  
						 
						
							
							
								
								
								Likes do federate ...  
							
							
							
						 
						
							2015-07-12 14:57:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0ac75deee1  
						 
						
							
							
								
								
								Some precaution to avoid overwriting of existing data with blanks  
							
							
							
						 
						
							2015-07-12 11:19:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d55275f211  
						 
						
							
							
								
								
								GUID should be urlencoded in template since it is urlencoded in uri as well.  
							
							
							
						 
						
							2015-07-11 14:37:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	836432bb9a  
						 
						
							
							
								
								
								Removed Google Maps  
							
							
							
						 
						
							2015-06-30 07:42:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8e19d36d27  
						 
						
							
							
								
								
								Exchanged the hard coded comparism with the new function.  
							
							
							
						 
						
							2015-04-25 11:08:53 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	1048be1dd0  
						 
						
							
							
								
								
								Liking of "red" comments is now possible.  
							
							
							
						 
						
							2015-04-06 13:22:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	56f0af2067  
						 
						
							
							
								
								
								The "ignore" feature can be disabled and enabled, the value will now be retrieved.  
							
							
							
						 
						
							2014-09-04 01:27:28 +02:00