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
								
							 
						 | 
						
							
							
								
							
							
	61246cbd1c
						 | 
						
							
							
								
								
								some zot-id infrastructure
							
							
							
							
							
						 | 
						
							2012-01-29 15:47:25 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	2637831d90
						 | 
						
							
							
								
								
								some more zot changes migrating back to f9a mainline
							
							
							
							
							
						 | 
						
							2011-08-01 21:02:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	e33b6e0b5a
						 | 
						
							
							
								
								
								redirect to symbolic rather than absolute URL locations
							
							
							
							
							
						 | 
						
							2011-04-01 00:59:10 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	d6a75a0391
						 | 
						
							
							
								
								
								secure profile redirect failed with duplex relationship
							
							
							
							
							
						 | 
						
							2010-12-25 13:51:39 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	e241c401cf
						 | 
						
							
							
								
								
								significantly enhanced profile security
							
							
							
							
							
						 | 
						
							2010-12-07 19:40:12 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	4d84a87ce4
						 | 
						
							
							
								
								
								cache result of (expensive) security check for visitor rights
							
							
							
							
							
							
							
							begin tightening x-profile security 
							
						 | 
						
							2010-12-02 21:09:55 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	ac824fe83e
						 | 
						
							
							
								
								
								eradicate redundant get_uid function
							
							
							
							
							
						 | 
						
							2010-10-18 14:34:59 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	511c761fec
						 | 
						
							
							
								
								
								group/community/celebrity pages
							
							
							
							
							
						 | 
						
							2010-10-18 00:43:49 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	c1fb819d34
						 | 
						
							
							
								
								
								mostly cosmetic
							
							
							
							
							
						 | 
						
							2010-10-13 02:47:32 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	2c96ad7739
						 | 
						
							
							
								
								
								tag each side of the duplex
							
							
							
							
							
						 | 
						
							2010-09-12 21:25:37 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	62fdf346ff
						 | 
						
							
							
								
								
								cleanup
							
							
							
							
							
						 | 
						
							2010-09-09 16:48:33 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	b49858b038
						 | 
						
							
							
								
								
								start on 2way comms, 2.0 dev
							
							
							
							
							
						 | 
						
							2010-09-02 00:31:11 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	e0045a43e2
						 | 
						
							
							
								
								
								mongo checkin, global directory, redir rework, location basics
							
							
							
							
							
						 | 
						
							2010-08-19 04:59:31 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	6348e70daa
						 | 
						
							
							
								
								
								Initial checkin
							
							
							
							
							
						 | 
						
							2010-07-01 16:48:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |