Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d3b10959f4 
					 
					
						
						
							
							Merge branch '0.9.x' into noactor  
						
						
						
						
					 
					
						2010-12-29 15:29:29 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2d576aea30 
					 
					
						
						
							
							don't distribute when restoring archived delicious bookmarks  
						
						
						
						
					 
					
						2010-12-29 14:52:43 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3fea4aba7f 
					 
					
						
						
							
							phpcs showbookmark.php  
						
						
						
						
					 
					
						2010-12-29 14:24:30 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f3999ab92d 
					 
					
						
						
							
							phpcs noticebyurl.php  
						
						
						
						
					 
					
						2010-12-29 14:22:41 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f5256eb028 
					 
					
						
						
							
							phpcs importdelicious.php  
						
						
						
						
					 
					
						2010-12-29 14:21:25 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b00d113bb4 
					 
					
						
						
							
							phpcs Bookmark.php  
						
						
						
						
					 
					
						2010-12-29 14:17:32 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						10fa41454d 
					 
					
						
						
							
							phpcs BookmarkPlugin.php  
						
						
						
						
					 
					
						2010-12-29 14:16:15 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						68f44dad82 
					 
					
						
						
							
							Add link to delicious bookmark importer to profile settings  
						
						
						
						
					 
					
						2010-12-29 14:02:31 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4a9a5076ff 
					 
					
						
						
							
							Web UI for importing delicious backup files  
						
						
						
						
					 
					
						2010-12-29 13:51:59 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						db43195fbf 
					 
					
						
						
							
							fixup date handling in showbookmark for PHP 5.2  
						
						
						
						
					 
					
						2010-12-28 23:36:25 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						dcd0e3ec7e 
					 
					
						
						
							
							show count of other bookmarks with link to stream  
						
						
						
						
					 
					
						2010-12-28 13:45:24 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						821770966b 
					 
					
						
						
							
							Page with a list of notices that link to an URL  
						
						
						
						
					 
					
						2010-12-28 12:58:10 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c8bbde69df 
					 
					
						
						
							
							import bookmarks from backups  
						
						
						
						
					 
					
						2010-12-27 22:57:35 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0a56e88a64 
					 
					
						
						
							
							Don't double-insert a bookmark  
						
						
						
						
					 
					
						2010-12-27 22:57:11 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4465724ed3 
					 
					
						
						
							
							return saved notice to AtomPub for Bookmarks  
						
						
						
						
					 
					
						2010-12-27 22:16:34 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7b9ea62259 
					 
					
						
						
							
							Make AtomPub work for bookmarks  
						
						
						
						
					 
					
						2010-12-27 22:09:29 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6393326557 
					 
					
						
						
							
							Merge branch '0.9.x' into socialbookmark  
						
						
						
						
					 
					
						2010-12-27 20:49:31 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						141b4b67b3 
					 
					
						
						
							
							Better UI for bookmark popup  
						
						
						
						
					 
					
						2010-12-27 12:57:03 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						45b2059cd8 
					 
					
						
						
							
							better layout for single-bookmark page  
						
						
						
						
					 
					
						2010-12-27 12:08:55 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						29103f5d0e 
					 
					
						
						
							
							send and receive bookmarks by Salmon  
						
						
						
						
					 
					
						2010-12-27 11:29:16 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b54ea6767a 
					 
					
						
						
							
							New event for Salmon including target  
						
						
						
						
					 
					
						2010-12-27 10:51:59 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ab92496ddc 
					 
					
						
						
							
							Stop using <activity:subject> for atom feeds  
						
						
						
						
					 
					
						2010-12-27 10:03:34 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4777c927ad 
					 
					
						
						
							
							Fix bookmark replies handling so doesn't overwrite  
						
						
						
						
					 
					
						2010-12-27 09:14:11 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						14113b267e 
					 
					
						
						
							
							replace call to protected Ostatus_profile method  
						
						
						
						
					 
					
						2010-12-26 21:38:28 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						bf75119b3c 
					 
					
						
						
							
							Fix bugs in BookmarkPlugin  
						
						
						
						
					 
					
						2010-12-26 21:25:26 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7d56f1cd19 
					 
					
						
						
							
							Some fixes from debugging of bookmark plugin URI foramt  
						
						... 
						
						
						
						Tightened up the URI format, fixed some auto-loading issues,
and forced the url_crc32 column to be unsigned. 
						
						
					 
					
						2010-12-26 21:11:27 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ca28140107 
					 
					
						
						
							
							remove debugging outputter from delicious backup importer  
						
						
						
						
					 
					
						2010-12-26 21:10:54 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ea1676cb0a 
					 
					
						
						
							
							UTC only and tighter date format for showbookmark  
						
						
						
						
					 
					
						2010-12-26 21:10:23 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4048d1ec3d 
					 
					
						
						
							
							Radical differences in Bookmark storage  
						
						... 
						
						
						
						Had some problems with PuSH and Salmon use of Bookmarks; they were
being required to generate Atom versions of the bookmark _before_ the bookmark was saved.
So, I reversed the order of how things are saved, and associate notices and bookmarks
by URI rather than notice_id. 
						
						
					 
					
						2010-12-24 20:34:15 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						67bde86f7c 
					 
					
						
						
							
							accept bookmarks over PuSH  
						
						
						
						
					 
					
						2010-12-23 09:42:42 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ae64963d71 
					 
					
						
						
							
							Reformat bookmark output  
						
						
						
						
					 
					
						2010-12-22 15:24:13 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						8babcc2ad2 
					 
					
						
						
							
							Makefile to compress LinkPreview's js  
						
						
						
						
					 
					
						2010-12-22 15:04:50 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1faaaed72b 
					 
					
						
						
							
							Move bookmark CSS to its own file  
						
						
						
						
					 
					
						2010-12-22 13:08:07 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						402cac2f93 
					 
					
						
						
							
							Merge branch '0.9.x' into socialbookmark  
						
						... 
						
						
						
						Conflicts:
	lib/activityobject.php 
						
						
					 
					
						2010-12-22 12:09:42 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9a6ceb3303 
					 
					
						
						
							
							Merge branch 'righttoleave' into 0.9.x  
						
						
						
						
					 
					
						2010-12-22 11:22:51 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						73dccdd7f5 
					 
					
						
						
							
							Notice_bookmark::saveNew() takes a Profile argument  
						
						
						
						
					 
					
						2010-12-22 12:35:45 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6ff8977243 
					 
					
						
						
							
							Bookmarklet for Bookmark plugin  
						
						
						
						
					 
					
						2010-12-21 14:46:31 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0665beec58 
					 
					
						
						
							
							Bookmarklet for new bookmarks  
						
						... 
						
						
						
						Override the bookmarklet help page to add a new popup. 
						
						
					 
					
						2010-12-21 14:43:03 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6670dd8450 
					 
					
						
						
							
							Layout on the bookmark form  
						
						
						
						
					 
					
						2010-12-21 12:25:23 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ccb290cb68 
					 
					
						
						
							
							Break up delicious import into a queue manager by bookmark  
						
						
						
						
					 
					
						2010-12-21 11:09:01 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b8a182dc44 
					 
					
						
						
							
							PHPCS Notice_bookmark  
						
						
						
						
					 
					
						2010-12-21 10:32:35 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d9ff466d2c 
					 
					
						
						
							
							PHPCS newbookmark  
						
						
						
						
					 
					
						2010-12-21 10:22:50 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						907f1ad633 
					 
					
						
						
							
							PHPCS importbookmarks  
						
						
						
						
					 
					
						2010-12-21 10:20:49 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						14babfb900 
					 
					
						
						
							
							PHPCS BookmarkForm  
						
						
						
						
					 
					
						2010-12-21 10:16:53 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c96faf065d 
					 
					
						
						
							
							PHPCS BookmarkPlugin.php  
						
						
						
						
					 
					
						2010-12-21 10:13:20 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						331639d6e4 
					 
					
						
						
							
							Code standards for deliciousbackupimporter.php  
						
						
						
						
					 
					
						2010-12-21 09:42:44 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b83e7005ed 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	plugins/OStatus/classes/FeedSub.php 
						
						
					 
					
						2010-12-20 14:23:15 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						46123e3754 
					 
					
						
						
							
							*cough* don't commit the code that breaks your code that you used to test the debug code :D  
						
						
						
						
					 
					
						2010-12-20 13:06:58 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						a4e2f38356 
					 
					
						
						
							
							Slightly fancier debug code for PuSH hmac mismatches -- save the post to a temp file if feedsub/debug is on in config.  
						
						
						
						
					 
					
						2010-12-20 13:05:17 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						dd48bdb1c4 
					 
					
						
						
							
							Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke  
						
						
						
						
					 
					
						2010-12-20 10:48:02 -08:00