| 
							
						 | 
						
							
							
								
							
							
	d23e934d21
						 | 
						
							
							
								
								
								BG: update for the strings
							
							
							
							
							
						 | 
						
							2013-07-12 09:37:51 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	497cee4311
						 | 
						
							
							
								
								
								BG: update for the strings
							
							
							
							
							
						 | 
						
							2013-07-12 09:37:26 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c6ac24ba00
						 | 
						
							
							
								
								
								IT: update for the strings
							
							
							
							
							
						 | 
						
							2013-07-12 09:37:09 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	0227372daa
						 | 
						
							
							
								
								
								Merge pull request #732 from fabrixxm/bug728
							
							
							
							
							
							
							
							Fix diaspora contacts profile image 
							
						 | 
						
							2013-07-09 01:50:07 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1f68ffe3d1
						 | 
						
							
							
								
								
								NL: update to the strings
							
							
							
							
							
						 | 
						
							2013-07-08 14:42:56 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	c9604b776c
						 | 
						
							
							
								
								
								stupid typo
							
							
							
							
							
						 | 
						
							2013-07-08 14:21:49 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	cd35beb947
						 | 
						
							
							
								
								
								should fix #728
							
							
							
							
							
						 | 
						
							2013-07-08 04:52:14 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	8b9ae53242
						 | 
						
							
							
								
								
								Merge pull request #713 from annando/master
							
							
							
							
							
							
							
							ejabberd and friendica 
							
						 | 
						
							2013-07-05 12:40:30 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	49785130c2
						 | 
						
							
							
								
								
								NL: update of the strings
							
							
							
							
							
						 | 
						
							2013-07-05 12:14:34 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	b9093c300f
						 | 
						
							
							
								
								
								FR: update of the strings
							
							
							
							
							
						 | 
						
							2013-07-05 12:14:20 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	3185e49042
						 | 
						
							
							
								
								
								PT_BR: update of the strings
							
							
							
							
							
						 | 
						
							2013-07-05 12:13:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	a4a3ad5327
						 | 
						
							
							
								
								
								Merge pull request #720 from fabrixxm/feed_push
							
							
							
							
							
							
							
							Feed PuSH 
							
						 | 
						
							2013-07-01 10:16:53 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	93dfdf85e8
						 | 
						
							
							
								
								
								NL: translation added from transifex
							
							
							
							
							
						 | 
						
							2013-06-29 10:45:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	790257c6c2
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-28 14:36:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	2f6d0dee7b
						 | 
						
							
							
								
								
								DE: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-28 14:35:53 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	f87631b3f7
						 | 
						
							
							
								
								
								ZH_CN: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-28 14:33:33 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	95ee7a3bdc
						 | 
						
							
							
								
								
								PL: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-28 14:31:57 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	2ed427b8ca
						 | 
						
							
							
								
								
								Merge pull request #721 from fabrixxm/master
							
							
							
							
							
							
							
							uexport: fix full export 
							
						 | 
						
							2013-06-28 00:19:56 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	759afb4237
						 | 
						
							
							
								
								
								uexport: fix full export
							
							
							
							
							
							
							
							- add new line after each valid json line
- export table row as single json object 
							
						 | 
						
							2013-06-28 03:16:25 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	edf8bde581
						 | 
						
							
							
								
								
								Complete oStatus conversations: Changed from file_get_contents to fetch_url
							
							
							
							
							
						 | 
						
							2013-06-27 22:27:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	4748b6c4c3
						 | 
						
							
							
								
								
								remove unneeded logger function
							
							
							
							
							
						 | 
						
							2013-06-27 09:58:39 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	0a1697d13a
						 | 
						
							
							
								
								
								add pubsubhubbub support to feed contacts
							
							
							
							
							
						 | 
						
							2013-06-27 09:51:13 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	bb59c9c32a
						 | 
						
							
							
								
								
								CA: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-27 07:29:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	9ae4c1fb32
						 | 
						
							
							
								
								
								ignore hex escapes as numeric tags
							
							
							
							
							
						 | 
						
							2013-06-26 04:58:54 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	1d0fccac6e
						 | 
						
							
							
								
								
								Merge https://github.com/friendica/friendica into pull
							
							
							
							
							
						 | 
						
							2013-06-26 04:07:44 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	bfc9cfb82f
						 | 
						
							
							
								
								
								put tags in items
							
							
							
							
							
						 | 
						
							2013-06-26 04:02:04 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	42644f6011
						 | 
						
							
							
								
								
								DE: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-26 10:42:08 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	dbc44f2b56
						 | 
						
							
							
								
								
								BG: added translation of the strings from transifex
							
							
							
							
							
						 | 
						
							2013-06-24 19:04:46 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	10b8ab5e89
						 | 
						
							
							
								
								
								BG: added translation of the strings from transifex
							
							
							
							
							
						 | 
						
							2013-06-24 19:04:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	9bbf60ac9b
						 | 
						
							
							
								
								
								Vier: A little rearrangement of the menu order.
							
							
							
							
							
						 | 
						
							2013-06-23 00:26:04 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	bd7abe210c
						 | 
						
							
							
								
								
								Vier: Introductions are now shown. The popup menu when editing a profile is visible again.
							
							
							
							
							
						 | 
						
							2013-06-23 00:07:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	16737298b4
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2013-06-22 18:31:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e4ce383f2f
						 | 
						
							
							
								
								
								It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install.
							
							
							
							
							
						 | 
						
							2013-06-22 17:34:52 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	7e23221f95
						 | 
						
							
							
								
								
								FR: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-22 07:13:44 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	407473f2ce
						 | 
						
							
							
								
								
								Merge https://github.com/friendica/friendica into pull
							
							
							
							
							
						 | 
						
							2013-06-21 05:02:43 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	1c10cf1ad7
						 | 
						
							
							
								
								
								--  #039; is not a tag
							
							
							
							
							
						 | 
						
							2013-06-21 05:00:30 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	756a1c9c52
						 | 
						
							
							
								
								
								IT: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-21 09:00:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	6d58a5888a
						 | 
						
							
							
								
								
								NB_NO: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-21 08:56:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	443d170016
						 | 
						
							
							
								
								
								NB_NO: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-20 07:50:19 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	5cdeef22ea
						 | 
						
							
							
								
								
								pager: fix stupid typo
							
							
							
							
							
						 | 
						
							2013-06-19 14:28:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	ecf3c2c9ce
						 | 
						
							
							
								
								
								NB_NO: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-19 10:57:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	e3bb058e9f
						 | 
						
							
							
								
								
								Merge pull request #697 from annando/master
							
							
							
							
							
							
							
							API can now fetch posts from a single thread 
							
						 | 
						
							2013-06-17 05:09:54 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	5ac4d06036
						 | 
						
							
							
								
								
								Merge pull request #703 from fabrixxm/master
							
							
							
							
							
							
							
							fix pagination template 
							
						 | 
						
							2013-06-17 01:30:00 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	c82e5fde0a
						 | 
						
							
							
								
								
								pagination: fix template
							
							
							
							
							
						 | 
						
							2013-06-17 04:28:34 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	7f2d396e6f
						 | 
						
							
							
								
								
								Merge pull request #695 from fabrixxm/master
							
							
							
							
							
							
							
							move html from paginate functions to template 
							
						 | 
						
							2013-06-17 00:52:30 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	f80567ce53
						 | 
						
							
							
								
								
								ZH-CN: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-16 14:51:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	176cb241c2
						 | 
						
							
							
								
								
								IT: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-16 14:51:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	49f33c8841
						 | 
						
							
							
								
								
								NB_NO: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-16 14:50:22 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4b02e11eeb
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-16 14:49:04 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e246c53b45
						 | 
						
							
							
								
								
								API: Changed "parent_id" to "conversation_id" since that reflects better the meaning of this programming.
							
							
							
							
							
						 | 
						
							2013-06-16 13:42:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 |