Zach Copley 
							
						 
					 
					
						
						
							
						
						297d603feb 
					 
					
						
						
							
							Update activity streams JSON to match spec  
						
						... 
						
						
						
						Squashed commit of the following:
commit 0722450267a1d0f4bdc2853f52a85b850329db73
Author: Zach Copley <zach@status.net >
Date:   Thu Aug 25 09:58:29 2011 -0700
    Updgrade activity object json
commit 882ba1dceaba8a0b3ec3513760aa09f68e41f270
Author: Zach Copley <zach@status.net >
Date:   Wed Aug 24 16:30:07 2011 -0700
    Update to the JSON activity serialization document
commit 121e441b314b93e184711c3dcc79ada69d429eba
Author: Zach Copley <zach@status.net >
Date:   Wed Aug 24 15:08:06 2011 -0700
    Output application/json instead of application/stream+json (at least for now)
commit e045e214bffe5e0ddeb0a42555d440b75ae4edde
Author: Zach Copley <zach@status.net >
Date:   Wed Aug 24 15:06:40 2011 -0700
    Update to use latest property names from the JSON activity spec 
						
						
					 
					
						2011-08-25 10:01:20 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3fbcba40a6 
					 
					
						
						
							
							Don't show large image if it's not available  
						
						
						
						
					 
					
						2011-08-25 11:37:15 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d277f343ca 
					 
					
						
						
							
							Encode repeats as share activities  
						
						
						
						
					 
					
						2011-07-18 17:06:03 -04:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						cad040ce4e 
					 
					
						
						
							
							Leding tabs to spaces.  
						
						... 
						
						
						
						Superfluous whitespace removed. 
						
						
					 
					
						2011-04-10 19:33:58 +02:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3146c9fae8 
					 
					
						
						
							
							Add event hooks for customizing ActivityObject output to Atom and JSON, and helpers for MicroAppPlugin.  
						
						... 
						
						
						
						New hooks:
* StartActivityObjectOutputAtom
* EndActivityObjectOutputAtom
	$obj ActivityObject
	$out XMLOutputter
* StartActivityObjectOutputJson
* EndActivityObjectOutputJson
	$obj ActivityObject
	&$out array 
						
						
					 
					
						2011-03-11 11:58:53 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						541613ce69 
					 
					
						
						
							
							More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out  
						
						
						
						
					 
					
						2011-03-07 15:15:21 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6862f765f6 
					 
					
						
						
							
							ActivityObject uses Notice's object_type by default  
						
						
						
						
					 
					
						2011-03-07 14:21:16 -05:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						371e923c37 
					 
					
						
						
							
							Twitter lists compatible people tags api  
						
						
						
						
					 
					
						2011-03-07 00:36:06 +05:30 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						11f77b2fca 
					 
					
						
						
							
							Add PoCo to Activity Streams JSON  
						
						
						
						
					 
					
						2011-02-17 22:36:14 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						97af5e1954 
					 
					
						
						
							
							Add geopoint (GeoJSON) extension to AS JSON output  
						
						
						
						
					 
					
						2011-02-17 20:12:28 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e84b01c76f 
					 
					
						
						
							
							avatars -> avatarLinks  
						
						
						
						
					 
					
						2011-02-17 19:34:39 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						a199192ebf 
					 
					
						
						
							
							Add avatars and notice info  
						
						
						
						
					 
					
						2011-02-16 18:55:13 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						b1675ff175 
					 
					
						
						
							
							Rudimentary support for enclosures and some fiddling  
						
						
						
						
					 
					
						2011-02-16 18:14:58 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						ddda31038e 
					 
					
						
						
							
							Use simple relative object and verb references  
						
						
						
						
					 
					
						2011-02-16 16:44:02 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e4d5c47ebf 
					 
					
						
						
							
							Add image to JSON ActivityObject and title + links to the JSON document  
						
						
						
						
					 
					
						2011-02-16 16:21:46 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						a1b436a8c6 
					 
					
						
						
							
							First cut at some JSON Activity Streams output  
						
						
						
						
					 
					
						2011-02-15 20:25:39 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						7de1aaf86d 
					 
					
						
						
							
							Atom - output nickname for atom:name in atom:author  
						
						
						
						
					 
					
						2011-02-13 00:40:28 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c78170a275 
					 
					
						
						
							
							Better job making an ActivityObject from an <atom:author>  
						
						
						
						
					 
					
						2010-12-27 10:19:51 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f5128015be 
					 
					
						
						
							
							Use outputTo() instead of asString() for including sub-elements  
						
						
						
						
					 
					
						2010-12-27 09:46:25 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1188d5bab2 
					 
					
						
						
							
							Don't output deprecated <activity:actor> element  
						
						
						
						
					 
					
						2010-12-27 09:25:26 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						35d9a065fb 
					 
					
						
						
							
							Revert "initialize ActivityObject::$extra"  
						
						... 
						
						
						
						This reverts commit 3e82000d57 
						
						
					 
					
						2010-12-22 12:07:13 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e11ca1e052 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-12-22 12:05:40 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						448dfb69d4 
					 
					
						
						
							
							Initialize $extra member to empty array on ActivityObject  
						
						
						
						
					 
					
						2010-12-22 12:03:05 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3e82000d57 
					 
					
						
						
							
							initialize ActivityObject::$extra  
						
						
						
						
					 
					
						2010-12-22 12:02:50 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						24f9a991b6 
					 
					
						
						
							
							Let activity objects write directly to activity's own outputter  
						
						
						
						
					 
					
						2010-12-20 13:30:33 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						25d03c42e6 
					 
					
						
						
							
							Add events for representing objects as activity:object  
						
						... 
						
						
						
						Add 6 new events to make it easier to override the type of an activity object. 
						
						
					 
					
						2010-12-18 17:24:41 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						20f2167425 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix  
						
						
						
						
					 
					
						2010-09-30 11:31:29 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						1acc7d66c6 
					 
					
						
						
							
							Always specify UTF-8 targt charset for html_entity_decode(); default is 8-bit ISO-8859-1 which causes things to break when we later pass them through things that expect to work with UTF-8. For instance, running through preg_replace() with the /u option results in NULL, leading to problems with OStatus and SubMirror generating their plaintext versions and doing length-cropping.  
						
						
						
						
					 
					
						2010-09-30 11:29:31 -07:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						b9177f5e2e 
					 
					
						
						
							
							* i18n/L10n and translator documentation updates.  
						
						... 
						
						
						
						* whitespace and indentation updates 
						
						
					 
					
						2010-09-29 00:39:45 +02:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						42dd460d3b 
					 
					
						
						
							
							Merge branch 'master' into 0.9.x  
						
						
						
						
					 
					
						2010-09-21 12:48:16 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						94de78fa0f 
					 
					
						
						
							
							Workaround for  #2485 : in profile output on feeds, fall back to the Twitter 73x73 avatar instead of going straight to the 96x96 default image on twitter-import profiles.  
						
						
						
						
					 
					
						2010-09-21 12:38:04 -07:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						8c94ebf537 
					 
					
						
						
							
							* update/add translator documentation  
						
						... 
						
						
						
						* remove superfluous whitespace 
						
						
					 
					
						2010-09-13 21:10:54 +02:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						29566c5d4b 
					 
					
						
						
							
							move check for bad IDs from activityobject to activity and make simpler  
						
						
						
						
					 
					
						2010-03-27 22:44:10 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						b8e97ac709 
					 
					
						
						
							
							Some initial media parsing  
						
						... 
						
						
						
						- Activity now returns a list of activity objects
- Processing of photo objects 
						
						
					 
					
						2010-03-22 18:55:17 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						fcb614d0eb 
					 
					
						
						
							
							Pull <atom:author> info as well as <activity:actor> when we have an old-style ActivityStreams feed. This fixes subscription setup for Cliqset feeds, which currently have a bogus activity:actor/atom:id but a good atom:author/atom:uri  
						
						
						
						
					 
					
						2010-03-21 16:25:12 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						97bd7e22da 
					 
					
						
						
							
							correct creation of avatar links for RSS and Posterous elements  
						
						
						
						
					 
					
						2010-03-20 17:18:24 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						323ff31fbd 
					 
					
						
						
							
							special-case Posterous author element for activity actor  
						
						
						
						
					 
					
						2010-03-20 16:53:30 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						99454be38c 
					 
					
						
						
							
							Move activity classes to their own files  
						
						... 
						
						
						
						Moved the various classes used by the Activity class to their own
files. There were >10 classes in the same file, with around 1500 lines
in the file. Just too big.
This change makes autoloading work for these classes, so also removed
the hard require in lib/common.php. 
						
						
					 
					
						2010-03-20 16:06:22 -05:00