| 
							
							
								 Zach Prezkuta | fa7e803f73 | fix check for parent of StatusNet API post | 2012-06-25 08:26:12 -06:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 4293de7554 | allow nested [ol] and [ul] lists too | 2012-06-25 08:26:00 -06:00 |  | 
			
				
					| 
							
							
								 Sebastian Egbers | 8c251aebc7 | fixed direct message reply in api call. | 2012-06-25 16:25:34 +02:00 |  | 
			
				
					| 
							
							
								 Sebastian Egbers | af1d4bb632 | modified api message reply to set title to conversion title, when replying. | 2012-06-25 15:53:56 +02:00 |  | 
			
				
					| 
							
							
								 Sebastian Egbers | 020deedd7c | Merge branch 'master' of https://github.com/friendica/friendica | 2012-06-25 13:59:39 +02:00 |  | 
			
				
					| 
							
							
								 friendica | 7ea5917bf7 | more service class functionality | 2012-06-25 03:25:06 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 35a098e0dc | service limits for photo uploads | 2012-06-25 01:37:44 -07:00 |  | 
			
				
					| 
							
							
								 friendica | ad6c82bdea | implement "follow" service limits | 2012-06-24 22:23:17 -07:00 |  | 
			
				
					| 
							
							
								 friendica | c464bc494c | add like/dislike to profiles | 2012-06-24 21:16:55 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 7f3813e9b0 | service class basics | 2012-06-24 00:56:27 -07:00 |  | 
			
				
					| 
							
							
								 fermionic | 49ecf58163 | Merge pull request #357 from fermionic/fix-relayable-signature-handle ok now I'm just making silly mistakes--take out premature function locki... | 2012-06-23 21:29:52 -07:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 59ebe6f111 | ok now I'm just making silly mistakes--take out premature function locking code | 2012-06-23 22:28:28 -06:00 |  | 
			
				
					| 
							
							
								 friendica | 92a997365f | Merge https://github.com/friendica/friendica into pull | 2012-06-23 21:11:41 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 1574396d04 | sort out some "like" issues | 2012-06-23 21:11:18 -07:00 |  | 
			
				
					| 
							
							
								 fermionic | 642880f89a | Merge pull request #356 from fermionic/fix-relayable-signature-handle use author handle instead of sender handle | 2012-06-23 21:08:43 -07:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 0877c5b687 | use author handle instead of sender handle | 2012-06-23 22:04:20 -06:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 5d2eed3517 | allow bare URLS to make it through to Diaspora | 2012-06-23 22:02:08 -06:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 1f96839674 | small optimization | 2012-06-23 20:01:29 -06:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 4ef33ac6eb | fix BB-to-Diaspora list formatting | 2012-06-23 19:57:59 -06:00 |  | 
			
				
					| 
							
							
								 Max Weller | cbf1cab0da | Merge remote-tracking branch 'sebastian/master' | 2012-06-23 22:59:03 +02:00 |  | 
			
				
					| 
							
							
								 Max Weller | e3c36dfd1d | add reliable way to get server version | 2012-06-23 22:52:50 +02:00 |  | 
			
				
					| 
							
							
								 Max Weller | 11b6beae06 | make it selectable | 2012-06-23 22:39:11 +02:00 |  | 
			
				
					| 
							
							
								 Max Weller | 111ace5abd | I want HTML code! | 2012-06-23 22:35:43 +02:00 |  | 
			
				
					| 
							
							
								 Max Weller | 9d462c6b6a | new param getUserObjects to avoid retransmitting the whole user info objects | 2012-06-23 19:38:15 +02:00 |  | 
			
				
					| 
							
							
								 Max Weller | 2c992c5969 | bugfix | 2012-06-23 19:35:01 +02:00 |  | 
			
				
					| 
							
							
								 Max Weller | f45c881815 | changes on api_direct_messages_box to allow to retrieve conversations and all messages | 2012-06-23 19:29:58 +02:00 |  | 
			
				
					| 
							
							
								 Max Weller | d8a376666c | modified direct_messages | 2012-06-23 19:21:48 +02:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 90f8454190 | allow linking to Diaspora's scaled-down images | 2012-06-23 11:02:15 -06:00 |  | 
			
				
					| 
							
							
								 friendica | 7a346bc756 | this is going to take some more debug before it can be roller out | 2012-06-23 07:43:56 -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 | 49360b0a64 | Merge https://github.com/friendica/friendica into pull | 2012-06-23 05:47:31 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 22ca358a8c | like comments | 2012-06-23 05:46:15 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 7614d35cad | liking comments backend | 2012-06-23 04:44:48 -07:00 |  | 
			
				
					| 
							
							
								 Michael Vogel | a81af2e042 | Merge remote branch 'upstream/master' Conflicts:
	include/bb2diaspora.php | 2012-06-23 12:50:00 +02:00 |  | 
			
				
					| 
							
							
								 Michael Vogel | 7a4ad4564d | Diaspora: Messages are now looking better | 2012-06-23 12:42:01 +02:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 9c9e727042 | cleanup lists and more comment signature stuff | 2012-06-22 20:45:37 -06:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 7b219649a4 | expand support for BB code-to-Diaspora conversion | 2012-06-22 20:45:37 -06:00 |  | 
			
				
					| 
							
							
								 Vasudev Kamath | 6e4760dd9c | Merge branch 'master' of git://github.com/friendica/friendica | 2012-06-23 08:11:35 +05:30 |  | 
			
				
					| 
							
							
								 Sebastian Egbers | cd25c3b5dd | added replyto and subject to direct messages. | 2012-06-22 14:54:31 +02:00 |  | 
			
				
					| 
							
							
								 Sebastian Egbers | c14270ac64 | modified conversion to use x function for parameter checking. | 2012-06-22 13:35:36 +02:00 |  | 
			
				
					| 
							
							
								 Max Weller | 6fe8a13b64 | Added ORDER BY clause for conversation view | 2012-06-21 12:55:03 +02:00 |  | 
			
				
					| 
							
							
								 Max Weller | 0f5a6bfcdb | Added statuses/show parameter ?conversation=true | 2012-06-21 10:53:48 +02:00 |  | 
			
				
					| 
							
							
								 friendica | 53c9ea7606 | show last.fm source in username | 2012-06-20 23:04:55 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 91a3a2d551 | follow last.fm scrobbles | 2012-06-20 22:59:01 -07:00 |  | 
			
				
					| 
							
							
								 Zach Prezkuta | 73c6f40ebc | create new signed text for relayables right when relaying them | 2012-06-20 20:52:09 -06:00 |  | 
			
				
					| 
							
							
								 friendica | bf0ab10caf | undefined unmark_for_death | 2012-06-20 16:35:49 -07:00 |  | 
			
				
					| 
							
							
								 friendica | 0d0f129d04 | Merge https://github.com/friendica/friendica into pull | 2012-06-20 05:06:20 -07:00 |  |