Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	1f0b759e2f
						 | 
						
							
							
								
								
								Added resize possibility to proxy function
							
							
							
							
							
						 | 
						
							2015-10-07 08:25:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	14e17b944f
						 | 
						
							
							
								
								
								Reworked fetching of contact data on "display" page
							
							
							
							
							
						 | 
						
							2015-10-06 18:31:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	eefedc019b
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy
							
							
							
							
							
						 | 
						
							2015-10-06 07:41:09 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	901b95e935
						 | 
						
							
							
								
								
								Hide some profile data if not connected.
							
							
							
							
							
						 | 
						
							2015-10-06 06:56:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7ed61b2edc
						 | 
						
							
							
								
								
								Removed "proxy_parse_html" since it is now done in the bbcode function.
							
							
							
							
							
						 | 
						
							2015-10-05 22:25:14 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	8a2d1fe301
						 | 
						
							
							
								
								
								Show RedMatrix and use the proxy for the profile pictures
							
							
							
							
							
						 | 
						
							2015-10-04 22:24:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	8c514307cf
						 | 
						
							
							
								
								
								For safety reasons include the include
							
							
							
							
							
						 | 
						
							2015-10-04 17:20:47 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4003b9cc5d
						 | 
						
							
							
								
								
								Let the notification look more like the follow dialog
							
							
							
							
							
						 | 
						
							2015-10-04 17:18:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	83ea4f7253
						 | 
						
							
							
								
								
								transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.
							
							
							
							
							
						 | 
						
							2015-10-04 15:55:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	d0ae5ce326
						 | 
						
							
							
								
								
								Show more information when following a new contact
							
							
							
							
							
						 | 
						
							2015-10-04 14:41:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c7b80b532a
						 | 
						
							
							
								
								
								Bugfix: The "about" field in the introductions should be send through bbcode
							
							
							
							
							
						 | 
						
							2015-09-25 17:47:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	a0f69dc92c
						 | 
						
							
							
								
								
								Contact requests now contain more information.
							
							
							
							
							
						 | 
						
							2015-08-12 08:07:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b4d09777b9
						 | 
						
							
							
								
								
								Added many accesskeys ...
							
							
							
							
							
						 | 
						
							2015-08-08 17:33:43 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	2d3437daa3
						 | 
						
							
							
								
								
								different help text for different network
							
							
							
							
							
						 | 
						
							2015-04-04 18:02:26 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Silke Meyer
								
							 
						 | 
						
							
							
								
							
							
	c05f95b54e
						 | 
						
							
							
								
								
								Improved help text, issue 1349.
							
							
							
							
							
						 | 
						
							2015-04-01 10:10:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Silke Meyer
								
							 
						 | 
						
							
							
								
							
							
	cdd3089444
						 | 
						
							
							
								
								
								Help text sounded too complicated
							
							
							
							
							
						 | 
						
							2015-02-04 16:43:31 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Silke Meyer
								
							 
						 | 
						
							
							
								
							
							
	6bccf0be79
						 | 
						
							
							
								
								
								Added help text as requested in #1349.
							
							
							
							
							
						 | 
						
							2015-02-04 16:13:07 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	f971f52482
						 | 
						
							
							
								
								
								remove messages link from notification tabs bar
							
							
							
							
							
						 | 
						
							2014-09-17 11:01:47 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ed1dce93d6
						 | 
						
							
							
								
								
								Usage of /display/(guid) as path instead of /display/(user)/(id)
							
							
							
							
							
							
							
							Bugfix for adding tags to photos 
							
						 | 
						
							2014-07-22 00:36:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6e7bd68ebb
						 | 
						
							
							
								
								
								More "LIMIT 1" removed - and some other SQL improvements.
							
							
							
							
							
						 | 
						
							2014-03-11 23:52:32 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	b0dd16696a
						 | 
						
							
							
								
								
								Solving some more SQL warnings ("limit" must never be used in update statements)
							
							
							
							
							
						 | 
						
							2013-12-02 20:30:24 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Olaf Conradi
								
							 
						 | 
						
							
							
								
							
							
	aa7aa59def
						 | 
						
							
							
								
								
								Fix SQL error for missing AND operator
							
							
							
							
							
							
							
							AND operator was missing from WHERE clause 
							
						 | 
						
							2013-03-03 20:44:52 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	263fe0f6bc
						 | 
						
							
							
								
								
								revert unnecessary variable name changes
							
							
							
							
							
						 | 
						
							2012-12-26 10:42:01 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	11c06e21b7
						 | 
						
							
							
								
								
								simplify by making Smarty include directives behave like Friendica native ones
							
							
							
							
							
						 | 
						
							2012-12-25 11:55:57 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	96ed0a7791
						 | 
						
							
							
								
								
								Implement Smarty3
							
							
							
							
							
						 | 
						
							2012-12-22 12:57:29 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	caebcc5e83
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2012-11-04 13:43:28 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	dec5298248
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2012-10-14 17:16:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	816db4396a
						 | 
						
							
							
								
								
								better fix for threads with no parent showing up as unseen
							
							
							
							
							
						 | 
						
							2012-10-10 16:17:40 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	bfb821e918
						 | 
						
							
							
								
								
								well that was a silly mistake...
							
							
							
							
							
						 | 
						
							2012-04-13 16:12:06 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	d1b57d6e74
						 | 
						
							
							
								
								
								setting wasn't being applied
							
							
							
							
							
						 | 
						
							2012-04-13 15:37:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	32cd62ff0a
						 | 
						
							
							
								
								
								allow setting default new friend notify
							
							
							
							
							
						 | 
						
							2012-04-12 18:15:46 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	7e2d4d4026
						 | 
						
							
							
								
								
								turn off new friend activity by default
							
							
							
							
							
						 | 
						
							2012-04-12 16:51:57 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Kampmann
								
							 
						 | 
						
							
							
								
							
							
	355c42cb30
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/friendica/friendica
							
							
							
							
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 | 
						
							2012-04-05 13:39:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	cfdfcb37cb
						 | 
						
							
							
								
								
								don't delete contact from a friend request if friendship was already established
							
							
							
							
							
						 | 
						
							2012-03-30 15:10:50 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	d83bfd464b
						 | 
						
							
							
								
								
								zrl into people searches
							
							
							
							
							
						 | 
						
							2012-03-29 22:20:14 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	a72a23b6d6
						 | 
						
							
							
								
								
								missed a default profile photo replacement in notifications
							
							
							
							
							
						 | 
						
							2012-03-20 15:43:34 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	894278dbcc
						 | 
						
							
							
								
								
								change default profile photo to something more interesting than a reddish brown square
							
							
							
							
							
						 | 
						
							2012-03-20 15:41:06 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	110e8f2919
						 | 
						
							
							
								
								
								basic ssl_policy for important modules
							
							
							
							
							
						 | 
						
							2012-03-14 21:20:20 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	65ddefe9c5
						 | 
						
							
							
								
								
								system notifications to notify module, untranslated string in notifications.tpl
							
							
							
							
							
						 | 
						
							2012-02-23 17:37:03 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	41636a50aa
						 | 
						
							
							
								
								
								new notify sort of working in testbubble
							
							
							
							
							
						 | 
						
							2012-02-22 23:34:30 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	76308eca67
						 | 
						
							
							
								
								
								add toggle to choose sending "friends with" activity even if contact is not hidden
							
							
							
							
							
						 | 
						
							2012-02-06 16:41:05 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	e2d0eb4a88
						 | 
						
							
							
								
								
								redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic
							
							
							
							
							
						 | 
						
							2012-01-24 18:59:55 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	8aa2552372
						 | 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
							
							
							
							
							
						 | 
						
							2012-01-18 16:21:30 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	c735582ead
						 | 
						
							
							
								
								
								hide contacts on approval
							
							
							
							
							
						 | 
						
							2011-12-29 00:23:05 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	0c24784f5e
						 | 
						
							
							
								
								
								include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours)
							
							
							
							
							
						 | 
						
							2011-12-06 15:24:01 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f1af2c224f
						 | 
						
							
							
								
								
								personal notifications
							
							
							
							
							
						 | 
						
							2011-11-30 22:26:02 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	5830682e0c
						 | 
						
							
							
								
								
								another fix to tabs in notifications
							
							
							
							
							
						 | 
						
							2011-10-17 17:14:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	a2dc8bad2e
						 | 
						
							
							
								
								
								fix tabs in notifications
							
							
							
							
							
						 | 
						
							2011-10-17 16:54:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	2116943964
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'friendika/master'
							
							
							
							
							
						 | 
						
							2011-10-17 16:37:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	df7702709b
						 | 
						
							
							
								
								
								common tabs to notifications and mail
							
							
							
							
							
						 | 
						
							2011-10-11 21:30:23 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |