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
								
							 
						 | 
						
							
							
								
							
							
	b8f6312408
						 | 
						
							
							
								
								
								cleanup after openid refactoring
							
							
							
							
							
						 | 
						
							2012-03-19 15:10:14 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	9e133d6412
						 | 
						
							
							
								
								
								refactor openid logins/registrations
							
							
							
							
							
						 | 
						
							2012-03-19 15:03:09 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	139a86dbd3
						 | 
						
							
							
								
								
								some openid fixes, use identity url from openid server and normalise it.
							
							
							
							
							
						 | 
						
							2012-03-19 06:48:11 -07: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
								
							 
						 | 
						
							
							
								
							
							
	4b6990e1ff
						 | 
						
							
							
								
								
								modularise successful authentication
							
							
							
							
							
						 | 
						
							2012-01-12 15:46:39 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	5b3f645939
						 | 
						
							
							
								
								
								account expiration structures
							
							
							
							
							
						 | 
						
							2011-09-18 19:53:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	8f6ae2b660
						 | 
						
							
							
								
								
								missing salmon key? report it.
							
							
							
							
							
						 | 
						
							2011-08-24 20:40:08 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	2637831d90
						 | 
						
							
							
								
								
								some more zot changes migrating back to f9a mainline
							
							
							
							
							
						 | 
						
							2011-08-01 21:02:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	78b2db3a98
						 | 
						
							
							
								
								
								Merge branch 'fabrixxm-master'
							
							
							
							
							
							
							
							Conflicts:
	boot.php 
							
						 | 
						
							2011-05-23 18:17:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	3e6180183b
						 | 
						
							
							
								
								
								improved browser language detect, set user language on login
							
							
							
							
							
						 | 
						
							2011-05-23 17:18:36 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	e1107b55c6
						 | 
						
							
							
								
								
								add info() function. Works like notice() but show messages in a div with class info-message.
							
							
							
							
							
							
							
							update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes 
							
						 | 
						
							2011-05-23 11:39:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	a0e7d8fa00
						 | 
						
							
							
								
								
								redirect to profile photo upload on very first login
							
							
							
							
							
						 | 
						
							2011-04-23 17:31:23 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	9f7878057f
						 | 
						
							
							
								
								
								update source strings
							
							
							
							
							
						 | 
						
							2011-03-11 00:22:21 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	377f991ac5
						 | 
						
							
							
								
								
								switch identities to manage pages
							
							
							
							
							
						 | 
						
							2011-03-01 20:18:47 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	5bfb0ba4c2
						 | 
						
							
							
								
								
								birthday notifications working
							
							
							
							
							
						 | 
						
							2011-01-13 20:28:33 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	f60f82727f
						 | 
						
							
							
								
								
								register/login timestamps
							
							
							
							
							
						 | 
						
							2010-12-16 16:35:45 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	62bb471ba0
						 | 
						
							
							
								
								
								localise login template, allow openid to be disabled
							
							
							
							
							
						 | 
						
							2010-11-28 20:58:23 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	dd52aec243
						 | 
						
							
							
								
								
								use optional openid photo for registration - if supplied
							
							
							
							
							
						 | 
						
							2010-11-23 20:56:20 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	90b601c3dd
						 | 
						
							
							
								
								
								openid registration
							
							
							
							
							
						 | 
						
							2010-11-17 20:35:50 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	875b31fb8e
						 | 
						
							
							
								
								
								openid logins working
							
							
							
							
							
						 | 
						
							2010-11-17 17:03:27 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |