friendica
								
							 
						 | 
						
							
							
								
							
							
	bfec28f1fe
						 | 
						
							
							
								
								
								threading messed up a bit of cross-site federation code
							
							
							
							
							
						 | 
						
							2012-08-12 18:42:43 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	009ebc732a
						 | 
						
							
							
								
								
								move tag transformation to bb2diaspora; start taking out unnecessary signature stuff
							
							
							
							
							
						 | 
						
							2012-08-10 08:13:17 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Domovoy
								
							 
						 | 
						
							
							
								
							
							
	f3b1391501
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
							
							
							
							
							
						 | 
						
							2012-08-07 09:40:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	5d7f9d3b4b
						 | 
						
							
							
								
								
								rev update
							
							
							
							
							
						 | 
						
							2012-08-05 21:43:20 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Domovoy
								
							 
						 | 
						
							
							
								
							
							
	e247915f48
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
							
							
							
							
							
							
							
							Conflicts:
	include/conversation.php 
							
						 | 
						
							2012-08-05 13:43:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Domovoy
								
							 
						 | 
						
							
							
								
							
							
	5d1eb37b9b
						 | 
						
							
							
								
								
								Remote items should be threaded now
							
							
							
							
							
						 | 
						
							2012-08-05 13:30:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	9732f1fccf
						 | 
						
							
							
								
								
								expire issue
							
							
							
							
							
						 | 
						
							2012-08-04 23:29:52 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	0c67649c08
						 | 
						
							
							
								
								
								put back notags
							
							
							
							
							
						 | 
						
							2012-08-03 18:36:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	621e737826
						 | 
						
							
							
								
								
								fix angle char storage and transmission, rev update
							
							
							
							
							
						 | 
						
							2012-08-03 18:33:11 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	982625db9c
						 | 
						
							
							
								
								
								update contact photos and names in local delivery - not just polled feeds
							
							
							
							
							
						 | 
						
							2012-07-23 20:00:00 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	a54278649f
						 | 
						
							
							
								
								
								poke notifications
							
							
							
							
							
						 | 
						
							2012-07-19 20:13:40 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7aa10d1935
						 | 
						
							
							
								
								
								Merge remote branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2012-07-15 17:26:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	8d7d46ae7a
						 | 
						
							
							
								
								
								Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work
							
							
							
							
							
						 | 
						
							2012-07-14 19:54:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	72f430ae58
						 | 
						
							
							
								
								
								parse_url: Problem when resizing images
							
							
							
							
							
						 | 
						
							2012-07-14 13:59:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	8b6942c572
						 | 
						
							
							
								
								
								don't use language detection if < php 5.3
							
							
							
							
							
						 | 
						
							2012-07-13 15:38:02 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	bfca7f47ef
						 | 
						
							
							
								
								
								Merge remote branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	include/bb2diaspora.php 
							
						 | 
						
							2012-07-13 23:39:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5f400c4a97
						 | 
						
							
							
								
								
								API: Now returns a real 404 when a function isn't implemented
							
							
							
							
							
							
							
							parse_url: Image handling improved 
							
						 | 
						
							2012-07-13 23:23:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	f92338d79b
						 | 
						
							
							
								
								
								make likes on comments work with Diaspora, some small bugs
							
							
							
							
							
						 | 
						
							2012-07-12 23:14:39 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	9a299920eb
						 | 
						
							
							
								
								
								language detection - result is stored in item['postopts']
							
							
							
							
							
						 | 
						
							2012-07-11 22:45:14 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	fc6f7daf38
						 | 
						
							
							
								
								
								small cleanup
							
							
							
							
							
						 | 
						
							2012-07-10 19:28:38 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	c8378260bc
						 | 
						
							
							
								
								
								check for posted dates based on month only
							
							
							
							
							
						 | 
						
							2012-07-08 08:46:46 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	6d10374c17
						 | 
						
							
							
								
								
								cleanup
							
							
							
							
							
						 | 
						
							2012-07-07 18:50:46 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	da2ccebed8
						 | 
						
							
							
								
								
								fix bugs
							
							
							
							
							
						 | 
						
							2012-07-07 18:50:33 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	173b3a1b9a
						 | 
						
							
							
								
								
								allow more than one embedded private photo
							
							
							
							
							
						 | 
						
							2012-07-07 16:24:20 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	57635e7684
						 | 
						
							
							
								
								
								add function to exclude embedded images when checking message length
							
							
							
							
							
						 | 
						
							2012-07-07 16:24:20 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	5395cf5bd9
						 | 
						
							
							
								
								
								clear title and body of items on local delete
							
							
							
							
							
						 | 
						
							2012-07-05 20:07:01 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	dafc84390d
						 | 
						
							
							
								
								
								Improvments of the HTML to make a better bb2markdown conversion (nested lists, youtube, vimeo, ...)
							
							
							
							
							
						 | 
						
							2012-07-05 23:36:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	bcca817b9a
						 | 
						
							
							
								
								
								Removing of the title if it is the same (or part) from the body. Helps against auto generated titles from tumblr.
							
							
							
							
							
						 | 
						
							2012-06-30 09:25:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	65268d25e6
						 | 
						
							
							
								
								
								Merge remote branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	include/items.php 
							
						 | 
						
							2012-06-29 21:43:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	52569e536e
						 | 
						
							
							
								
								
								Tests considering removing of the title
							
							
							
							
							
						 | 
						
							2012-06-29 21:40:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	43036bee98
						 | 
						
							
							
								
								
								wrong column name (- vs _)
							
							
							
							
							
						 | 
						
							2012-06-28 21:32:49 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	1830ecc9ba
						 | 
						
							
							
								
								
								remote_self feeds are not private
							
							
							
							
							
						 | 
						
							2012-06-28 18:52:49 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	a3edbf7e5d
						 | 
						
							
							
								
								
								create third privacy state - public post but not searchable or publicly visible
							
							
							
							
							
						 | 
						
							2012-06-28 17:43:29 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	de93c61e0d
						 | 
						
							
							
								
								
								remove titles in ostatus even when edited date differs from created date
							
							
							
							
							
						 | 
						
							2012-06-28 16:04:00 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	d32d0e2154
						 | 
						
							
							
								
								
								typos
							
							
							
							
							
						 | 
						
							2012-06-25 21:39:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	78ede4744f
						 | 
						
							
							
								
								
								add event titles to discovered birthday events
							
							
							
							
							
						 | 
						
							2012-06-25 21:37:38 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	53f0aee82d
						 | 
						
							
							
								
								
								Merge https://github.com/friendica/friendica into pull
							
							
							
							
							
						 | 
						
							2012-06-25 18:16:55 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f1991a5952
						 | 
						
							
							
								
								
								propagate remote deletes
							
							
							
							
							
						 | 
						
							2012-06-25 18:15:56 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	5773241537
						 | 
						
							
							
								
								
								add some debug logging
							
							
							
							
							
						 | 
						
							2012-06-25 19:03:03 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	c0c50ece0f
						 | 
						
							
							
								
								
								revert extra Diaspora disabling changes to try to eliminate Mustard double-posting
							
							
							
							
							
						 | 
						
							2012-06-25 19:03:03 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	8bb7ab88fb
						 | 
						
							
							
								
								
								Clean up the Diaspora connectivity:
							
							
							
							
							
							
							
							- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled 
							
						 | 
						
							2012-06-25 19:03:03 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f0b41709eb
						 | 
						
							
							
								
								
								improve remote delete forwarding
							
							
							
							
							
						 | 
						
							2012-06-25 17:45:33 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	1574396d04
						 | 
						
							
							
								
								
								sort out some "like" issues
							
							
							
							
							
						 | 
						
							2012-06-23 21:11:18 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	63141c73d8
						 | 
						
							
							
								
								
								debugging
							
							
							
							
							
						 | 
						
							2012-06-23 07:26:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	a132eda2cf
						 | 
						
							
							
								
								
								cokmment likes not propagating
							
							
							
							
							
						 | 
						
							2012-06-23 06:41:37 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	1ba0d73a9a
						 | 
						
							
							
								
								
								make feeds work with comment likes/dislikes
							
							
							
							
							
						 | 
						
							2012-06-23 06:13:11 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f55e8e831c
						 | 
						
							
							
								
								
								typo
							
							
							
							
							
						 | 
						
							2012-06-23 06:04:56 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	bf0ab10caf
						 | 
						
							
							
								
								
								undefined unmark_for_death
							
							
							
							
							
						 | 
						
							2012-06-20 16:35:49 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f0db196288
						 | 
						
							
							
								
								
								iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources
							
							
							
							
							
						 | 
						
							2012-06-20 05:04:51 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	b3bf48782f
						 | 
						
							
							
								
								
								allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed.
							
							
							
							
							
						 | 
						
							2012-06-19 20:59:22 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |