Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	bfca7f47ef  
						 
						
							
							
								
								
								Merge remote branch 'upstream/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/bb2diaspora.php 
							
						 
						
							2012-07-13 23:39:51 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	47c48aa438  
						 
						
							
							
								
								
								DBA: Possibility to log the database speed  
							
							 
							
							
							
						 
						
							2012-07-08 21:27:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	f40b056e3b  
						 
						
							
							
								
								
								some initial code and benchmarking for "red" content rendering engine  
							
							 
							
							
							
						 
						
							2012-07-04 20:37:15 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8202355df9  
						 
						
							
							
								
								
								Disabled logging of SQL statements  
							
							 
							
							
							
						 
						
							2012-05-29 16:16:37 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7f19d39b14  
						 
						
							
							
								
								
								Doing negative caching for config values, special logfile for database optmisations  
							
							 
							
							
							
						 
						
							2012-05-26 15:41:23 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a612b10b2a  
						 
						
							
							
								
								
								Deactivating the test output in db engine  
							
							 
							
							
							
						 
						
							2012-05-26 03:23:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4951210508  
						 
						
							
							
								
								
								Speed optimisation by enabling the posibility of the MySQL fulltext engine  
							
							 
							
							
							
						 
						
							2012-05-26 03:21:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8c80fe0bf5  
						 
						
							
							
								
								
								Performance tests  
							
							 
							
							
							
						 
						
							2012-05-20 00:11:32 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	1ebde08415  
						 
						
							
							
								
								
								log db error strings in all cases  
							
							 
							
							
							
						 
						
							2012-04-29 19:41:17 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	e3fecb2557  
						 
						
							
							
								
								
								improved db error logging  
							
							 
							
							
							
						 
						
							2012-04-29 17:34:54 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e825a73f1d  
						 
						
							
							
								
								
								DBA: Reverting back to original source  
							
							 
							
							
							
						 
						
							2012-04-14 13:35:11 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	eb27c32065  
						 
						
							
							
								
								
								DBA: Nothing really done ..  
							
							 
							
							
							
						 
						
							2012-04-14 13:17:58 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	572678fef9  
						 
						
							
							
								
								
								Merge commit 'upstream/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/dba.php 
							
						 
						
							2012-04-13 00:10:41 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	138caa4380  
						 
						
							
							
								
								
								DBA: Deactivation of the mysqli-class for testing purposes.  
							
							 
							
							
							
						 
						
							2012-04-13 00:05:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	60871555f5  
						 
						
							
							
								
								
								reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem  
							
							 
							
							
							
						 
						
							2012-04-12 06:50:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	7187516718  
						 
						
							
							
								
								
								fixed some typos  
							
							 
							
							
							
						 
						
							2012-04-09 14:27:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	7ac4b83c39  
						 
						
							
							
								
								
								made exceptions from the db optional  
							
							 
							
							... 
							
							
							
							set address for updae mails correctly 
							
						 
						
							2012-04-09 14:04:49 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	0d60dbef31  
						 
						
							
							
								
								
								added exceptions to dba class  
							
							 
							
							... 
							
							
							
							added exception handling to index.php, please mind that there is no
recovery at the moment
added transactions to db update. Please mind that they might not be
supported by db table engines. 
added admin email on failed updates
added german translation for admin email 
							
						 
						
							2012-04-09 00:45:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	355c42cb30  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/friendica/friendica  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 
						
							2012-04-05 13:39:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	5921dc6f16  
						 
						
							
							
								
								
								typo in function name  
							
							 
							
							
							
						 
						
							2012-03-29 16:01:44 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	4e4f7ac79f  
						 
						
							
							
								
								
								some reported warnings cleaned up  
							
							 
							
							
							
						 
						
							2012-03-28 20:50:09 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	cca524495c  
						 
						
							
							
								
								
								community discovery cont., cleanup of DB debugging  
							
							 
							
							
							
						 
						
							2012-03-18 22:12:36 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	b5ec475906  
						 
						
							
							
								
								
								bug  #253  use MSQLI_ASSOC, not MYSQL_ASSOC  
							
							 
							
							
							
						 
						
							2012-01-21 14:07:28 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	8aa2552372  
						 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)  
							
							 
							
							
							
						 
						
							2012-01-18 16:21:30 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	85fbdb00ac  
						 
						
							
							
								
								
								dba: leave unconnected if $server and $user are not defined  
							
							 
							
							
							
						 
						
							2012-01-02 20:10:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	034038849c  
						 
						
							
							
								
								
								mysql error report fix (no mysqli), suggested friends for new members settings  
							
							 
							
							
							
						 
						
							2011-11-28 19:28:33 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	ccef899577  
						 
						
							
							
								
								
								start of d* private mail, dba without mysqli  
							
							 
							
							
							
						 
						
							2011-11-27 17:41:23 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	0f4a42f550  
						 
						
							
							
								
								
								start on bug  #227  - more to do  
							
							 
							
							
							
						 
						
							2011-11-25 22:41:50 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	db30a2342c  
						 
						
							
							
								
								
								undo last checkin  
							
							 
							
							
							
						 
						
							2011-07-05 18:21:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	1a4a6b5ff9  
						 
						
							
							
								
								
								explicitly close db connections - do not rely on process exit  
							
							 
							
							
							
						 
						
							2011-07-05 17:45:33 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	82bd1ce3cb  
						 
						
							
							
								
								
								installation issues  
							
							 
							
							
							
						 
						
							2011-03-21 03:33:58 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	aebf9bb4d6  
						 
						
							
							
								
								
								non-code change  
							
							 
							
							
							
						 
						
							2011-03-13 19:12:46 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	0cf647bf6f  
						 
						
							
							
								
								
								don't let somebody install with a bogus db hostname as this seems to lead to spectacular failure modes  
							
							 
							
							
							
						 
						
							2011-03-13 16:47:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	69e2252fd6  
						 
						
							
							
								
								
								that would be mysql !i! connect_errno...  
							
							 
							
							
							
						 
						
							2011-03-03 15:47:13 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	b8757fb456  
						 
						
							
							
								
								
								make sure db queries never get called if the database isn't open  
							
							 
							
							
							
						 
						
							2011-03-03 15:41:08 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	6480fd73a7  
						 
						
							
							
								
								
								units conversion app - needs some styling and code cleanup  
							
							 
							
							
							
						 
						
							2011-03-02 03:25:12 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	5ff1462e1e  
						 
						
							
							
								
								
								install issue (memory exhausted) due to incorrect db open check  
							
							 
							
							
							
						 
						
							2011-03-01 16:24:22 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	9493c29810  
						 
						
							
							
								
								
								more defensive measures against failed or lost DB  
							
							 
							
							
							
						 
						
							2011-01-10 20:14:19 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	cb1832a755  
						 
						
							
							
								
								
								fallback dbesc() when db is not there  
							
							 
							
							
							
						 
						
							2011-01-10 13:57:59 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	03c1e5a5ad  
						 
						
							
							
								
								
								never enough comments  
							
							 
							
							
							
						 
						
							2010-12-08 23:08:59 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	e241c401cf  
						 
						
							
							
								
								
								significantly enhanced profile security  
							
							 
							
							
							
						 
						
							2010-12-07 19:40:12 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	f4fd679928  
						 
						
							
							
								
								
								couple of issues w/ profile photo update propogation  
							
							 
							
							
							
						 
						
							2010-11-09 18:24:35 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	f7c0480f1b  
						 
						
							
							
								
								
								use raw db queries wherever query items could contain '%'  
							
							 
							
							
							
						 
						
							2010-11-09 15:11:47 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	db22a6cbe0  
						 
						
							
							
								
								
								installation var mis-tagged  
							
							 
							
							
							
						 
						
							2010-11-05 22:23:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mike Macgirvin 
								
							 
						 
						
							
							
								
							
							
	fab63ca751  
						 
						
							
							
								
								
								-Wall cleanup  
							
							 
							
							
							
						 
						
							2010-10-30 13:25:37 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mike Macgirvin 
								
							 
						 
						
							
							
								
							
							
	2028e1695c  
						 
						
							
							
								
								
								rework the logging interface  
							
							 
							
							
							
						 
						
							2010-10-26 22:09:13 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mike Macgirvin 
								
							 
						 
						
							
							
								
							
							
	66a6fd8df0  
						 
						
							
							
								
								
								more instrumentation  
							
							 
							
							
							
						 
						
							2010-10-06 18:14:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mike Macgirvin 
								
							 
						 
						
							
							
								
							
							
	1a1f9b296c  
						 
						
							
							
								
								
								contact search + sync to personal edition, installer db check + curl proxy  
							
							 
							
							
							
						 
						
							2010-08-17 18:44:13 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mike Macgirvin 
								
							 
						 
						
							
							
								
							
							
	35e29e10e6  
						 
						
							
							
								
								
								installer changes, pe sync  
							
							 
							
							
							
						 
						
							2010-08-15 21:49:29 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mike Macgirvin 
								
							 
						 
						
							
							
								
							
							
	51f6671466  
						 
						
							
							
								
								
								only escape dbg tags when running in server mode  
							
							 
							
							
							
						 
						
							2010-08-14 19:48:32 -07:00