Brion Vibber 
							
						 
					 
					
						
						
							
						
						4f63e3be7d 
					 
					
						
						
							
							Fix for ticket  #2804 : bad non-cache fallback code for dupe checks of prolific posters  
						
						... 
						
						
						
						The old code attempted to compare the value of the notice.created field against now() directly, which tends to explode in our current systems. now() comes up as the server/connection local timezone generally, while the created field is currently set as hardcoded UTC from the web servers. This would lead to breakage when we got a difference in seconds that's several hours off in either direction (depending on the local timezone). New code calculates a threshold by subtracting the number of seconds from the current UNIX timestamp and passing that in in correct format for a simple comparison. As a bonus, this should also be more efficient, as it should be able to follow the index on profile_id and created. 
						
						
					 
					
						2010-11-03 17:25:29 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						2692b5fc84 
					 
					
						
						
							
							Fix for ticket  #2853 : fix for some unknown MIME type error cases by adjusting the PEAR error handling temporarily around MIME_Type_Extension usage.  
						
						
						
						
					 
					
						2010-11-03 17:05:26 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b716d01a41 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-11-03 16:09:49 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b0d7900530 
					 
					
						
						
							
							Add getFancyName() to User_group to match the one on Profile: encapsulates the "fullname (nickname)" vs "nickname" logic and allows for localization of the parentheses in a common place.  
						
						
						
						
					 
					
						2010-11-03 12:53:51 -07:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						a65362f7fa 
					 
					
						
						
							
							Add context for different uses of "%1$s (%2$s)"  
						
						
						
						
					 
					
						2010-11-02 23:08:59 +01:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0229c22d23 
					 
					
						
						
							
							Merge branch '1.0.x' into schema-x  
						
						
						
						
					 
					
						2010-11-02 15:02:55 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						04ca706601 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	actions/confirmaddress.php
	actions/othersettings.php 
						
						
					 
					
						2010-11-02 15:02:10 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						426cda5e1f 
					 
					
						
						
							
							Alternate pretty-title tweaks for  #2668  
						
						
						
						
					 
					
						2010-11-02 13:42:44 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						62d4701148 
					 
					
						
						
							
							fix a couple bugs in Managed_DataObject  
						
						
						
						
					 
					
						2010-11-01 14:31:32 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						96521f38d2 
					 
					
						
						
							
							Fix for changed cache functions in code merged up from 0.9.x  
						
						
						
						
					 
					
						2010-10-29 16:31:25 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						e7c7fd39fc 
					 
					
						
						
							
							Merge branch '1.0.x' into schema-x  
						
						... 
						
						
						
						Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po 
						
						
					 
					
						2010-10-28 16:27:53 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b26eccf33c 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-10-28 16:26:34 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b5206fe6ca 
					 
					
						
						
							
							fall back to siteowner on bad nickname (Bug#2861)  
						
						
						
						
					 
					
						2010-10-28 10:46:57 -04:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b483a0549f 
					 
					
						
						
							
							Merge branch '1.0.x' into schema-x  
						
						... 
						
						
						
						Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po 
						
						
					 
					
						2010-10-25 13:14:33 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						ca489631db 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php 
						
						
					 
					
						2010-10-25 13:08:57 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b60b9b4fa2 
					 
					
						
						
							
							Merge branch '0.9.x' into atompub  
						
						
						
						
					 
					
						2010-10-25 11:18:56 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						aef88c7cee 
					 
					
						
						
							
							max_id is inclusive  
						
						
						
						
					 
					
						2010-10-25 11:18:49 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						75fcf1e081 
					 
					
						
						
							
							Merge branch '0.9.x' into atompub  
						
						
						
						
					 
					
						2010-10-25 11:09:11 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						968f9b0513 
					 
					
						
						
							
							change max_id from < to <=  
						
						
						
						
					 
					
						2010-10-25 11:08:53 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e51ed96b89 
					 
					
						
						
							
							add rel=self links to atom entries  
						
						
						
						
					 
					
						2010-10-25 09:48:01 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						698818bd7e 
					 
					
						
						
							
							show rel=edit links in notices for authenticated users  
						
						
						
						
					 
					
						2010-10-24 23:05:33 -04:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						0b6cc7c33d 
					 
					
						
						
							
							* translator documentation added.  
						
						... 
						
						
						
						* superfluous whitespace removed. 
						
						
					 
					
						2010-10-23 19:20:51 +02:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1d85bfece1 
					 
					
						
						
							
							New events when granting and revoking roles  
						
						... 
						
						
						
						Four new events for when roles are granted or revoked. 
						
						
					 
					
						2010-10-22 10:31:50 -04:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						8ac8f3d2dc 
					 
					
						
						
							
							Memcache::set() 3rd param should be flags (4th is expire). This throws a "2 lowest bytes reserved" error in Memcache > 3.0.3  
						
						
						
						
					 
					
						2010-10-21 12:20:14 -04:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						fb12094f61 
					 
					
						
						
							
							i18n/L10n updates, translator docs updated, superfluous whitespace removed.  
						
						
						
						
					 
					
						2010-10-21 03:10:46 +02:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						bfdb8385ec 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	actions/apioauthauthorize.php
	lib/apioauthstore.php 
						
						
					 
					
						2010-10-20 17:28:28 -07:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e56385a7bb 
					 
					
						
						
							
							Use a new table (oauth_token_association) to associate authorized  
						
						... 
						
						
						
						request tokins with OAuth client applications and profiles. 
						
						
					 
					
						2010-10-20 17:21:04 -07:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						28ec9d6463 
					 
					
						
						
							
							* translator documentation added.  
						
						... 
						
						
						
						* moved some translator comments that were not directly above the line with the message to the correct location.
* i18n for UI text.
* superfluous whitespace removed. 
						
						
					 
					
						2010-10-21 01:12:56 +02:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						8004e2809d 
					 
					
						
						
							
							Fix for ticket  #2845 : singleuser nickname configuration was being overridden by site owner in router setup.  
						
						... 
						
						
						
						I've consolidated the checks for which user to use for single-user mode into User::singleUser(), which now uses the configured nickname by preference, falling back to the site owner if it's unset.
This is now called consistently from the places that needed to use the primary user's nickname in routing setup.
Setting $config['singleuser']['nickname'] should now work again as expected. 
						
						
					 
					
						2010-10-20 14:34:25 -07:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						3d6a0f730d 
					 
					
						
						
							
							Revert DB change for OAuth. Change compound key for oauth_application_user  
						
						... 
						
						
						
						back to (profile_id, application_id). I think we can get away without
a DB change by only issuing one anonymous access token per user. 
						
						
					 
					
						2010-10-20 11:41:04 -07:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e8b6d7c946 
					 
					
						
						
							
							Add support for an anonymous OAuth consumer. Note: this requires a  
						
						... 
						
						
						
						small DB tweak.  Oauth_application_user needs to have the primary
compound key: (profile_id, application_id, token).
http://status.net/open-source/issues/2761 
This should also make it possible to have multiple access tokens
per application.
http://status.net/open-source/issues/2788  
						
						
					 
					
						2010-10-19 20:54:53 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4f7eae8702 
					 
					
						
						
							
							Add stub schema_version table  
						
						
						
						
					 
					
						2010-10-19 15:38:53 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4c3aebd396 
					 
					
						
						
							
							Merge branch '1.0.x' into schema-x  
						
						
						
						
					 
					
						2010-10-15 11:40:40 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						a7d98435f6 
					 
					
						
						
							
							Tweak DB query logging to also log queries that fail; the exceptions we get are often not very descriptive like "No such table" without saying which table. :)  
						
						
						
						
					 
					
						2010-10-15 11:26:06 -07:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						0721d8d3e2 
					 
					
						
						
							
							Merge remote branch 'statusnet/0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-10-14 15:27:17 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b31c49c5d4 
					 
					
						
						
							
							Make HTTPS urls in File::url() if necessary  
						
						
						
						
					 
					
						2010-10-14 14:22:17 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						97a7fb246c 
					 
					
						
						
							
							correctly use sslserver if it is set  
						
						
						
						
					 
					
						2010-10-14 01:35:11 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						aafd95dc0c 
					 
					
						
						
							
							Design::url() will use HTTPS if page is HTTPS  
						
						
						
						
					 
					
						2010-10-14 01:18:19 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						76038fe20c 
					 
					
						
						
							
							better deletion of related objects in User_group::delete()  
						
						
						
						
					 
					
						2010-10-13 22:44:06 -04:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4101de7dd7 
					 
					
						
						
							
							Merge branch '1.0.x' into schema-x  
						
						
						
						
					 
					
						2010-10-13 15:46:45 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						5f81f6119b 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-10-12 16:33:36 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						112b6c4079 
					 
					
						
						
							
							Improve cache-friendliness of user_group->delete().  
						
						... 
						
						
						
						Doesn't clear all possible cached entries, but this should get the ones that matter most: lookups by id, nickname, and alias. This should ensure that if a group name gets reused as a new group or alias, it should work properly.
There are some user-visible areas that aren't clear such as the 'top groups' lists on the GroupsAction sidebar; if a deleted group appears in those lists it'll go away within an hour when the cached query expires. 
						
						
					 
					
						2010-10-12 16:29:13 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3579ccac8e 
					 
					
						
						
							
							Cascading deletion for user_group; doesn't yet work properly with caching.  
						
						
						
						
					 
					
						2010-10-12 16:13:07 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						f4f16af8ac 
					 
					
						
						
							
							Add a basic group deletion for moderator users.  
						
						
						
						
					 
					
						2010-10-12 15:49:20 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						1cd60579f5 
					 
					
						
						
							
							Ticket  #2811  use more consistent max limit for OAuth application registration descriptions; now using the field max of 255 rather than $config['site']['textlimit'] as fallback if $config['application']['desclimit'] is unset or out of bounds.  
						
						
						
						
					 
					
						2010-10-11 12:52:32 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						1f4b168e69 
					 
					
						
						
							
							tweak for Managed_DataObject table defs  
						
						
						
						
					 
					
						2010-10-07 14:21:06 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						99194e03fa 
					 
					
						
						
							
							Merge branch '1.0.x' into schema-x  
						
						... 
						
						
						
						Conflicts:
	plugins/OStatus/classes/Ostatus_profile.php 
						
						
					 
					
						2010-10-06 17:16:13 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						8ff45823ba 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-10-05 11:40:49 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						d6b3d7fb1a 
					 
					
						
						
							
							Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc)  
						
						
						
						
					 
					
						2010-10-04 14:24:04 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						59119482ca 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php 
						
						
					 
					
						2010-10-04 12:54:36 -07:00