715e15cbe1  
						 
						
							
							
								
								
								There is now a memory limit for the poller  
							
							 
							
							
							
						 
						
							2017-04-29 17:36:46 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ba5780c4a1  
						 
						
							
							
								
								
								Remove the "discard" button for contact requests from Diaspora.  
							
							 
							
							
							
						 
						
							2017-04-28 08:36:10 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4493f37af3  
						 
						
							
							
								
								
								Merge pull request  #3390  from annando/1704-cleaned_install  
							
							 
							
							... 
							
							
							
							Added a PDO check in the install routine and cleaned it up 
							
						 
						
							2017-04-27 21:17:13 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	7adb968653  
						 
						
							
							
								
								
								removed commented out line  
							
							 
							
							
							
						 
						
							2017-04-27 07:31:57 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ae580e5829  
						 
						
							
							
								
								
								Merge pull request  #3393  from Shnoulle/develop_feature3334  
							
							 
							
							... 
							
							
							
							Simple robots.txt for server 404 log 
							
						 
						
							2017-04-27 07:23:01 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Denis Chenu 
								
							 
						 
						
							
							
								
							
							
	20d4fbffef  
						 
						
							
							
								
								
								Coding standards : doxygen + tab + single quote  
							
							 
							
							
							
						 
						
							2017-04-26 17:26:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Denis Chenu 
								
							 
						 
						
							
							
								
							
							
	e354a75dc8  
						 
						
							
							
								
								
								Doxygen standard  
							
							 
							
							
							
						 
						
							2017-04-26 17:09:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Denis Chenu 
								
							 
						 
						
							
							
								
							
							
	6ef8d18297  
						 
						
							
							
								
								
								Coding standards part and bad empty Disallow  
							
							 
							
							... 
							
							
							
							- Unsure PHP_EOL is the best here : PHP_EOL are not the same on *nux and win, it's not for server , but for browser
- _content vs _init : seems not really a web content ? 
							
						 
						
							2017-04-26 17:07:24 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Denis Chenu 
								
							 
						 
						
							
							
								
							
							
	4942c97785  
						 
						
							
							
								
								
								Simple robots.txt for server 404 log  
							
							 
							
							
							
						 
						
							2017-04-26 15:39:35 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	188d3a6f5e  
						 
						
							
							
								
								
								Renamed check_domain_blocklist to blocked_url  
							
							 
							
							... 
							
							
							
							- Remove debug 
							
						 
						
							2017-04-26 00:23:01 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	c7e1a8e871  
						 
						
							
							
								
								
								Added check_domain_blocklist  
							
							 
							
							
							
						 
						
							2017-04-25 22:45:56 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	7d9d22914f  
						 
						
							
							
								
								
								Refactor "URL" to "domain" for blocklist  
							
							 
							
							... 
							
							
							
							- Add slash trimming to domain
