James Walker 
							
						 
					 
					
						
						
							
						
						ab8bb4d79e 
					 
					
						
						
							
							more cleanup  
						
						
						
						
					 
					
						2010-02-26 04:07:58 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						d1256b547f 
					 
					
						
						
							
							bad merge.. cleaning up missing webfinger bits  
						
						
						
						
					 
					
						2010-02-26 03:43:35 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						22062b665e 
					 
					
						
						
							
							remove webfinger.php  
						
						
						
						
					 
					
						2010-02-26 03:28:29 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						85b5b4b40a 
					 
					
						
						
							
							Merge remote branch 'statusnet/testing' into testing  
						
						
						
						
					 
					
						2010-02-26 03:27:40 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						84d0c865c4 
					 
					
						
						
							
							salmon actually fetching remote keypairs  
						
						
						
						
					 
					
						2010-02-26 03:25:51 -05:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e650794300 
					 
					
						
						
							
							Remove unnecessary requires  
						
						
						
						
					 
					
						2010-02-25 22:06:31 -08:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						7c8031dc4b 
					 
					
						
						
							
							Merge remote branch 'statusnet/testing' into testing  
						
						... 
						
						
						
						Conflicts:
	plugins/OStatus/lib/webfinger.php 
						
						
					 
					
						2010-02-25 23:49:45 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						855692141d 
					 
					
						
						
							
							use a real keypair from discovery  
						
						
						
						
					 
					
						2010-02-25 23:38:25 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						0afb09ad64 
					 
					
						
						
							
							er. right.  
						
						
						
						
					 
					
						2010-02-25 23:37:59 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						02300ebfb0 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into testing  
						
						
						
						
					 
					
						2010-02-25 19:52:19 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						2528bb452b 
					 
					
						
						
							
							OStatus: clean up known-URL hinting during profile setup, saves some extra HTTP hits we were getting when mentioning Buzz feeds.  
						
						
						
						
					 
					
						2010-02-25 19:50:59 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						cf61f36e6b 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into testing  
						
						... 
						
						
						
						* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first)
  info about discovery in Ostatus_profile::ensureWebfinger()
  cache Web responses in Webfinger library 
						
						
					 
					
						2010-02-25 18:57:12 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						d8d8d59a03 
					 
					
						
						
							
							- Updates to use new activity object factories  
						
						... 
						
						
						
						- Prune obsolete feed creation method 
						
						
					 
					
						2010-02-25 18:55:11 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						2fa953da22 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into testing  
						
						
						
						
					 
					
						2010-02-25 18:52:26 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						2feb09f434 
					 
					
						
						
							
							OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first)  
						
						
						
						
					 
					
						2010-02-25 18:51:44 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e197208a4a 
					 
					
						
						
							
							info about discovery in Ostatus_profile::ensureWebfinger()  
						
						
						
						
					 
					
						2010-02-25 21:07:52 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a43598c31e 
					 
					
						
						
							
							cache Web responses in Webfinger library  
						
						
						
						
					 
					
						2010-02-25 21:07:24 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c693365ae7 
					 
					
						
						
							
							cache results of webfinger lookups  
						
						
						
						
					 
					
						2010-02-25 20:29:52 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1cae324555 
					 
					
						
						
							
							Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing  
						
						
						
						
					 
					
						2010-02-25 19:59:01 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						894b221e8a 
					 
					
						
						
							
							Parse an hcard for hints, if available  
						
						
						
						
					 
					
						2010-02-25 19:58:51 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						cc0670791e 
					 
					
						
						
							
							use new hcard method for webfinger  
						
						
						
						
					 
					
						2010-02-25 19:58:18 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						36f02f459b 
					 
					
						
						
							
							add hkit for hCard parsing  
						
						
						
						
					 
					
						2010-02-25 19:11:39 -05:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						82cac2be59 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into testing  
						
						... 
						
						
						
						* 'testing' of gitorious.org:statusnet/mainline:
  OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts.
  Tweak common_url_to_nickname to take the last path component; fixes pulling nicks from Google profile pages (path is "/profile/<nickname>")
  Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject 
						
						
					 
					
						2010-02-25 16:07:32 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						7922edb5b6 
					 
					
						
						
							
							Add lots of fun avatars to our Atom output  
						
						
						
						
					 
					
						2010-02-25 16:06:49 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						45435a7c03 
					 
					
						
						
							
							OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts.  
						
						
						
						
					 
					
						2010-02-26 00:01:22 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4aa82f75ed 
					 
					
						
						
							
							Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing  
						
						
						
						
					 
					
						2010-02-25 18:45:32 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6578e0e1af 
					 
					
						
						
							
							use new dedicated hcard method for Webfinger profile  
						
						
						
						
					 
					
						2010-02-25 18:45:08 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						08413428a7 
					 
					
						
						
							
							typo  
						
						
						
						
					 
					
						2010-02-25 17:52:56 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						93f4f07c12 
					 
					
						
						
							
							moving webfinger action to xrdaction  
						
						
						
						
					 
					
						2010-02-25 17:52:18 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						5ae64a7adb 
					 
					
						
						
							
							moving references to Webfinger to Discovery  
						
						
						
						
					 
					
						2010-02-25 17:34:56 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						bd90ef9f66 
					 
					
						
						
							
							replace webfinger usage in hostmeta.php  
						
						
						
						
					 
					
						2010-02-25 17:26:10 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						b2dabe6a48 
					 
					
						
						
							
							removing the webfinger lib  
						
						
						
						
					 
					
						2010-02-25 17:12:46 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						3d0ba3efc8 
					 
					
						
						
							
							adding a new, more generic "discovery" class that does LRDD disco  
						
						... 
						
						
						
						(rather than webfinger specific) 
						
						
					 
					
						2010-02-25 17:09:54 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						5cb6e54bed 
					 
					
						
						
							
							call-time pass by reference  
						
						
						
						
					 
					
						2010-02-25 17:09:54 -05:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						e62e49ed3b 
					 
					
						
						
							
							adding some exception handling for magicenv parsing  
						
						
						
						
					 
					
						2010-02-25 17:09:54 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b5b5184c88 
					 
					
						
						
							
							OStatus: fix remote groups to work with new user_groups/local_groups split.  
						
						... 
						
						
						
						- fix <activity:subject> generation so we get the profile info (what's available so far)
- use id instead of nickname for group join/leave forms so we can join/leave remote groups
  while the rest of the groups UI remains limited to local groups
  (plugins are responsible for making sure remote notifications and permission checks are done)
- fix remote notification when joining group through OStatus's remote subscribe form 
						
						
					 
					
						2010-02-25 13:02:08 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						79c0d52daa 
					 
					
						
						
							
							OStatus: save categories from the Atom entry as hashtags.  
						
						
						
						
					 
					
						2010-02-25 11:26:33 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4a71753f20 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into testing  
						
						
						
						
					 
					
						2010-02-25 09:28:19 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						84fa3776e2 
					 
					
						
						
							
							Merge commit 'refs/merge-requests/122' of git://gitorious.org/statusnet/mainline into integration  
						
						
						
						
					 
					
						2010-02-25 09:14:42 -08:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						ffdcdbc198 
					 
					
						
						
							
							Removed dangling icons in Realtime plugin  
						
						
						
						
					 
					
						2010-02-25 13:55:06 +00:00 
						 
				 
			
				
					
						
							
							
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						9ef7eb036c 
					 
					
						
						
							
							Moved common icons from Realtime plugin to core icons file  
						
						
						
						
					 
					
						2010-02-25 10:38:55 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						374c488cf1 
					 
					
						
						
							
							return attachement from saveHTMLFile()  
						
						
						
						
					 
					
						2010-02-24 22:26:40 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b08a527139 
					 
					
						
						
							
							content_* to common_*  
						
						
						
						
					 
					
						2010-02-24 22:22:42 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						75cf4d4312 
					 
					
						
						
							
							Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing  
						
						
						
						
					 
					
						2010-02-24 22:03:01 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						942521ef30 
					 
					
						
						
							
							if OStatus post is too long, show the summary and save it as an HTML attachment  
						
						
						
						
					 
					
						2010-02-24 22:02:43 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						58e232a10a 
					 
					
						
						
							
							OStatus: when finding webfinger @-replies, override a local profile match if found at the same location (eg @someguy vs @someguy@example.org)  
						
						... 
						
						
						
						Fixes inconsistent application of webfinger @-mentions in OStatus; once a local profile is set up the local name would often match first and ended up overriding in output. 
						
						
					 
					
						2010-02-25 02:56:56 +00:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b798faf9ea 
					 
					
						
						
							
							OStatus: abort processing of this PuSH in item if we got an exception, rather than letting it be re-run.  
						
						
						
						
					 
					
						2010-02-25 02:43:20 +00:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						10884dcd49 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into testing  
						
						... 
						
						
						
						* 'testing' of gitorious.org:statusnet/mainline:
  Merge StatusNet core localization updates from 0.9.x branch
  Fix update_po_templates.php to support the plural and context variants of _m() in plugins
  Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
  OStatus: handle update-profile Salmon pings
  Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
  OStatus: disable HTMLPurify cache unless we've configured a writable path for it. 
						
						
					 
					
						2010-02-24 16:52:16 -08:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						543ff40ef6 
					 
					
						
						
							
							Populate more profile information when doing a remote subscribe  
						
						
						
						
					 
					
						2010-02-24 16:51:24 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3b7084c6dd 
					 
					
						
						
							
							Fix update_po_templates.php to support the plural and context variants of _m() in plugins  
						
						
						
						
					 
					
						2010-02-24 16:34:45 -08:00