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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						b9177f5e2e 
					 
					
						
						
							
							* i18n/L10n and translator documentation updates.  
						
						 
						
						... 
						
						
						
						* whitespace and indentation updates 
						
						
					 
					
						2010-09-29 00:39:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						8c94ebf537 
					 
					
						
						
							
							* update/add translator documentation  
						
						 
						
						... 
						
						
						
						* remove superfluous whitespace 
						
						
					 
					
						2010-09-13 21:10:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4419e43f7f 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	EVENTS.txt
	plugins/TwitterBridge/daemons/twitterstatusfetcher.php
	plugins/TwitterBridge/twitterbasicauthclient.php 
						
						
					 
					
						2010-09-09 15:01:03 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						338aa4bf1d 
					 
					
						
						
							
							Merge branch 'apinamespace' into 0.9.x  
						
						 
						
						
						
						
					 
					
						2010-09-07 16:39:43 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0cfaae48a3 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						 
						
						
						
						
					 
					
						2010-08-16 16:56:27 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ed8d8eb5ee 
					 
					
						
						
							
							hooks to allow changing RSS content  
						
						 
						
						
						
						
					 
					
						2010-08-13 11:44:26 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9f0715a993 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						 
						
						
						
						
					 
					
						2010-08-03 16:05:03 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						0faa988e91 
					 
					
						
						
							
							Fix for issue ID 2290: make sure errors are returned in the right  
						
						 
						
						... 
						
						
						
						format, and use callback for errors when the request is JSONP 
						
						
					 
					
						2010-07-29 20:31:22 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						65862d8f7f 
					 
					
						
						
							
							Suppress HTTP error headers for JSONP API output  
						
						 
						
						
						
						
					 
					
						2010-07-16 14:40:22 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						453a06fff4 
					 
					
						
						
							
							Exceptions are caught and continued on JSON, XML, Atom and RSS output in API  
						
						 
						
						
						
						
					 
					
						2010-07-13 11:11:29 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						dfd65a4290 
					 
					
						
						
							
							push exception on missing profile down to Notice::getProfile()  
						
						 
						
						
						
						
					 
					
						2010-07-13 10:51:25 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ab149755b6 
					 
					
						
						
							
							handle notices without profiles better in RSS output  
						
						 
						
						
						
						
					 
					
						2010-07-13 10:42:06 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						923d9ef71c 
					 
					
						
						
							
							- Fix bugs with block and friendship API methods  
						
						 
						
						... 
						
						
						
						- Friendship API methods now use a Profile instead of User for target 
						
						
					 
					
						2010-06-28 16:54:39 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						00e129b013 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						 
						
						
						
						
					 
					
						2010-06-26 10:18:03 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						696e4ba393 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	plugins/OpenID/openidserver.php (cleaned up mismatched comment) 
						
						
					 
					
						2010-06-26 10:17:36 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						1eec7f779f 
					 
					
						
						
							
							- Add profile_info tag to Atom author  
						
						 
						
						... 
						
						
						
						- Normalize xmlns:statusnet links in the API 
						
						
					 
					
						2010-06-22 16:28:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						d3d499879c 
					 
					
						
						
							
							- More useful group info from api/statusnet/group/show  
						
						 
						
						... 
						
						
						
						- Add statusnet:group_info tag to group Atom feeds 
						
						
					 
					
						2010-06-16 14:29:24 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						004200f958 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						 
						
						
						
						
					 
					
						2010-06-11 12:09:55 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						7f3b3620af 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x  
						
						 
						
						
						
						
					 
					
						2010-06-11 12:05:53 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b1a68e15b7 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?) 
						
						
					 
					
						2010-06-10 15:37:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						6317f7d92b 
					 
					
						
						
							
							Assigning my copyrights to the Free Software Foundation  
						
						 
						
						
						
						
					 
					
						2010-05-27 18:27:33 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6d8e01ad13 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline  
						
						 
						
						
						
						
					 
					
						2010-05-21 16:47:57 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						5ea019c41a 
					 
					
						
						
							
							Remove errant double HTML entity encoding in API source attribution  
						
						 
						
						
						
						
					 
					
						2010-05-18 15:16:23 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						0dfef88cac 
					 
					
						
						
							
							HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them  
						
						 
						
						
						
						
					 
					
						2010-05-18 15:15:52 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						c78f67aa73 
					 
					
						
						
							
							Refactor and centralize notice source link calculation  
						
						 
						
						
						
						
					 
					
						2010-05-18 15:15:27 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						da18701394 
					 
					
						
						
							
							Fix for repeats from the API having null source attribution  
						
						 
						
						
						
						
					 
					
						2010-05-07 17:22:16 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						fba140f4e0 
					 
					
						
						
							
							Fix for repeats from the API having null source attribution  
						
						 
						
						
						
						
					 
					
						2010-05-08 00:07:42 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						3c9686e80f 
					 
					
						
						
							
							Fix for repeats from the API having null source attribution  
						
						 
						
						
						
						
					 
					
						2010-05-07 16:32:24 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						06a63b0404 
					 
					
						
						
							
							Finish api/statusnet/groups/update  
						
						 
						
						
						
						
					 
					
						2010-05-07 10:10:30 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						869bc32d0d 
					 
					
						
						
							
							Remove errant double HTML entity encoding in API source attribution  
						
						 
						
						
						
						
					 
					
						2010-05-06 21:48:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						209fd12cd0 
					 
					
						
						
							
							HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them  
						
						 
						
						
						
						
					 
					
						2010-05-06 21:48:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						22fde00def 
					 
					
						
						
							
							Refactor and centralize notice source link calculation  
						
						 
						
						
						
						
					 
					
						2010-05-06 21:48:11 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						93e76f3b83 
					 
					
						
						
							
							use statusnet_ as namespace prefix for JSON  
						
						 
						
						
						
						
					 
					
						2010-04-24 12:14:12 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						f852a1931b 
					 
					
						
						
							
							Add docs for public_timeline  
						
						 
						
						
						
						
					 
					
						2010-04-22 15:48:58 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						1b561065b0 
					 
					
						
						
							
							Some initial Doxygen-based documentation for the API  
						
						 
						
						
						
						
					 
					
						2010-04-22 13:11:49 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						beaecb18d5 
					 
					
						
						
							
							Add statusnet: prefix for API to JSON and XML output  
						
						 
						
						... 
						
						
						
						I added the statusnet: prefix to the xml output. This prefix should
be declared on the root element of all relevant XML output.
I also added two StatusNet-specific fields:
* statusnet:html - rendered HTML. Clients shouldn't have to guess
  at the correct HTML rendering for notices, especially since some
  of the links depend on context.
* statusnet:profile_url - profile URL for a user. You can't count
  on a user being a local user in a distributed microblogging world.
  So, this shows the explicit profile_url. 
						
						
					 
					
						2010-04-22 08:49:33 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						1081b06bbe 
					 
					
						
						
							
							Allow cross-site ajax with CORS.  
						
						 
						
						... 
						
						
						
						Only allows un-credentialed (as in, no cookies or basic auth), no custom headers, and get (no post, put, delete, etc) requests. 
						
						
					 
					
						2010-04-15 12:52:59 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						9b788471d4 
					 
					
						
						
							
							Add translator documentation.  
						
						 
						
						
						
						
					 
					
						2010-04-10 22:50:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0284e1315c 
					 
					
						
						
							
							Quick fixes for grouplistall:  
						
						 
						
						... 
						
						
						
						* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it) 
						
						
					 
					
						2010-03-30 11:45:35 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						ca897ef346 
					 
					
						
						
							
							Quick fixes for grouplistall:  
						
						 
						
						... 
						
						
						
						* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it) 
						
						
					 
					
						2010-03-30 11:10:29 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						a954fd65ba 
					 
					
						
						
							
							Fix for API group methods, caused failure or output corruption when pulling up local groups by name in api/statusnet/groups/is_member.json/xml  
						
						 
						
						
						
						
					 
					
						2010-03-24 13:36:57 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						3dc84dd02d 
					 
					
						
						
							
							Output enclosing geo elements and GeoRSS xmlns in XML timelines  
						
						 
						
						
						
						
					 
					
						2010-03-12 05:39:36 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						13556e7ba9 
					 
					
						
						
							
							Add Atom self link to tag timeline  
						
						 
						
						
						
						
					 
					
						2010-03-12 04:08:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e1537d8387 
					 
					
						
						
							
							More generalized method for calculating Atom rel="self" links  
						
						 
						
						
						
						
					 
					
						2010-03-12 01:40:52 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						78f0d6bbd2 
					 
					
						
						
							
							Scrub all atom output with common_xml_safe_str()  
						
						 
						
						
						
						
					 
					
						2010-03-12 01:12:30 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						7e1a1506f5 
					 
					
						
						
							
							Output self link in rss2 feeds, if available  
						
						 
						
						
						
						
					 
					
						2010-03-11 23:28:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						023f258b63 
					 
					
						
						
							
							- Output georss xmlns in rss element  
						
						 
						
						... 
						
						
						
						- Only output geopoint in rss if one is set 
						
						
					 
					
						2010-03-11 23:05:56 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0ddd1ef191 
					 
					
						
						
							
							Ignore API 'since' silently as Twitter does instead of throwing a 403 error. Getting extra results is less disruptive than total failure.  
						
						 
						
						... 
						
						
						
						Threw in an X-StatusNet-Warning header on the off chance some API client developer notices it. :) 
						
						
					 
					
						2010-03-04 08:55:36 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						09705a1e98 
					 
					
						
						
							
							stupid mistake... let's not talk about this.  
						
						 
						
						
						
						
					 
					
						2010-03-02 14:25:27 -08:00