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
								
							 
						 | 
						
							
							
								
							
							
	9df7972993
						 | 
						
							
							
								
								
								bug #339 - lostpass sending to username, not email
							
							
							
							
							
						 | 
						
							2012-03-20 01:50:20 -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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	2637831d90
						 | 
						
							
							
								
								
								some more zot changes migrating back to f9a mainline
							
							
							
							
							
						 | 
						
							2011-08-01 21:02:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	2a57847816
						 | 
						
							
							
								
								
								don't allow blocked/unverified users to reset their password.
							
							
							
							
							
						 | 
						
							2011-06-29 00:59:21 -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
								
							 
						 | 
						
							
							
								
							
							
	b2e92e0af3
						 | 
						
							
							
								
								
								deprecate load_view_file
							
							
							
							
							
						 | 
						
							2011-05-11 04:37:13 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	c052d68828
						 | 
						
							
							
								
								
								don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.
							
							
							
							
							
						 | 
						
							2011-05-10 16:12:50 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	de131c9e58
						 | 
						
							
							
								
								
								set utf-8 on all emails
							
							
							
							
							
						 | 
						
							2011-04-14 17:13:13 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	e35a5bac55
						 | 
						
							
							
								
								
								the rest of the english html templates except for htconfig
							
							
							
							
							
						 | 
						
							2011-04-07 23:10:43 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	4043ede080
						 | 
						
							
							
								
								
								more templates
							
							
							
							
							
						 | 
						
							2011-04-06 23:03:54 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	9f7878057f
						 | 
						
							
							
								
								
								update source strings
							
							
							
							
							
						 | 
						
							2011-03-11 00:22:21 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	9e35fb26f7
						 | 
						
							
							
								
								
								lint
							
							
							
							
							
						 | 
						
							2010-11-07 17:29:30 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	0f47ac282c
						 | 
						
							
							
								
								
								celebrity/group/community pages about 75% implemented
							
							
							
							
							
						 | 
						
							2010-10-17 20:04:17 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	d5a13b1e4c
						 | 
						
							
							
								
								
								localisation path for all view templates
							
							
							
							
							
						 | 
						
							2010-09-22 18:00:19 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	83ee7909cd
						 | 
						
							
							
								
								
								password reset
							
							
							
							
							
						 | 
						
							2010-07-18 01:24:51 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |