| 
							
						 | 
						
							
							
								
							
							
	ed748f2d15
						 | 
						
							
							
								
								
								Merge pull request #976 from tobiasd/lng20140516
							
							
							
							
							
							
							
							update to the master strings 
							
						 | 
						
							2014-05-16 07:56:57 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4075b872bf
						 | 
						
							
							
								
								
								update to the master strings
							
							
							
							
							
						 | 
						
							2014-05-16 07:55:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	40b1e40b33
						 | 
						
							
							
								
								
								Merge pull request #973 from tobiasd/FR20140515
							
							
							
							
							
							
							
							FR: update to the strings 
							
						 | 
						
							2014-05-15 07:56:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	e275494090
						 | 
						
							
							
								
								
								FR: update to the strings
							
							
							
							
							
						 | 
						
							2014-05-15 07:54:55 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6253d61803
						 | 
						
							
							
								
								
								Merge pull request #967 from fabrixxm/issue_737
							
							
							
							
							
							
							
							add check for expiration time in item_store() 
							
						 | 
						
							2014-05-13 10:16:15 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	0774a5c5fd
						 | 
						
							
							
								
								
								Merge pull request #970 from annando/master
							
							
							
							
							
							
							
							Deleted the duplicate file "wall_attach.php" 
							
						 | 
						
							2014-05-12 22:07:41 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	0f16672176
						 | 
						
							
							
								
								
								Deleted the duplicate file "wall_attach.php"
							
							
							
							
							
						 | 
						
							2014-05-12 21:30:53 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	f55a22cb19
						 | 
						
							
							
								
								
								fix query as @annado comment
							
							
							
							
							
						 | 
						
							2014-05-12 19:02:03 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	d7b514c2c0
						 | 
						
							
							
								
								
								add check for expiration time in item_store()
							
							
							
							
							
						 | 
						
							2014-05-12 15:33:20 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	1a5da0ae60
						 | 
						
							
							
								
								
								Merge pull request #954 from fabrixxm/issue_936
							
							
							
							
							
							
							
							Show unknown contacts in thread comment mention autocomplete 
							
						 | 
						
							2014-05-12 11:56:05 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	bb4296e686
						 | 
						
							
							
								
								
								exclude know contacts from unknown contact list
							
							
							
							
							
						 | 
						
							2014-05-12 05:46:02 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	bd2dd90d0a
						 | 
						
							
							
								
								
								Merge pull request #966 from annando/master
							
							
							
							
							
							
							
							Repeated messages to Diaspora now contain a link to the original content at the bottom of the message. 
							
						 | 
						
							2014-05-12 06:58:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	a6742d3db6
						 | 
						
							
							
								
								
								Repeated messages to Diaspora now contain a link to the original content at the bottom of the message.
							
							
							
							
							
						 | 
						
							2014-05-11 22:07:37 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	01c146414c
						 | 
						
							
							
								
								
								Merge pull request #965 from annando/master
							
							
							
							
							
							
							
							Only show connectors when not "hide wall" is enabled 
							
						 | 
						
							2014-05-10 06:28:41 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	acf1c3956c
						 | 
						
							
							
								
								
								Only show connectors when not "hide wall" is enabled.
							
							
							
							
							
						 | 
						
							2014-05-10 00:24:15 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	31312ab1d2
						 | 
						
							
							
								
								
								Merge pull request #956 from annando/master
							
							
							
							
							
							
							
							New database system that uses PDO if present/Test script for doing database upgrades. 
							
						 | 
						
							2014-05-09 21:55:01 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5616c58535
						 | 
						
							
							
								
								
								Better error handling during install.
							
							
							
							
							
						 | 
						
							2014-05-09 20:44:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	dfa52185ca
						 | 
						
							
							
								
								
								Reenabled PDO engine.
							
							
							
							
							
						 | 
						
							2014-05-09 20:43:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	018b1f0086
						 | 
						
							
							
								
								
								Added buffer image (needed for plugin)
							
							
							
							
							
						 | 
						
							2014-05-09 20:42:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	7afe5afcf1
						 | 
						
							
							
								
								
								Merge pull request #963 from tabacha/master
							
							
							
							
							
							
							
							Make uimport URL work for Sites with subfolder 
							
						 | 
						
							2014-05-06 14:16:54 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sven Anders
								
							 
						 | 
						
							
							
								
							
							
	0dac5bf804
						 | 
						
							
							
								
								
								Make uimport URL work for Sites with subfolder
							
							
							
							
							
							
							
							BUGFIX: If you have a site like http://exmaple.com/friendica you will get a wrong url 
							
						 | 
						
							2014-05-06 14:15:15 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	407ea6977a
						 | 
						
							
							
								
								
								Plaintext: Regular expressions were too greedy.
							
							
							
							
							
						 | 
						
							2014-05-06 00:33:56 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4dbfae7883
						 | 
						
							
							
								
								
								Merge pull request #962 from tobiasd/fix961
							
							
							
							
							
							
							
							save selection to suppress language results (fix 961) 
							
						 | 
						
							2014-05-05 13:46:03 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	fd7e17f91e
						 | 
						
							
							
								
								
								save selection to suppress language results (fix 961)
							
							
							
							
							
						 | 
						
							2014-05-05 13:44:33 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	6b38968f80
						 | 
						
							
							
								
								
								The template "register_adminadd_eml.tpl" was missing for all languages except german. That lead to an empty page when adding users.
							
							
							
							
							
						 | 
						
							2014-05-04 21:11:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	30f1f40a1e
						 | 
						
							
							
								
								
								No functional changes, only removed spaces
							
							
							
							
							
						 | 
						
							2014-05-03 23:40:34 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	04ba988f75
						 | 
						
							
							
								
								
								Plaintext: If a picture link went directly to a picture, this wasn't recognized. Additionally there was a situation when a post could be empty.
							
							
							
							
							
						 | 
						
							2014-05-03 23:34:53 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4b0cc51ae4
						 | 
						
							
							
								
								
								The PDO functionality is deactivated until the last differences in functionality are removed.
							
							
							
							
							
						 | 
						
							2014-05-03 12:14:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c27bd7d0b4
						 | 
						
							
							
								
								
								The pagetypes are rearrange to make the differences better understandable.
							
							
							
							
							
						 | 
						
							2014-05-03 12:10:38 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	059b88b7a0
						 | 
						
							
							
								
								
								The CSS code for shared messages is moved from "vier" to the global.css, so that it is usable for all themes.
							
							
							
							
							
						 | 
						
							2014-05-03 12:08:42 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	426e0045ee
						 | 
						
							
							
								
								
								The function "short_url" is used in several addons, so it deserves a central place.
							
							
							
							
							
						 | 
						
							2014-05-03 12:07:34 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c41b1c2d55
						 | 
						
							
							
								
								
								Building a central functionality to export postings to all networks that only support plaintext postings. In near future this will replace the similar code in the several addons.
							
							
							
							
							
						 | 
						
							2014-05-03 12:04:54 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2db1029830
						 | 
						
							
							
								
								
								APC support is removed due to problems with PHP 5.5.
							
							
							
							
							
						 | 
						
							2014-05-03 12:02:25 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	94baf0c8f7
						 | 
						
							
							
								
								
								Merge pull request #957 from tobiasd/trans_20140430
							
							
							
							
							
							
							
							update to the translations for CS, FR, NB-NO and ZH-CN 
							
						 | 
						
							2014-04-30 17:07:03 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	27ff19a92c
						 | 
						
							
							
								
								
								FR: update to some templates
							
							
							
							
							
						 | 
						
							2014-04-30 17:05:01 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1741dd2a1d
						 | 
						
							
							
								
								
								NB-NO: update to the strings
							
							
							
							
							
						 | 
						
							2014-04-30 17:02:45 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1469407777
						 | 
						
							
							
								
								
								ZH-CN: update to the strings
							
							
							
							
							
						 | 
						
							2014-04-30 17:02:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c732cefcfd
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2014-04-30 17:01:27 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	92035cdca4
						 | 
						
							
							
								
								
								FR: update to the strings
							
							
							
							
							
						 | 
						
							2014-04-30 17:00:56 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	a6b03b6263
						 | 
						
							
							
								
								
								The remove page now has the settings menu.
							
							
							
							
							
						 | 
						
							2014-04-29 22:34:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7b7e372fb0
						 | 
						
							
							
								
								
								Suppress showing unsupported addons in the administration.
							
							
							
							
							
						 | 
						
							2014-04-29 14:22:37 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4ca857e110
						 | 
						
							
							
								
								
								Empty template to avoid errors when installing themes.
							
							
							
							
							
						 | 
						
							2014-04-29 13:33:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	941c049933
						 | 
						
							
							
								
								
								The file "dbstructure.php" was corrupted. This is the right one.
							
							
							
							
							
						 | 
						
							2014-04-29 13:19:44 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c5825a0c20
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2014-04-29 12:36:49 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	66996a2fa3
						 | 
						
							
							
								
								
								The file dba.php was missing in the last commit :) Additionally there are some chamges to the update script.
							
							
							
							
							
						 | 
						
							2014-04-29 12:35:24 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	b69f6b6ade
						 | 
						
							
							
								
								
								Merge pull request #953 from tugelbend/master
							
							
							
							
							
							
							
							Vier: Fix for the display of long text event entries 
							
						 | 
						
							2014-04-29 09:07:32 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	405dd794fe
						 | 
						
							
							
								
								
								New database system that uses PDO if present/Test script for doing database upgrades.
							
							
							
							
							
						 | 
						
							2014-04-28 23:55:47 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	5b7228e46d
						 | 
						
							
							
								
								
								Merge pull request #955 from fabrixxm/quattro_photo_comments
							
							
							
							
							
							
							
							vier, quattro: fix photo comments 
							
						 | 
						
							2014-04-28 15:44:52 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	cae89749d7
						 | 
						
							
							
								
								
								vier: remove unused .less files, fix photo comments
							
							
							
							
							
						 | 
						
							2014-04-28 09:42:41 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	42a9d0af09
						 | 
						
							
							
								
								
								quattro: fix photo comments, small fix to search_item template
							
							
							
							
							
						 | 
						
							2014-04-28 09:31:48 -04:00 | 
						
						
							
							
							
							
								
							
							
						 |