Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	de431e185e  
						 
						
							
							
								
								
								New function to update the global contact for the user id.  
							
							 
							
							
							
						 
						
							2016-05-05 15:08:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	3df235e5bd  
						 
						
							
							
								
								
								The global contact for server users is now stored directly  
							
							 
							
							
							
						 
						
							2016-05-05 12:02:51 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8992577bb6  
						 
						
							
							
								
								
								Better handling of hidden profiles  
							
							 
							
							
							
						 
						
							2016-05-04 09:30:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2a864d889e  
						 
						
							
							
								
								
								missing include file for the SocNet settings  
							
							 
							
							
							
						 
						
							2016-03-12 16:25:17 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4ef33b4d5b  
						 
						
							
							
								
								
								Clarification of description  
							
							 
							
							
							
						 
						
							2016-03-06 13:26:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8752ec11b2  
						 
						
							
							
								
								
								Central function for default group, special setting for OStatus  
							
							 
							
							
							
						 
						
							2016-03-06 13:15:27 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7d4c99ebbc  
						 
						
							
							
								
								
								"get_baseurl" and "z_root" are disappearing ...  
							
							 
							
							
							
						 
						
							2016-02-17 23:47:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	b202e02fbf  
						 
						
							
							
								
								
								Revert "Updated modules to allow for partial overrides without errors"  
							
							 
							
							... 
							
							
							
							This reverts commit db949bb802 . 
							
						 
						
							2016-02-07 15:11:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Andrej Stieben 
								
							 
						 
						
							
							
								
							
							
	db949bb802  
						 
						
							
							
								
								
								Updated modules to allow for partial overrides without errors  
							
							 
							
							... 
							
							
							
							Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions. 
							
						 
						
							2016-02-05 21:52:39 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	c1ed2bd975  
						 
						
							
							
								
								
								feature management for admins: Merge branch 'devolop'  
							
							 
							
							
							
						 
						
							2016-01-17 03:25:17 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	f406e5ddbd  
						 
						
							
							
								
								
								Issue 1921: Disable the auto update  
							
							 
							
							
							
						 
						
							2015-12-06 00:18:59 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	fb3ac68cc0  
						 
						
							
							
								
								
								Add user language in settings, use that field as language for UI  
							
							 
							
							
							
						 
						
							2015-11-08 14:23:49 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d6beb7db1f  
						 
						
							
							
								
								
								add a header to seperate the beginning of week settings  
							
							 
							
							
							
						 
						
							2015-10-01 06:19:57 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	389b7de451  
						 
						
							
							
								
								
								Setting for the first day of the week  
							
							 
							
							
							
						 
						
							2015-09-30 19:18:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	5ac38b7f99  
						 
						
							
							
								
								
								There is now only one central parameter for the global directory.  
							
							 
							
							
							
						 
						
							2015-09-15 22:29:02 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	cecbc58729  
						 
						
							
							
								
								
								Mass-subscribing to OStatus contacts is enabled again  
							
							 
							
							
							
						 
						
							2015-09-05 10:32:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	3cccb5ecb1  
						 
						
							
							
								
								
								The repair option is added to the settings  
							
							 
							
							
							
						 
						
							2015-09-05 04:54:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	86f2eb005f  
						 
						
							
							
								
								
								There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now.  
							
							 
							
							
							
						 
						
							2015-08-26 22:46:59 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b0ddde22c0  
						 
						
							
							
								
								
								By entering a GNU Social account name, the friends of this contact will be added to the friendica account  
							
							 
							
							
							
						 
						
							2015-08-23 22:21:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	86f6532c61  
						 
						
							
							
								
								
								adding the subdir  
							
							 
							
							
							
						 
						
							2015-08-17 08:20:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	03e81b06d5  
						 
						
							
							
								
								
								we dont need the or anymore  
							
							 
							
							
							
						 
						
							2015-08-17 07:24:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	621dec1606  
						 
						
							
							
								
								
								reconstruct the description for more flexible translations  
							
							 
							
							
							
						 
						
							2015-08-17 07:20:50 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	eea258f74c  
						 
						
							
							
								
								
								add the profile url to the settings pages as alternative to the webfinger. See issue 1621  
							
							 
							
							
							
						 
						
							2015-08-16 22:39:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b4d09777b9  
						 
						
							
							
								
								
								Added many accesskeys ...  
							
							 
							
							
							
						 
						
							2015-08-08 17:33:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	5f89cb0923  
						 
						
							
							
								
								
								The autofollow option is moved from the addons to the core.  
							
							 
							
							
							
						 
						
							2015-07-12 21:37:49 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	cf2a90dfa2  
						 
						
							
							
								
								
								system settings is now a variable in settings_display.tpl  
							
							 
							
							
							
						 
						
							2015-06-30 14:51:14 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	8cca849c2e  
						 
						
							
							
								
								
								Merge acl-var into develop  
							
							 
							
							... 
							
							
							
							Conflicts:
	mod/settings.php 
							
						 
						
							2015-06-27 15:23:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	5ce125d6e0  
						 
						
							
							
								
								
								cleanup of some unused code  
							
							 
							
							
							
						 
						
							2015-06-26 15:13:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	4036ad2554  
						 
						
							
							
								
								
								Fix desktop notification  
							
							 
							
							... 
							
							
							
							use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification 
							
						 
						
							2015-06-24 09:49:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	472a6f1380  
						 
						
							
							
								
								
								Added explanation for shortening.  
							
							 
							
							
							
						 
						
							2015-05-15 21:09:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d995fc3994  
						 
						
							
							
								
								
								The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled.  
							
							 
							
							
							
						 
						
							2015-05-15 20:56:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	8367cadeef  
						 
						
							
							
								
								
								dont normalise OpenID URLs and fallback to https if no protocol is specified  
							
							 
							
							
							
						 
						
							2015-04-14 12:27:36 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	106b0b5d23  
						 
						
							
							
								
								
								Merge pull request  #1460  from FlxAlbroscheit/develop  
							
							 
							
							... 
							
							
							
							Issue 1163: Feature allowing desktop-notifications 
							
						 
						
							2015-04-05 11:37:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	0226258e7b  
						 
						
							
							
								
								
								Block settings page for unauthorized users  
							
							 
							
							... 
							
							
							
							fixes issue #1459  
							
						 
						
							2015-03-31 10:24:23 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									FlxAlbroscheit 
								
							 
						 
						
							
							
								
							
							
	001e940c6c  
						 
						
							
							
								
								
								Feature for desktop-notifications  
							
							 
							
							... 
							
							
							
							see issue #1163  
							
						 
						
							2015-03-31 02:06:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	eaaed02ffd  
						 
						
							
							
								
								
								use type email in users settings as well  
							
							 
							
							
							
						 
						
							2015-01-24 09:40:01 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	816d3f86e7  
						 
						
							
							
								
								
								reword checkbox help text  
							
							 
							
							
							
						 
						
							2015-01-20 22:17:03 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	b2527039b7  
						 
						
							
							
								
								
								add text-only email option  
							
							 
							
							... 
							
							
							
							add a checkbok to notification settings. if checked, html body is not added to email. 
							
						 
						
							2015-01-20 19:19:58 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	086b3e30c6  
						 
						
							
							
								
								
								Clarification for the hidewall property.  
							
							 
							
							
							
						 
						
							2014-12-12 23:03:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	fbe664cc44  
						 
						
							
							
								
								
								fix settings page aside menu active item  
							
							 
							
							... 
							
							
							
							add aside menu to delegate page 
							
						 
						
							2014-09-17 11:00:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	1a865bf400  
						 
						
							
							
								
								
								New description for the option to reload the page only when on top.  
							
							 
							
							
							
						 
						
							2014-08-01 20:11:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ed1dce93d6  
						 
						
							
							
								
								
								Usage of /display/(guid) as path instead of /display/(user)/(id)  
							
							 
							
							... 
							
							
							
							Bugfix for adding tags to photos 
							
						 
						
							2014-07-22 00:36:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c980e6d20d  
						 
						
							
							
								
								
								Possibility to disable the automatic reload of the network page  
							
							 
							
							
							
						 
						
							2014-07-09 21:32:32 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2db1029830  
						 
						
							
							
								
								
								APC support is removed due to problems with PHP 5.5.  
							
							 
							
							
							
						 
						
							2014-05-03 12:02:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2846dfeb05  
						 
						
							
							
								
								
								Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values.  
							
							 
							
							
							
						 
						
							2014-04-26 02:22:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	30efb0c1e6  
						 
						
							
							
								
								
								menu entry for "Delegations" moved to the settings.  
							
							 
							
							
							
						 
						
							2014-04-24 10:16:02 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	5f3d584716  
						 
						
							
							
								
								
								Code beautification and some more logging data - no changes in the functionality.  
							
							 
							
							
							
						 
						
							2014-04-04 11:02:36 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6e7bd68ebb  
						 
						
							
							
								
								
								More "LIMIT 1" removed - and some other SQL improvements.  
							
							 
							
							
							
						 
						
							2014-03-11 23:52:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	70e017745a  
						 
						
							
							
								
								
								Just some code beautification.  
							
							 
							
							
							
						 
						
							2013-12-02 00:41:59 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e0cf2c5167  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	mod/admin.php
	mod/settings.php 
							
						 
						
							2013-12-02 00:33:46 +01:00