Samantha Doherty
							
						 
					 | 
					
						
						
							
						
						13e2acaf5c
					 | 
					
						
						
							
							Formatting for profile/group account blocks and entity action buttons.
						
						
						
						
						
						
					 | 
					
						2011-04-11 10:05:36 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shashi Gowda
							
						 
					 | 
					
						
						
							
						
						f47027abbe
					 | 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
						
						
						
						
						
						
						
						Conflicts:
	lib/profileblock.php
	theme/default/css/display.css 
						
						
					 | 
					
						2011-04-09 21:57:45 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						285c2ee72d
					 | 
					
						
						
							
							Remove debugging statement
						
						
						
						
						
						
					 | 
					
						2011-04-08 17:41:40 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						3022d711e3
					 | 
					
						
						
							
							Add some more events to aside profile blocks and rework a bit
						
						
						
						
						
						
					 | 
					
						2011-04-08 15:45:49 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shashi Gowda
							
						 
					 | 
					
						
						
							
						
						5a2bab07b2
					 | 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
						
						
						
						
						
						
						
						Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js 
						
						
					 | 
					
						2011-03-30 15:47:42 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Siebrand Mazeland
							
						 
					 | 
					
						
						
							
						
						700018fd09
					 | 
					
						
						
							
							L10n/i18n updated.
						
						
						
						
						
						
						
						Translator documentation updated.
FIXME added for missing class documentation.
Various documentation tweaks. 
						
						
					 | 
					
						2011-03-29 23:00:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						a70e68e09c
					 | 
					
						
						
							
							Work in progress: can create & cancel sub requests
						
						
						
						
						
						
					 | 
					
						2011-03-28 16:12:51 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shashi Gowda
							
						 
					 | 
					
						
						
							
						
						f81aaa5375
					 | 
					
						
						
							
							Blend people tags UI into the new theme!
						
						
						
						
						
						
					 | 
					
						2011-03-22 12:18:12 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shashi Gowda
							
						 
					 | 
					
						
						
							
						
						31c1177970
					 | 
					
						
						
							
							Merge branch '1.0.x' into people_tags_rebase
						
						
						
						
						
						
						
						Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php 
						
						
					 | 
					
						2011-03-22 07:56:25 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						3692a09095
					 | 
					
						
						
							
							Extended profile - add nav link to new profile block
						
						
						
						
						
						
					 | 
					
						2011-03-16 10:30:57 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						410ca34ce9
					 | 
					
						
						
							
							remove edit link from profileblock
						
						
						
						
						
						
					 | 
					
						2011-03-16 09:59:36 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						07d9cca004
					 | 
					
						
						
							
							fix bug with undefined variable
						
						
						
						
						
						
					 | 
					
						2011-03-16 09:57:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						3d68474e14
					 | 
					
						
						
							
							move UserProfile actions to account profile block
						
						
						
						
						
						
					 | 
					
						2011-03-16 09:57:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						e5133f8150
					 | 
					
						
						
							
							add accountprofileblock and make defaultprofileblock use it
						
						
						
						
						
						
					 | 
					
						2011-03-16 09:57:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |