Craig Andrews 
							
						 
					 
					
						
						
							
						
						a535ccdc4e 
					 
					
						
						
							
							Merge remote branch 'laconica/0.8.x' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	lib/common.php
	lib/twitter.php 
						
						
					 
					
						2009-09-02 16:42:15 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						efcfd209ef 
					 
					
						
						
							
							Check "Files" of type 'application/xhtml+xml' for oEmbed in addition to just text/html  
						
						
						
						
					 
					
						2009-09-01 23:18:39 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c628029ef1 
					 
					
						
						
							
							Status_network had wrong ini file  
						
						
						
						
					 
					
						2009-08-28 10:42:34 -07:00 
						 
				 
			
				
					
						
							
							
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						815630fe63 
					 
					
						
						
							
							used standard SQL that mysql and pgsql both like  
						
						
						
						
					 
					
						2009-08-28 20:45:12 +12:00 
						 
				 
			
				
					
						
							
							
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						b9ea2bf1bc 
					 
					
						
						
							
							used standard SQL that mysql and pgsql both like  
						
						
						
						
					 
					
						2009-08-28 20:44:11 +12:00 
						 
				 
			
				
					
						
							
							
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						b833b725a8 
					 
					
						
						
							
							make use of common_database_tablename()  
						
						
						
						
					 
					
						2009-08-28 20:42:13 +12:00 
						 
				 
			
				
					
						
							
							
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						06514aa001 
					 
					
						
						
							
							fix for SQL error: ERROR: syntax error at or near ")" at character 45  
						
						... 
						
						
						
						http://laconi.ca/trac/ticket/1735  
					
						2009-08-28 20:05:19 +12:00 
						 
				 
			
				
					
						
							
							
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						e277c856d6 
					 
					
						
						
							
							fix for SQL error: ERROR: syntax error at or near ")" at character 45  
						
						... 
						
						
						
						http://laconi.ca/trac/ticket/1735  
					
						2009-08-28 20:00:55 +12:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c0d03fc279 
					 
					
						
						
							
							make URL analyzer save new info on URLs  
						
						
						
						
					 
					
						2009-08-27 20:23:31 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						34ce75c71d 
					 
					
						
						
							
							remove duplicate save of Notice and streamline attachment detection  
						
						
						
						
					 
					
						2009-08-27 20:09:07 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						35a78de93b 
					 
					
						
						
							
							changes to File  
						
						
						
						
					 
					
						2009-08-27 14:53:16 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a08c76a434 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	classes/laconica.ini 
						
						
					 
					
						2009-08-27 14:52:32 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						522008dee5 
					 
					
						
						
							
							methods on User to grant, check, and revoke roles  
						
						
						
						
					 
					
						2009-08-27 11:38:31 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						41ee56f770 
					 
					
						
						
							
							flip executable bit on User_role.php  
						
						
						
						
					 
					
						2009-08-27 11:22:24 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f8afad03ad 
					 
					
						
						
							
							add data object class for user_role  
						
						
						
						
					 
					
						2009-08-27 11:21:57 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5d09b6b3f0 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php 
						
						
					 
					
						2009-08-27 11:16:45 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f1fda6c050 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						
						
						
					 
					
						2009-08-27 07:56:19 -07:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						3e362233ee 
					 
					
						
						
							
							Merge commit 'laconica/0.8.x' into 0.9.x  
						
						
						
						
					 
					
						2009-08-26 21:56:59 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						504c42aa7d 
					 
					
						
						
							
							Fix some stupid bugs, such as a mispelling of oembed  
						
						
						
						
					 
					
						2009-08-26 21:51:54 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						6d60d74093 
					 
					
						
						
							
							Display linked oembed resources as enclosures if they are of non-html mime types  
						
						
						
						
					 
					
						2009-08-26 15:40:51 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						d9e8dabaf4 
					 
					
						
						
							
							Save the mimetype for oEmbed linked url  
						
						
						
						
					 
					
						2009-08-26 14:53:52 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						df86aa7214 
					 
					
						
						
							
							define LACONICA and accept LACONICA for backwards compatibility  
						
						
						
						
					 
					
						2009-08-26 10:41:36 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3567b9d708 
					 
					
						
						
							
							global search and replace for laconica -> statusnet  
						
						
						
						
					 
					
						2009-08-25 18:53:24 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						865b716f09 
					 
					
						
						
							
							change LACONICA to STATUSNET  
						
						
						
						
					 
					
						2009-08-25 18:42:34 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4737563b95 
					 
					
						
						
							
							a distributed -> the distributed  
						
						
						
						
					 
					
						2009-08-25 18:14:12 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c8b8f07af1 
					 
					
						
						
							
							change Laconica and Control Yourself to StatusNet in PHP files  
						
						
						
						
					 
					
						2009-08-25 18:12:20 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d0baab6978 
					 
					
						
						
							
							Merge branch '0.8.x' into testing  
						
						
						
						
					 
					
						2009-08-25 18:01:46 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c87e1de017 
					 
					
						
						
							
							Rename Laconica to StatusNet  
						
						
						
						
					 
					
						2009-08-25 17:56:10 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						ec83890bc2 
					 
					
						
						
							
							Take token field out of foreign_link  
						
						... 
						
						
						
						This undoes patch a49272d448 
						
						
					 
					
						2009-08-25 15:48:06 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						9fd3a41576 
					 
					
						
						
							
							ftps protocol should be handled the same way as ftp  
						
						... 
						
						
						
						Canon urls that have a protocol followed by a host (and no path) automatcally get a trailing slash by the canon function - make the unit test match that 
						
						
					 
					
						2009-08-24 20:44:06 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ff87732053 
					 
					
						
						
							
							Merge branch '0.8.x' into testing  
						
						... 
						
						
						
						Conflicts:
	actions/twitterauthorization.php
	lib/oauthclient.php
	lib/twitter.php
	lib/twitterapi.php
	lib/twitteroauthclient.php
	scripts/twitterstatusfetcher.php 
						
						
					 
					
						2009-08-24 16:55:49 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						5d5b9f7022 
					 
					
						
						
							
							Add new Foreign_link col to store OAuth access token  
						
						
						
						
					 
					
						2009-08-24 11:52:06 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9f356b55c6 
					 
					
						
						
							
							Merge branch '0.9.x' into openidplugin  
						
						... 
						
						
						
						Conflicts:
	actions/login.php
	actions/register.php 
						
						
					 
					
						2009-08-21 16:27:43 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8236037bf0 
					 
					
						
						
							
							Merge branch 'dbconfig' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	lib/common.php 
						
						
					 
					
						2009-08-21 16:17:06 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						538dcf2eef 
					 
					
						
						
							
							load configuration options from database at runtime  
						
						
						
						
					 
					
						2009-08-21 16:14:32 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b2664e1ae2 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	actions/updateprofile.php
	actions/userauthorization.php
	classes/User_group.php
	index.php
	install.php
	lib/accountsettingsaction.php
	lib/logingroupnav.php 
						
						
					 
					
						2009-08-21 15:42:11 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						888ed474a1 
					 
					
						
						
							
							new class for configuration settings  
						
						
						
						
					 
					
						2009-08-21 15:22:02 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d5825893c8 
					 
					
						
						
							
							validation code in Notice correctly checks length of content  
						
						
						
						
					 
					
						2009-08-21 08:12:57 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4d05afae30 
					 
					
						
						
							
							Notice class has methods to check content length  
						
						
						
						
					 
					
						2009-08-21 08:05:13 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4d3e2daf53 
					 
					
						
						
							
							check correct setting in Profile bio length  
						
						
						
						
					 
					
						2009-08-21 07:48:14 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d2d3418b8a 
					 
					
						
						
							
							Profile class has methods to check bio length  
						
						
						
						
					 
					
						2009-08-21 07:40:46 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d88839d167 
					 
					
						
						
							
							methods for Message to check max content length  
						
						
						
						
					 
					
						2009-08-21 07:20:59 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						92ef4895b4 
					 
					
						
						
							
							can set group desc limit to unlimited without resetting global limit  
						
						
						
						
					 
					
						2009-08-21 06:36:55 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						cd688acceb 
					 
					
						
						
							
							allow configurable length for user group description  
						
						
						
						
					 
					
						2009-08-21 06:33:22 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						900ca5c50c 
					 
					
						
						
							
							data classes allow >140c in user group descriptions  
						
						
						
						
					 
					
						2009-08-21 06:33:21 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fa6b49ab38 
					 
					
						
						
							
							data classes allow >140 bios in profiles  
						
						
						
						
					 
					
						2009-08-21 06:33:21 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4b44308988 
					 
					
						
						
							
							Messages can be >140c in classes  
						
						
						
						
					 
					
						2009-08-21 06:33:21 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d213a8cf90 
					 
					
						
						
							
							update data classes for TEXT content in notice  
						
						
						
						
					 
					
						2009-08-21 06:33:21 -04:00 
						 
				 
			
				
					
						
							
							
								Marcel van der Boom 
							
						 
					 
					
						
						
							
						
						418a5a95ab 
					 
					
						
						
							
							Change the notice type defines all into class constants and adapt all files.  
						
						
						
						
					 
					
						2009-08-20 13:11:22 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						c049931dc7 
					 
					
						
						
							
							Return null if all columns in the compound primary key aren't specified  
						
						
						
						
					 
					
						2009-08-18 23:46:08 +00:00