Evan Prodromou 
							
						 
					 
					
						
						
							
						
						41dc9ca497 
					 
					
						
						
							
							Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	classes/Profile.php 
						
						
					 
					
						2011-04-14 18:28:03 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						70c8de4354 
					 
					
						
						
							
							Remove bogus parameters from function declaration (was throwing a warning)  
						
						
						
						
					 
					
						2011-04-14 15:07:54 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9208c94b29 
					 
					
						
						
							
							don't show private lists; correct link in header  
						
						
						
						
					 
					
						2011-04-14 17:27:26 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						90e6eab68e 
					 
					
						
						
							
							show user's lists in sidebar  
						
						
						
						
					 
					
						2011-04-14 16:57:50 -04:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						82f90ad756 
					 
					
						
						
							
							Profile_list::blowNoticeStreamCache  
						
						
						
						
					 
					
						2011-04-14 19:49:42 +00:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						22f6151a10 
					 
					
						
						
							
							Annihilate profile_tag_inbox.  
						
						
						
						
					 
					
						2011-04-14 19:45:31 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3550afb5f0 
					 
					
						
						
							
							Cache rollup stuff in the cache, not in the DB  
						
						
						
						
					 
					
						2011-04-14 14:01:10 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a0b4282cbf 
					 
					
						
						
							
							hook for getting profile avatars  
						
						
						
						
					 
					
						2011-04-14 11:33:10 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4331b8b4f1 
					 
					
						
						
							
							make search results privacy-aware  
						
						
						
						
					 
					
						2011-04-11 18:59:58 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						61f62241da 
					 
					
						
						
							
							Get conversation root visible to this user in threadednoticelist  
						
						
						
						
					 
					
						2011-04-11 11:19:11 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f9a91a2809 
					 
					
						
						
							
							Utility Profile::current() to get current user's profile  
						
						
						
						
					 
					
						2011-04-11 11:16:30 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7c62835900 
					 
					
						
						
							
							cache the scope for null profile  
						
						
						
						
					 
					
						2011-04-10 19:19:10 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						91e5a72609 
					 
					
						
						
							
							remember to blow cache when creating a new group  
						
						
						
						
					 
					
						2011-04-10 19:17:44 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						543567e6d5 
					 
					
						
						
							
							Fix a null value in profile untag  
						
						
						
						
					 
					
						2011-04-10 19:01:20 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4742a2a87f 
					 
					
						
						
							
							Fix clone of null value  
						
						
						
						
					 
					
						2011-04-10 18:40:28 -04:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						f0d762f196 
					 
					
						
						
							
							Update/add translator documentation.  
						
						... 
						
						
						
						L10n/i18n updates.