- Reformatted mod/friendica 
							
						 
						
							2017-04-25 22:45:42 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	0b8f80c747  
						 
						
							
							
								
								
								Merge pull request  #3388  from tobiasd/20170424-blocklistadminpanel  
							
							 
							
							... 
							
							
							
							blocklist front end for the admin panel 
							
						 
						
							2017-04-25 21:23:20 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f146c85e75  
						 
						
							
							
								
								
								standards  
							
							 
							
							
							
						 
						
							2017-04-25 18:57:50 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	efcb166c2d  
						 
						
							
							
								
								
								Added check for MySQL driver for PDO.  
							
							 
							
							
							
						 
						
							2017-04-25 06:10:14 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	49ba2f9d6d  
						 
						
							
							
								
								
								Added a PDO check in the install routine and cleaned it up  
							
							 
							
							
							
						 
						
							2017-04-25 05:55:20 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	82ea7ead66  
						 
						
							
							
								
								
								Merge pull request  #3374  from rabuzarus/20170407_-_group_edit  
							
							 
							
							... 
							
							
							
							Frio: provide own group template + some restructuring in group.php 
							
						 
						
							2017-04-24 19:50:46 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	eeb72bd879  
						 
						
							
							
								
								
								docstrings for the admin panel functions  
							
							 
							
							
							
						 
						
							2017-04-24 23:47:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f969f44603  
						 
						
							
							
								
								
								added subpage for blocklist management to the admin panel  
							
							 
							
							
							
						 
						
							2017-04-24 23:45:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	7f837a9205  
						 
						
							
							
								
								
								add the contents from the blocklist to the /friendica page  
							
							 
							
							
							
						 
						
							2017-04-24 23:43:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	bc2dd690fd  
						 
						
							
							
								
								
								Merge pull request  #3386  from rabuzarus/20170422_-_Stream_content_update_2  
							
							 
							
							... 
							
							
							
							improve profile page (wall) update for non logged in users and remote users 
							
						 
						
							2017-04-23 21:43:27 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	88602de604  
						 
						
							
							
								
								
								fall back to unseen items if no timestamp is available  
							
							 
							
							
							
						 
						
							2017-04-23 16:22:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	cd521b2dcc  
						 
						
							
							
								
								
								Urlencode query parameters  
							
							 
							
							
							
						 
						
							2017-04-23 13:50:33 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sandro Santilli 
								
							 
						 
						
							
							
								
							
							
	ebc926a716  
						 
						
							
							
								
								
								Add missing query string introducing character  
							
							 
							
							... 
							
							
							
							Fixes  #3383  
							
						 
						
							2017-04-23 13:50:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2628ff91f4  
						 
						
							
							
								
								
								Call it "toinnodb"  
							
							 
							
							
							
						 
						
							2017-04-22 21:55:16 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	aaa558f7ea  
						 
						
							
							
								
								
								New command in dbstructure.php to convert all tables from MyISAM to InnoDB  
							
							 
							
							
							
						 
						
							2017-04-22 21:36:01 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	5a7b9676ff  
						 
						
							
							
								
								
								fixed typo  
							
							 
							
							
							
						 
						
							2017-04-22 22:10:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	53c1bf6ba3  
						 
						
							
							
								
								
								improve profile update for non logged in ussers and remote users  
							
							 
							
							
							
						 
						
							2017-04-22 22:08:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	b273165873  
						 
						
							
							
								
								
								Remove unused function  
							
							 
							
							
							
						 
						
							2017-04-21 16:13:16 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	f99bb958f6  
						 
						
							
							
								
								
								Merge develop into 20170407_-_group_edit  
							
							 
							
							... 
							
							
							
							Conflicts:
	mod/group.php 
							
						 
						
							2017-04-21 16:09:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	40e5436604  
						 
						
							
							
								
								
								some restructuring in groups.php + Frio: provide own group template  
							
							 
							
							
							
						 
						
							2017-04-21 16:04:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	5b80a1fcaa  
						 
						
							
							
								
								
								mod photos compatibility only_full_group_by  
							
							 
							
							... 
							
							
							
							Related to https://github.com/friendica/friendica/pull/3323  
							
						 
						
							2017-04-20 21:23:45 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3592f90910  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1704-mastodon  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/bbcode.php 
							
						 
						
							2017-04-20 05:44:31 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	83cc56e713  
						 
						
							
							
								
								
								Merge pull request  #3326  from Alkarex/utf8mb4  
							
							 
							
							... 
							
							
							
							Default to utf8mb4 
							
						 
						
							2017-04-20 05:28:16 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e16fb74b0c  
						 
						
							
							
								
								
								Reworked OStatus communication part to better support Mastodon.  
							
							 
							
							
							
						 
						
							2017-04-19 21:37:00 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	2c69d36886  
						 
						
							
							
								
								
								Remove extra htmlentities in notifications  
							
							 
							
							
							
						 
						
							2017-04-18 19:34:46 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	33d5e5b818  
						 
						
							
							
								
								
								Issue 3157: No fulltext anymore  
							
							 
							
							
							
						 
						
							2017-04-18 20:09:05 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	47fd9226c3  
						 
						
							
							
								
								
								Resubmit all profiles on directory change  
							
							 
							
							
							
						 
						
							2017-04-17 21:39:11 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	d1888ac05c  
						 
						
							
							
								
								
								SQL AS for messages  
							
							 
							
							... 
							
							
							
							Fix bug introduced in https://github.com/friendica/friendica/pull/3323  
							
						 
						
							2017-04-17 15:01:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	07faa14361  
						 
						
							
							
								
								
								Merge branch 'develop' into utf8mb4  
							
							 
							
							
							
						 
						
							2017-04-16 22:08:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	a2a03c3f70  
						 
						
							
							
								
								
								Default UTF8MB4 for CREATE DATABASE  
							
							 
							
							
							
						 
						
							2017-04-16 16:04:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	c35eef625a  
						 
						
							
							
								
								
								More general date test for dob  
							
							 
							
							
							
						 
						
							2017-04-16 15:36:01 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	6b250d3ae9  
						 
						
							
							
								
								
								Merge branch 'develop' into MySQL5.7  
							
							 
							
							
							
						 
						
							2017-04-16 15:16:58 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	d076b39b64  
						 
						
							
							
								
								
								Forgotten AS in mod/admin patch  
							
							 
							
							
							
						 
						
							2017-04-15 23:48:02 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	8b3f623d29  
						 
						
							
							
								
								
								ANY_VALUE in mod/admin  
							
							 
							
							... 
							
							
							
							The query was not standard, not deterministic, and was not doing what
its description says. The patch makes it more standard and a bit more
deterministic. The returned protocol type is still undeterministic. 
							
						 
						
							2017-04-15 23:42:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	d2b3e0daf5  
						 
						
							
							
								
								
								Merge develop  
							
							 
							
							
							
						 
						
							2017-04-15 01:03:21 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	6be6badd91  
						 
						
							
							
								
								
								SQL typo mod/message  
							
							 
							
							... 
							
							
							
							Mistake in previous commit 
							
						 
						
							2017-04-15 00:45:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexandre Alapetite 
								
							 
						 
						
							
							
								
							
							
	1058b28cea  
						 
						
							
							
								
								
								MySQL ANY_VALUE with fallback to MIN  
							
							 
							
							... 
							
							
							
							https://github.com/friendica/friendica/issues/3322  
							
						 
						
							2017-04-15 00:42:44 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b8fd48dddc  
						 
						
							
							
								
								
								Merge pull request  #3335  from annando/issue-3331  
							
							 
							
							... 
							
							
							
							Issue 3331: Remove unneeded table "deliverq" 
							
						 
						
							2017-04-14 07:32:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	79e827417c  
						 
						
							
							
								
								
								Merge pull request  #3319  from Hypolite/issue/#3316  
							
							 
							
							... 
							
							
							
							Use get_contact_by_url for unknown contacts in acl_lookup 
							
						 
						
							2017-04-14 07:24:27 +02:00