Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a0734ceede  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1507-new-poco  
							
							 
							
							
							
						 
						
							2015-07-18 22:37:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	cf3214c904  
						 
						
							
							
								
								
								Query other servers periodically for their known contacts  
							
							 
							
							
							
						 
						
							2015-07-18 22:26:06 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	9bb805f3dc  
						 
						
							
							
								
								
								show profile url in contact-edit overview listing  
							
							 
							
							
							
						 
						
							2015-07-18 10:57:31 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	f1e7369283  
						 
						
							
							
								
								
								Poco: Option to activate and deactivate detection of last activity.  
							
							 
							
							
							
						 
						
							2015-07-18 00:48:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									root 
								
							 
						 
						
							
							
								
							
							
	54a5a80b24  
						 
						
							
							
								
								
								Poco: New fields for last contact and last failure of a contact.  
							
							 
							
							
							
						 
						
							2015-07-17 01:08:28 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	fca8aecc9b  
						 
						
							
							
								
								
								Show "Redmatrix" as network name.  
							
							 
							
							
							
						 
						
							2015-07-16 10:09:59 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6800b07fc5  
						 
						
							
							
								
								
								Update the name in the "self" contact when it is changed.  
							
							 
							
							
							
						 
						
							2015-07-14 22:24:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0de1926113  
						 
						
							
							
								
								
								removed logger entry  
							
							 
							
							
							
						 
						
							2015-07-14 08:52:54 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2b3ebb9c3e  
						 
						
							
							
								
								
								Follow/Unfollow now works from OStatus.  
							
							 
							
							
							
						 
						
							2015-07-13 23:50:33 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	3457f85833  
						 
						
							
							
								
								
								Salmon: Don't store contact data before the message was authenticated.  
							
							 
							
							
							
						 
						
							2015-07-13 14:34:28 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0398bb67be  
						 
						
							
							
								
								
								Reworked salmon import  
							
							 
							
							
							
						 
						
							2015-07-13 08:06:51 +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 
								
							 
						 
						
							
							
								
							
							
	e5809dce79  
						 
						
							
							
								
								
								add jotnets for sharing posts  
							
							 
							
							
							
						 
						
							2015-07-12 17:52:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	179201d2bf  
						 
						
							
							
								
								
								Merge pull request  #1750  from annando/1507-contact-update  
							
							 
							
							... 
							
							
							
							Automatic contact update 
							
						 
						
							2015-07-12 15:32:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	fe137a92ef  
						 
						
							
							
								
								
								Automatically update contact data.  
							
							 
							
							
							
						 
						
							2015-07-11 14:36:04 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a22581e86c  
						 
						
							
							
								
								
								typo  
							
							 
							
							
							
						 
						
							2015-07-08 13:15:14 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	95945ecae6  
						 
						
							
							
								
								
								Merge branch 'master' into develop  
							
							 
							
							
							
						 
						
							2015-07-06 16:56:49 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	75998b62de  
						 
						
							
							
								
								
								Merge pull request  #1726  from rabuzarus/acl-var  
							
							 
							
							... 
							
							
							
							fix for #1725  
							
						 
						
							2015-07-02 12:13:14 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	b827c2e805  
						 
						
							
							
								
								
								inlude jotnets for bookmark acl  
							
							 
							
							
							
						 
						
							2015-07-02 12:09:40 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3349bba665  
						 
						
							
							
								
								
								Merge pull request  #1722  from annando/1506-password-on-install  
							
							 
							
							... 
							
							
							
							Ability to enter a password when the first user is created 
							
						 
						
							2015-07-01 07:53:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	836058c477  
						 
						
							
							
								
								
								Added help text  
							
							 
							
							
							
						 
						
							2015-07-01 00:41:04 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	055ee962c9  
						 
						
							
							
								
								
								Ability to enter a password when the first user is created  
							
							 
							
							
							
						 
						
							2015-06-30 23:37:31 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	cf2a90dfa2  
						 
						
							
							
								
								
								system settings is now a variable in settings_display.tpl  
							
							 
							
							
							
						 
						
							2015-06-30 14:51:14 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	5a23bd400c  
						 
						
							
							
								
								
								Merge pull request  #1715  from rabuzarus/theme_uid  
							
							 
							
							... 
							
							
							
							use local theme settings for visitors 
							
						 
						
							2015-06-30 08:41:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	836432bb9a  
						 
						
							
							
								
								
								Removed Google Maps  
							
							 
							
							
							
						 
						
							2015-06-30 07:42:59 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	28f0e9a2de  
						 
						
							
							
								
								
								Merge pull request  #1696  from rabuzarus/acl-var  
							
							 
							
							... 
							
							
							
							move jotnets to populate_acl 
							
						 
						
							2015-06-29 13:53:37 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	1a1c2d74f6  
						 
						
							
							
								
								
								Merge pull request  #1698  from rabuzarus/identity  
							
							 
							
							... 
							
							
							
							move some identity related functions to identity.php 
							
						 
						
							2015-06-29 13:52:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	17514e0d68  
						 
						
							
							
								
								
								Merge pull request  #1703  from rabuzarus/readable_bytes  
							
							 
							
							... 
							
							
							
							show maximagesize warning in a human readable format 
							
						 
						
							2015-06-29 13:50:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	a982320ba9  
						 
						
							
							
								
								
								show maximagesize warning in a human readable format  
							
							 
							
							
							
						 
						
							2015-06-29 02:39:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b795bf2935  
						 
						
							
							
								
								
								Merge pull request  #1683  from fabrixxm/issue-1655  
							
							 
							
							... 
							
							
							
							Deprecate RINO1 function, implements RINO2, remove unused crypro functions 
							
						 
						
							2015-06-27 17:39:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	8cca849c2e  
						 
						
							
							
								
								
								Merge acl-var into develop  
							
							 
							
							... 
							
							
							
							Conflicts:
	mod/settings.php 
							
						 
						
							2015-06-27 15:23:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	373bb0822b  
						 
						
							
							
								
								
								get the themes settings of foreign profiles  
							
							 
							
							
							
						 
						
							2015-06-27 14:10:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	787604026f  
						 
						
							
							
								
								
								move some identity based functions to identity.php  
							
							 
							
							
							
						 
						
							2015-06-26 18:57:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	5ce125d6e0  
						 
						
							
							
								
								
								cleanup of some unused code  
							
							 
							
							
							
						 
						
							2015-06-26 15:13:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	65286f79ed  
						 
						
							
							
								
								
								respect hidewall  
							
							 
							
							
							
						 
						
							2015-06-25 20:29:09 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	94b21245bc  
						 
						
							
							
								
								
								some more work to get acl data into populate_acl  
							
							 
							
							
							
						 
						
							2015-06-25 18:57:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	bfebf9636b  
						 
						
							
							
								
								
								acl for events and photos  
							
							 
							
							
							
						 
						
							2015-06-25 12:38:09 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	6fc864c947  
						 
						
							
							
								
								
								rework mod/ping and desktop notification logic  
							
							 
							
							... 
							
							
							
							`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours 
							
						 
						
							2015-06-25 10:02:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	e29d05ce4a  
						 
						
							
							
								
								
								notifications order, unseen css class  
							
							 
							
							... 
							
							
							
							ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen' 
							
						 
						
							2015-06-24 16:10:06 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	17e8c29768  
						 
						
							
							
								
								
								fix spelling  
							
							 
							
							
							
						 
						
							2015-06-24 08:23:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	511c2d2c91  
						 
						
							
							
								
								
								rino: settings in admin, choose lowest common on notify  
							
							 
							
							
							
						 
						
							2015-06-23 17:36:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	6fbb02fb93  
						 
						
							
							
								
								
								RINO 2 based on php-encryption  
							
							 
							
							... 
							
							
							
							reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes. 
							
						 
						
							2015-06-23 16:13:09 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	d06beb1431  
						 
						
							
							
								
								
								install: load htconfig template from templates/  
							
							 
							
							
							
						 
						
							2015-06-23 12:35:51 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	7d83a19fd4  
						 
						
							
							
								
								
								Disable RINO  
							
							 
							
							... 
							
							
							
							Comment out functions for RINO crypt and disable RINO request and response. 
							
						 
						
							2015-06-23 12:02:35 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5549dd1dbe  
						 
						
							
							
								
								
								Merge pull request  #1682  from fabrixxm/issue-1625  
							
							 
							
							... 
							
							
							
							admin: allow deletion of any users but yourself 
							
						 
						
							2015-06-23 11:05:16 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	3168b44317  
						 
						
							
							
								
								
								admin: allow deletion of any users but yourself  
							
							 
							
							... 
							
							
							
							fix  #1625  
							
						 
						
							2015-06-23 10:39:28 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	53e6dd6637  
						 
						
							
							
								
								
								Add contact detail to contact drop confirm  
							
							 
							
							... 
							
							
							
							fix  #1629  
							
						 
						
							2015-06-23 10:09:27 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	24c91a4fed  
						 
						
							
							
								
								
								Merge pull request  #1679  from fabrixxm/smallfixestothemes  
							
							 
							
							... 
							
							
							
							use fields template in photo edit form 
							
						 
						
							2015-06-23 09:12:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a7cf3639f0  
						 
						
							
							
								
								
								Just some more fixing for issue 1642  
							
							 
							
							
							
						 
						
							2015-06-22 23:47:08 +02:00