Superfluous whitespace removed.
Add FIXME for a few i18n issues I couldn't solve this quickly.
Takes care of documentation for all core code added in merge of "people tags" feature (Commit:e75c9988ebe33822e493ac225859bc593ff9b855). 
						
						
					 
					
						2011-04-10 19:59:55 +02:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						fc21e5c76b 
					 
					
						
						
							
							Fix type conversion warnings caused when calling getUser / getProfile for the second time  
						
						
						
						
					 
					
						2011-04-09 22:16:52 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						4d61760154 
					 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase  
						
						
						
						
					 
					
						2011-04-08 17:16:20 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						731bdab804 
					 
					
						
						
							
							Use pkeyGet() instead of idStream() for fave caching  
						
						
						
						
					 
					
						2011-04-07 16:57:16 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						adf4d96013 
					 
					
						
						
							
							store oft-requested stuff in the data object  
						
						
						
						
					 
					
						2011-04-07 16:55:32 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3e4016b388 
					 
					
						
						
							
							do a short-term cache of notice scope  
						
						
						
						
					 
					
						2011-04-07 16:24:56 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						84d848f78c 
					 
					
						
						
							
							correctly return values  
						
						
						
						
					 
					
						2011-04-07 15:27:40 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5dfb8e2bc4 
					 
					
						
						
							
							Use InboxNoticeStream class for inbox  
						
						... 
						
						
						
						Move the code for inbox fetching to the InboxNoticeStream class. 
						
						
					 
					
						2011-04-07 14:54:42 -04:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						ad86eb78d3 
					 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase  
						
						... 
						
						
						
						Conflicts:
	js/util.min.js
	lib/default.php 
						
						
					 
					
						2011-04-07 23:13:45 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5b9319d081 
					 
					
						
						
							
							profiles were getting overwritten in Notice::asActivity()  
						
						
						
						
					 
					
						2011-04-07 10:52:28 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8a0f67b773 
					 
					
						
						
							
							Uninitialized value for attachments  
						
						
						
						
					 
					
						2011-04-07 10:25:53 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f9dc2fc0ab 
					 
					
						
						
							
							cache getReplies() values  
						
						
						
						
					 
					
						2011-04-06 23:46:51 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						419ae3f18d 
					 
					
						
						
							
							Cache results for attachments  
						
						
						
						
					 
					
						2011-04-06 23:33:35 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d3d0ec5ebe 
					 
					
						
						
							
							cache tags per notice  
						
						
						
						
					 
					
						2011-04-06 23:25:24 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						59d0e2f373 
					 
					
						
						
							
							cache the notice count for threaded view  
						
						
						
						
					 
					
						2011-04-06 23:17:17 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fa8592f50b 
					 
					
						
						
							
							Make Login_token use caching staticGet()  
						
						
						
						
					 
					
						2011-04-06 22:51:46 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b8fdf6636f 
					 
					
						
						
							
							make Group_block use caching staticGet()  
						
						
						
						
					 
					
						2011-04-06 22:49:09 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2a124c1397 
					 
					
						
						
							
							make User_group use caching staticGet()  
						
						
						
						
					 
					
						2011-04-06 22:48:33 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						44c64816a5 
					 
					
						
						
							
							cache groups per notice  
						
						
						
						
					 
					
						2011-04-06 22:47:17 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						29243cd21a 
					 
					
						
						
							
							make Profile::isMember() and Profile::isAdmin() use caching pkeyGet()  
						
						
						
						
					 
					
						2011-04-06 18:12:25 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b85c4923a2 
					 
					
						
						
							
							Remove unused and non-standard USER_AGENT constant from File_redirection  
						
						
						
						
					 
					
						2011-04-06 10:25:59 -04:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						14aef781ad 
					 
					
						
						
							
							Use the cool and new NoticeStream for people tag timeline  
						
						
						
						
					 
					
						2011-04-06 11:25:50 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b3e7dd70e2 
					 
					
						
						
							
							don't put bogus groups into the groups array  
						
						
						
						
					 
					
						2011-04-05 18:27:01 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						efd2c68de9 
					 
					
						
						
							
							cache groups per user  
						
						
						
						
					 
					
						2011-04-05 17:20:17 -04:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						ced00cf0bd 
					 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase  
						
						
						
						
					 
					
						2011-04-05 10:28:05 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						797cd9ccd4 
					 
					
						
						
							
							fix scope for replies to group-private notices  
						
						
						
						
					 
					
						2011-04-04 22:34:47 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						eaa70d337d 
					 
					
						
						
							
							force the reply to a notice to have the same scope  
						
						
						
						
					 
					
						2011-04-04 18:13:28 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						660f1cd6b8 
					 
					
						
						
							
							Force group scope on notices sent to a private-only group  
						
						... 
						
						
						
						For groups that require a private scope, we force every notice to be limited to group scope.
Changed the group-discovery code so we only get groups once -- regardless if they were provided or not. 
						
						
					 
					
						2011-04-04 17:33:42 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b41c62a27c 
					 
					
						
						
							
							single flag for private groups  
						
						
						
						
					 
					
						2011-04-04 16:58:52 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						82a357947d 
					 
					
						
						
							
							add force_scope flag to User_group  
						
						
						
						
					 
					
						2011-04-04 16:24:43 -04:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						57198a7464 
					 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase  
						
						... 
						
						
						
						Conflicts:
	actions/tagother.php
	lib/subscriberspeopleselftagcloudsection.php
	lib/subscriptionspeopleselftagcloudsection.php 
						
						
					 
					
						2011-04-04 13:26:27 +05:30 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						f64c312942 
					 
					
						
						
							
							Update translator documentation.  
						
						
						
						
					 
					
						2011-03-31 22:48:03 +02:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8333ac33c8 
					 
					
						
						
							
							if user has private stream flag, set that scope  
						
						
						
						
					 
					
						2011-03-31 12:56:53 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4f5355a9f2 
					 
					
						
						
							
							add the private_stream attribute to User  
						
						
						
						
					 
					
						2011-03-30 08:16:30 -04:00