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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						2e56e11482 
					 
					
						
						
							
							Note explicitly that you can pass null to Notice::inScope()  
						
						
						
						
					 
					
						2011-03-29 17:01:53 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						674e3c2a0e 
					 
					
						
						
							
							Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	actions/apistatusesretweet.php
	actions/repeat.php
	classes/Notice.php
	lib/command.php 
						
						
					 
					
						2011-03-29 16:26:20 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9adbb49fc9 
					 
					
						
						
							
							Consolidate some precondition checks for repeats, fix a couple bits in the repeat command.  
						
						... 
						
						
						
						Notice::saveNew() now does these checks directly when making a repeat:
* make sure the original is valid and existing
* stop you from repeating your own message
* stop you from repeating something you've previously repeated
* prevent repeats of any non-public messages
* explicit inScope() check to make sure you can read the original too (just in case there's a funky extension at play that changes scoping rules)
These error conditions throw exceptions, which the caller either uses as an error message or passes on up the stack, without having to duplicate the checks in each i/o channel. 
						
						
					 
					
						2011-03-29 16:20:12 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						8286edce28 
					 
					
						
						
							
							fix regression in group join approval due to refactoring (forgot to remove a param)  
						
						
						
						
					 
					
						2011-03-29 16:18:51 -07:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						0a19674c9f 
					 
					
						
						
							
							@evan Fixed message domain for messages in plugins for recent commits.  
						
						... 
						
						
						
						Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace. 
						
						
					 
					
						2011-03-30 00:48:41 +02:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9f1603462d 
					 
					
						
						
							
							Merge branch 'limitdist2' into 1.0.x  
						
						
						
						
					 
					
						2011-03-29 17:32:17 -04:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						31fd4dbe3b 
					 
					
						
						
							
							Repeats keep the same scope as parent  
						
						
						
						
					 
					
						2011-03-29 12:12:08 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						32145484c2 
					 
					
						
						
							
							Disallow repeats (retweets) of private notices  
						
						... 
						
						
						
						We disallow repeating a notice (or whatever) if the scope of the
notice is too private. So, only notices that are public scope
(available to everyone in the world) or site scope (available to
everyone on the site) can be repeated.
Enforce this rule at a low level in Notice.php, and in the API,
commands, and Web UI. Repeat button doesn't appear on tightly-scoped
notices in the Web UI. 
						
						
					 
					
						2011-03-29 11:53:26 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e862dcdb8a 
					 
					
						
						
							
							Merge branch '1.0.x' into limitdist2  
						
						
						
						
					 
					
						2011-03-28 21:56:34 -04:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						c1683d9925 
					 
					
						
						
							
							Durr... got items in wrong order :D Fixed email notification for pending subscribes  
						
						
						
						
					 
					
						2011-03-28 17:22:37 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						5d31dd259a 
					 
					
						
						
							
							Subscription pending notification mail  
						
						
						
						
					 
					
						2011-03-28 17:15:48 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						e5b5c256a3 
					 
					
						
						
							
							Working subscription approval!  
						
						
						
						
					 
					
						2011-03-28 17:08:04 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						a70e68e09c 
					 
					
						
						
							
							Work in progress: can create & cancel sub requests  
						
						
						
						
					 
					
						2011-03-28 16:12:51 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						df5def8ce4 
					 
					
						
						
							
							Work in progress: subscription approval policy field in place on user, hooked up to settings. Queue not 100% tidied up, no UI for queue or management yet.  
						
						
						
						
					 
					
						2011-03-28 15:13:59 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						11b40ddb1b 
					 
					
						
						
							
							work in progress...  
						
						
						
						
					 
					
						2011-03-28 13:59:48 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4eb02c624e 
					 
					
						
						
							
							Subscription_queue class for subscription approval  
						
						
						
						
					 
					
						2011-03-28 13:59:48 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b0deaad700 
					 
					
						
						
							
							Add a check to prevent replying to an unscoped notice  
						
						
						
						
					 
					
						2011-03-28 12:01:08 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e11c69fd81 
					 
					
						
						
							
							always allow author to see own notices  
						
						
						
						
					 
					
						2011-03-26 16:47:18 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						82b38b62a4 
					 
					
						
						
							
							clearer scope rules for anonymous and author  
						
						
						
						
					 
					
						2011-03-26 16:23:20 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c7f866b032 
					 
					
						
						
							
							Caller can set scope for Notice::saveNew()  
						
						
						
						
					 
					
						2011-03-26 15:49:46 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0c3f8208cd 
					 
					
						
						
							
							Merge branch 'limitdist' into limitdist2  
						
						
						
						
					 
					
						2011-03-25 11:46:49 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						44bcc942b8 
					 
					
						
						
							
							Break up stream code to use separate notice stream classes  
						
						... 
						
						
						
						Rearchitect (again!) notice stream code to delegate different functionality up and down the stack.
Now, different classes implement NoticeStream. 
						
						
					 
					
						2011-03-24 18:04:19 -04:00