6cf951c930  
						 
						
							
							
								
								
								use /servers instead of /siteinfo for the directory link in invitations  
							
							 
							
							
							
						 
						
							2017-08-02 08:48:01 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	7034d6efbd  
						 
						
							
							
								
								
								use /servers instead of /siteinfo for the directory link in invitations  
							
							 
							
							
							
						 
						
							2017-08-02 08:47:09 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	016e4a0efc  
						 
						
							
							
								
								
								Show contacts personal message in local profile  
							
							 
							
							
							
						 
						
							2017-08-01 17:47:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	55569f9df3  
						 
						
							
							
								
								
								This is a fix for issue 3536. Now likes aren't show anymore on the community page.  
							
							 
							
							
							
						 
						
							2017-07-31 19:29:43 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c98ae304c0  
						 
						
							
							
								
								
								Endless scroll now avoids showing the same items  
							
							 
							
							
							
						 
						
							2017-07-31 06:04:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	79fe249c54  
						 
						
							
							
								
								
								Better use a wrapper  
							
							 
							
							
							
						 
						
							2017-07-22 06:43:04 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5d7e1e1a15  
						 
						
							
							
								
								
								Use the realpath for the handling with (temporary) paths  
							
							 
							
							
							
						 
						
							2017-07-22 05:50:25 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b5f58d317e  
						 
						
							
							
								
								
								there was a string not marked for translation  
							
							 
							
							
							
						 
						
							2017-07-14 15:21:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	896bf4046c  
						 
						
							
							
								
								
								Merge pull request  #3569  from tobiasd/20170702-delete  
							
							 
							
							... 
							
							
							
							delete item from admin panel 
							
						 
						
							2017-07-10 18:44:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	dc41ac0f61  
						 
						
							
							
								
								
								use drop_item and some magic  
							
							 
							
							
							
						 
						
							2017-07-10 14:55:40 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	9304bb6422  
						 
						
							
							
								
								
								Typos  
							
							 
							
							
							
						 
						
							2017-07-07 20:54:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	aabde5422b  
						 
						
							
							
								
								
								allow the admin to delete an item by GUID from the admin panel  
							
							 
							
							
							
						 
						
							2017-07-07 10:38:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	8ed6b037cf  
						 
						
							
							
								
								
								Merge pull request  #3561  from annando/issue-3560  
							
							 
							
							... 
							
							
							
							Guests should be able to use the search as well 
							
						 
						
							2017-07-04 01:09:01 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e26991ba26  
						 
						
							
							
								
								
								Guests should be able to use the search as well  
							
							 
							
							
							
						 
						
							2017-07-03 20:48:44 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2b161108fe  
						 
						
							
							
								
								
								Merge pull request  #3439  from tobiasd/20170506-token  
							
							 
							
							... 
							
							
							
							[Needs OpenID testing] Add token to register 
							
						 
						
							2017-07-02 21:31:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	578cb0a55c  
						 
						
							
							
								
								
								Merge pull request  #3539  from AndyHee/20170617-admin_settings  
							
							 
							
							... 
							
							
							
							Corrected names for counting/ listing account-types in admin panel 
							
						 
						
							2017-06-28 07:24:41 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	be3bfaec80  
						 
						
							
							
								
								
								Only show the number of workerqueue entries that aren't done  
							
							 
							
							
							
						 
						
							2017-06-20 02:05:16 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	cf179188b6  
						 
						
							
							
								
								
								Some more worker fine tuning  
							
							 
							
							
							
						 
						
							2017-06-17 13:58:18 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d7b411e9bc  
						 
						
							
							
								
								
								Corrected names of account-types  
							
							 
							
							
							
						 
						
							2017-06-17 12:36:14 +07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	de5a0dadb0  
						 
						
							
							
								
								
								Merge pull request  #3534  from AndyHee/20170609-User_settings  
							
							 
							
							... 
							
							
							
							Better input hints, user settings, account types 
							
						 
						
							2017-06-09 12:39:50 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c8f87e1c28  
						 
						
							
							
								
								
								Updated settings.php  
							
							 
							
							
							
						 
						
							2017-06-09 16:21:25 +07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1838024f6d  
						 
						
							
							
								
								
								Merge pull request  #3528  from Hypolite/task/replace-explicit-php-logical-operators  
							
							 
							
							... 
							
							
							
							Replace explicit php logical operators 
							
						 
						
							2017-06-09 07:44:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	ad4cdf2a9d  
						 
						
							
							
								
								
								Replace lowercase operators  
							
							 
							
							
							
						 
						
							2017-06-08 21:03:44 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9c0d2c31e8  
						 
						
							
							
								
								
								Replace AND and OR in PHP conditions by && and ||  
							
							 
							
							
							
						 
						
							2017-06-07 22:00:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	97fd47c614  
						 
						
							
							
								
								
								Moved include to top  
							
							 
							
							
							
						 
						
							2017-06-07 08:46:38 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6e6941a546  
						 
						
							
							
								
								
								We have an alternate link  
							
							 
							
							
							
						 
						
							2017-06-06 21:56:25 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	932e14971f  
						 
						
							
							
								
								
								Issue 2864: Add a "alternate" link on display page  
							
							 
							
							
							
						 
						
							2017-06-06 17:56:22 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	21eb9a4b2e  
						 
						
							
							
								
								
								Fixed locking behaviour for the worker  
							
							 
							
							
							
						 
						
							2017-06-03 07:25:01 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f6d10198cc  
						 
						
							
							
								
								
								Bugfix: The poller often couldn't store the pid in the workerqueue  
							
							 
							
							
							
						 
						
							2017-05-30 13:20:29 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f3c3c57a0e  
						 
						
							
							
								
								
								Merge pull request  #3497  from annando/1705-dbstructure-admin-page  
							
							 
							
							... 
							
							
							
							The database structure is now checked ad the admin summary page 
							
						 
						
							2017-05-28 11:07:45 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	104acec09c  
						 
						
							
							
								
								
								The database structure is now checked ad the admin summary page  
							
							 
							
							
							
						 
						
							2017-05-28 08:39:41 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	e762531134  
						 
						
							
							
								
								
								Restore missing include  
							
							 
							
							
							
						 
						
							2017-05-27 21:47:54 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e37b6bcd41  
						 
						
							
							
								
								
								Probing via web frontend shouldn't use the cache.  
							
							 
							
							
							
						 
						
							2017-05-23 19:38:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6e8e326705  
						 
						
							
							
								
								
								Bugfix: Timeout problems when saving profile settings  
							
							 
							
							
							
						 
						
							2017-05-19 06:01:13 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	192a5e254a  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail  
							
							 
							
							
							
						 
						
							2017-05-17 19:56:38 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	696404739b  
						 
						
							
							
								
								
								Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short  
							
							 
							
							
							
						 
						
							2017-05-17 19:25:30 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	80103f8ad9  
						 
						
							
							
								
								
								Issue 3309: Avatar update should work now  
							
							 
							
							
							
						 
						
							2017-05-16 21:21:54 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e884090efa  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/uimport.php 
							
						 
						
							2017-05-13 04:13:07 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	74a0a92742  
						 
						
							
							
								
								
								Just some more dba::delete  
							
							 
							
							
							
						 
						
							2017-05-13 04:04:17 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	2bbcbdc704  
						 
						
							
							
								
								
								Merge pull request  #3381  from Quix0r/rewrites/coding-convention-split2-4-2  
							
							 
							
							... 
							
							
							
							Coding convention applied split 2-4-2 (of 2-14-2) 
							
						 
						
							2017-05-12 21:40:30 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6ef24890bb  
						 
						
							
							
								
								
								dbclean is now using the new database functions / new functions for commit, rollback and transaction  
							
							 
							
							
							
						 
						
							2017-05-11 20:13:45 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	7a9456d5ac 
 
						 
						
							
							
								
								
								Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2  
							
							 
							
							... 
							
							
							
							Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-05-11 14:54:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	bc724f2b68  
						 
						
							
							
								
								
								Merge pull request  #3458  from Hypolite/bug/missing-require-poco  
							
							 
							
							... 
							
							
							
							Missing require for poco_serverlist 
							
						 
						
							2017-05-09 06:56:32 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	108f0b2d1e  
						 
						
							
							
								
								
								Improve refactoring  
							
							 
							
							... 
							
							
							
							- Rename $contacts to $users where meaningful
- Use Config::get instead of get_config
- Move requires for lazy inclusion 
							
						 
						
							2017-05-08 23:03:52 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	d5b660a72f  
						 
						
							
							
								
								
								Add missing require for poco_serverlist  
							
							 
							
							
							
						 
						
							2017-05-08 21:55:19 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	70cc2ccc7a  
						 
						
							
							
								
								
								Fix standards + refactored variables with meaningful names  
							
							 
							
							
							
						 
						
							2017-05-08 21:55:04 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	cc8a3a4101  
						 
						
							
							
								
								
								rename methods of the Probe class to camelCase  
							
							 
							
							
							
						 
						
							2017-05-08 16:19:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6680ce1dd7  
						 
						
							
							
								
								
								Merge pull request  #3445  from Hypolite/improvement/move-probe-to-src  
							
							 
							
							... 
							
							
							
							Move Probe to src 
							
						 
						
							2017-05-07 23:14:22 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	74479c4020  
						 
						
							
							
								
								
								Merge pull request  #3448  from annando/1705-dba-functions  
							
							 
							
							... 
							
							
							
							The first queries are replaced with the new functions. More to come ... 
							
						 
						
							2017-05-07 17:10:39 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	45ec3fb5d8  
						 
						
							
							
								
								
								Add missing include/probe require for probe_url support  
							
							 
							
							
							
						 
						
							2017-05-07 17:08:32 -04:00