Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	939449602a  
						 
						
							
							
								
								
								Merge remote-tracking branch 'fabrix/newui'  
							
							 
							
							
							
						 
						
							2011-09-27 08:57:16 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Devlon Duthie 
								
							 
						 
						
							
							
								
							
							
	78c3210f6a  
						 
						
							
							
								
								
								fixed a bug I introduced when working on the testbubble theme - user's photo widget header div wasn't closed correctly  
							
							 
							
							... 
							
							
							
							+ some opera-friendly style changes 
							
						 
						
							2011-09-27 00:29:34 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	ae024edbf9  
						 
						
							
							
								
								
								fix "friend of" message in ping.php  
							
							 
							
							
							
						 
						
							2011-09-26 12:14:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	5792b3d358  
						 
						
							
							
								
								
								Merge branch 'master' into newui  
							
							 
							
							
							
						 
						
							2011-09-26 11:42:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	116fc7fcf2  
						 
						
							
							
								
								
								zot endpoint  
							
							 
							
							
							
						 
						
							2011-09-26 02:25:43 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Devlon Duthie 
								
							 
						 
						
							
							
								
							
							
	7dbf112092  
						 
						
							
							
								
								
								added widget class to saved arch block on search page  
							
							 
							
							... 
							
							
							
							added header to search results where there are results 
							
						 
						
							2011-09-25 16:01:05 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Devlon Duthie 
								
							 
						 
						
							
							
								
							
							
	19963884c2  
						 
						
							
							
								
								
								moved invite friends into 'find people' block  
							
							 
							
							... 
							
							
							
							misc. styling tweaks 
							
						 
						
							2011-09-25 15:45:03 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Devlon Duthie 
								
							 
						 
						
							
							
								
							
							
	bbaec4cb78  
						 
						
							
							
								
								
								moved contact group header out of scrolling div so it doens't vanish whenlot  
							
							 
							
							... 
							
							
							
							more css tweaks 
							
						 
						
							2011-09-25 14:08:08 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Devlon Duthie 
								
							 
						 
						
							
							
								
							
							
	3426ce5f94  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							
							
						 
						
							2011-09-25 13:30:55 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Devlon Duthie 
								
							 
						 
						
							
							
								
							
							
	cb1c6dd1e3  
						 
						
							
							
								
								
								really commiting files this time, still getting the hang of git.  
							
							 
							
							... 
							
							
							
							some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks 
							
						 
						
							2011-09-25 13:20:19 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	6a9e22550d  
						 
						
							
							
								
								
								.  
							
							 
							
							
							
						 
						
							2011-09-24 05:45:34 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	7ea6b0a126  
						 
						
							
							
								
								
								fix message ordering glitch on network page  
							
							 
							
							
							
						 
						
							2011-09-23 05:03:12 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	3a2bf8ab7c  
						 
						
							
							
								
								
								w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator  
							
							 
							
							
							
						 
						
							2011-09-23 03:12:31 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	a2b2318106  
						 
						
							
							
								
								
								provide permission error vs "not found" for protected photos  
							
							 
							
							
							
						 
						
							2011-09-22 20:03:09 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	9161d1832e  
						 
						
							
							
								
								
								allow one to toggle into and out of photo edit mode for an entire album  
							
							 
							
							
							
						 
						
							2011-09-21 17:37:02 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	11ca81adba  
						 
						
							
							
								
								
								keychecks  
							
							 
							
							
							
						 
						
							2011-09-21 05:43:26 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	f681535ccf  
						 
						
							
							
								
								
								oexchange updates to new bookmark API  
							
							 
							
							
							
						 
						
							2011-09-20 16:57:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	1c8e89bd03  
						 
						
							
							
								
								
								social bookmark API, oexchange enhancements  
							
							 
							
							
							
						 
						
							2011-09-20 16:31:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	119cd9c0ce  
						 
						
							
							
								
								
								more multiline regex fixes  
							
							 
							
							
							
						 
						
							2011-09-20 04:07:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	9edf15d3ef  
						 
						
							
							
								
								
								structures for batch mode (Diaspora/zot)  
							
							 
							
							
							
						 
						
							2011-09-20 01:49:08 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	8a11cec61a  
						 
						
							
							
								
								
								allow setting all the bookmarked URL fields via script/API  
							
							 
							
							
							
						 
						
							2011-09-19 22:21:55 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	d653d922b1  
						 
						
							
							
								
								
								sorting through key issue  
							
							 
							
							
							
						 
						
							2011-09-19 21:24:16 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	660787916e  
						 
						
							
							
								
								
								template escapes  
							
							 
							
							
							
						 
						
							2011-09-19 20:24:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	63277b57fc  
						 
						
							
							
								
								
								template escapes  
							
							 
							
							
							
						 
						
							2011-09-19 19:46:18 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	a810d2a993  
						 
						
							
							
								
								
								put profile photo on photos page  
							
							 
							
							
							
						 
						
							2011-09-19 16:39:23 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	fd18b42a5a  
						 
						
							
							
								
								
								Check all keys before use  
							
							 
							
							
							
						 
						
							2011-09-19 03:30:59 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	991656a3ef  
						 
						
							
							
								
								
								Show "404.tpl" instead of using 'notice()' in case of 404  
							
							 
							
							
							
						 
						
							2011-09-19 11:52:32 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	0a30a91b14  
						 
						
							
							
								
								
								basic zot discovery framework  
							
							 
							
							
							
						 
						
							2011-09-19 02:13:59 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	2aef98f71d  
						 
						
							
							
								
								
								cripple account when expired  
							
							 
							
							
							
						 
						
							2011-09-19 01:17:12 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	5b3f645939  
						 
						
							
							
								
								
								account expiration structures  
							
							 
							
							
							
						 
						
							2011-09-18 19:53:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	8bf6a29d4e  
						 
						
							
							
								
								
								optimise the commented date view  
							
							 
							
							
							
						 
						
							2011-09-18 19:04:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	9b5d5eca07  
						 
						
							
							
								
								
								Merge branch 'friday'  
							
							 
							
							
							
						 
						
							2011-09-16 06:51:33 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	9c3503a706  
						 
						
							
							
								
								
								update timestamp on activity change (comment/like)  
							
							 
							
							
							
						 
						
							2011-09-16 06:49:24 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	9d2afc2d3c  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendika/master' into newui  
							
							 
							
							
							
						 
						
							2011-09-16 09:39:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	8f1e2efd5b  
						 
						
							
							
								
								
								if photo is uploaded to "profile photos" album it could not be made into profile photo.  
							
							 
							
							
							
						 
						
							2011-09-15 03:06:43 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	46b220518c  
						 
						
							
							
								
								
								don't allow events to finish before they begin  
							
							 
							
							
							
						 
						
							2011-09-14 23:09:09 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	58b2bb5848  
						 
						
							
							
								
								
								localtime cleanup  
							
							 
							
							
							
						 
						
							2011-09-14 19:53:13 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	5c0e135fe9  
						 
						
							
							
								
								
								diaspora protocol changes  
							
							 
							
							
							
						 
						
							2011-09-14 19:33:42 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	12fec75489  
						 
						
							
							
								
								
								ability to re-order network page (no UI yet)  
							
							 
							
							
							
						 
						
							2011-09-13 18:40:15 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	21d35e52dd  
						 
						
							
							
								
								
								provide option for viewing by parent created order  
							
							 
							
							
							
						 
						
							2011-09-13 05:13:01 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	4f24494b0b  
						 
						
							
							
								
								
								Dreamhost's unreliable process model is really getting irritating  
							
							 
							
							
							
						 
						
							2011-09-12 19:42:10 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	57d631b47a  
						 
						
							
							
								
								
								supply default value for update  
							
							 
							
							
							
						 
						
							2011-09-11 22:57:12 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	17b081f9f7  
						 
						
							
							
								
								
								allow html post to api  
							
							 
							
							
							
						 
						
							2011-09-11 21:52:50 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	0e441fe196  
						 
						
							
							
								
								
								bug  #147  comments not working on private notes page  
							
							 
							
							
							
						 
						
							2011-09-11 15:09:57 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	3f59f63224  
						 
						
							
							
								
								
								saved searches on search page, templates: Invalid argument supplied for foreach() on line 167  
							
							 
							
							
							
						 
						
							2011-09-08 21:42:52 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	f03c2b1b79  
						 
						
							
							
								
								
								Merge branch 'pull'  
							
							 
							
							
							
						 
						
							2011-09-08 20:00:57 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	18157769f0  
						 
						
							
							
								
								
								parent eval order issue  
							
							 
							
							
							
						 
						
							2011-09-08 20:00:06 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	d284f8017c  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendika/master' into newui  
							
							 
							
							
							
						 
						
							2011-09-08 20:15:27 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	ad7c111c7c  
						 
						
							
							
								
								
								deal with messages without comments or likes  
							
							 
							
							
							
						 
						
							2011-09-08 14:39:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	694e74d54d  
						 
						
							
							
								
								
								Show conversations in network default view ordered by activity  
							
							 
							
							
							
						 
						
							2011-09-08 11:18:44 +02:00