Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	93143702ed
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php 
							
						 | 
						
							2013-02-17 12:35:40 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5e077e541a
						 | 
						
							
							
								
								
								The community page is speeded up.
							
							
							
							
							
							
							
							Photos will be compressed before the output. 
							
						 | 
						
							2013-02-06 08:01:46 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	46c5a97a20
						 | 
						
							
							
								
								
								New caching system for photos
							
							
							
							
							
						 | 
						
							2012-12-14 22:47:30 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	25b4ec32c7
						 | 
						
							
							
								
								
								Clean up code - removed useless cache code
							
							
							
							
							
						 | 
						
							2012-11-17 14:27:30 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	f17377e6de
						 | 
						
							
							
								
								
								New cache system with subdirectories
							
							
							
							
							
						 | 
						
							2012-11-17 00:50:39 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	ba2452a076
						 | 
						
							
							
								
								
								png support for embedded private photos
							
							
							
							
							
						 | 
						
							2012-06-07 16:02:56 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	7cc8c369cb
						 | 
						
							
							
								
								
								Add support for PNG images with alpha
							
							
							
							
							
						 | 
						
							2012-06-07 17:42:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	7cfa7a7671
						 | 
						
							
							
								
								
								tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work
							
							
							
							
							
						 | 
						
							2012-05-17 19:59:46 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tobias Hößl
								
							 
						 | 
						
							
							
								
							
							
	720c8324c7
						 | 
						
							
							
								
								
								Some Bugfixes, and variable checks
							
							
							
							
							
						 | 
						
							2012-04-17 11:33:50 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c88c2515e4
						 | 
						
							
							
								
								
								API: Improved the timeline. Several (disabled) tests with caching of photos.
							
							
							
							
							
						 | 
						
							2012-04-11 19:31:01 +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
								
							 
						 | 
						
							
							
								
							
							
	ef33cfcc9a
						 | 
						
							
							
								
								
								move friend suggestions to top of contact page, add default contact profile photos if missing
							
							
							
							
							
						 | 
						
							2012-03-20 16:05:32 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	894278dbcc
						 | 
						
							
							
								
								
								change default profile photo to something more interesting than a reddish brown square
							
							
							
							
							
						 | 
						
							2012-03-20 15:41:06 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tobias Hößl
								
							 
						 | 
						
							
							
								
							
							
	b102a1d5ec
						 | 
						
							
							
								
								
								is not always defined; but if defined, then always of type integer
							
							
							
							
							
						 | 
						
							2012-02-26 20:43:23 +00: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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	f4c961b906
						 | 
						
							
							
								
								
								override pragma
							
							
							
							
							
						 | 
						
							2011-10-01 02:22:48 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	8fb2d02d3d
						 | 
						
							
							
								
								
								typo last checkin
							
							
							
							
							
						 | 
						
							2011-09-30 18:00:32 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	0508ccf50f
						 | 
						
							
							
								
								
								restore photo cache
							
							
							
							
							
						 | 
						
							2011-09-30 17:47:33 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	d45a66e700
						 | 
						
							
							
								
								
								allow custom avatar sizes - needed for Diaspora hcard/vcard
							
							
							
							
							
						 | 
						
							2011-08-03 21:05:39 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	53653f6a4d
						 | 
						
							
							
								
								
								consolidate perrmisions sql, minor duepuntozero validation fixes
							
							
							
							
							
						 | 
						
							2011-06-30 17:35:35 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	cb6c1f91b7
						 | 
						
							
							
								
								
								rolling version number in preparation for release
							
							
							
							
							
						 | 
						
							2011-05-09 16:51:25 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	2270e73fcd
						 | 
						
							
							
								
								
								show permission denied photo when direct link was accessed and authentication is insufficient to view
							
							
							
							
							
						 | 
						
							2011-03-09 21:29:32 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	d825db3649
						 | 
						
							
							
								
								
								lint
							
							
							
							
							
						 | 
						
							2010-11-07 15:46:49 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	b94cb8d234
						 | 
						
							
							
								
								
								add micro profile photo
							
							
							
							
							
						 | 
						
							2010-11-04 23:50:32 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	f0b6400584
						 | 
						
							
							
								
								
								more lint
							
							
							
							
							
						 | 
						
							2010-10-31 16:38:22 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	06bdf8a4cf
						 | 
						
							
							
								
								
								atom auto-discover, fix image preloading in ajax
							
							
							
							
							
						 | 
						
							2010-08-10 16:54:36 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	04e65823d7
						 | 
						
							
							
								
								
								more post branch bug fixes
							
							
							
							
							
						 | 
						
							2010-08-10 05:58:22 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	d090033a0a
						 | 
						
							
							
								
								
								more photo progress
							
							
							
							
							
						 | 
						
							2010-08-04 20:03:38 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	c3fd5ed732
						 | 
						
							
							
								
								
								one true profile photo, force nicknames
							
							
							
							
							
						 | 
						
							2010-07-19 19:09:58 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mike Macgirvin
								
							 
						 | 
						
							
							
								
							
							
	6348e70daa
						 | 
						
							
							
								
								
								Initial checkin
							
							
							
							
							
						 | 
						
							2010-07-01 16:48:07 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |