Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a2b8303925 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	classes/User.php 
						
						
					 
					
						2009-11-02 18:13:04 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						61419038e5 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	README 
						
						
					 
					
						2009-11-02 18:11:45 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						15d0055c6f 
					 
					
						
						
							
							allowed_nickname blocks top level url router names  
						
						
						
						
					 
					
						2009-11-02 15:18:56 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						5581143bee 
					 
					
						
						
							
							Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions.  
						
						... 
						
						
						
						Caching support will be added in future work after unit tests have been added.
* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries
* adapted GeonamesPlugin for new HTTPResponse interface
Note some plugins haven't been fully tested yet. 
						
						
					 
					
						2009-11-02 09:14:15 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b22fc5b74a 
					 
					
						
						
							
							Revert "Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions."  
						
						... 
						
						
						
						Going to restructure a little more before finalizing this...
This reverts commit fa37967858 
						
						
					 
					
						2009-11-02 07:51:29 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						fa37967858 
					 
					
						
						
							
							Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions.  
						
						... 
						
						
						
						Caching support will be added in future work after unit tests have been added.
* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries
Note some plugins haven't been tested yet. 
						
						
					 
					
						2009-11-02 06:31:28 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6664528244 
					 
					
						
						
							
							Revert "Blacklist all files and directories in the web root (INSTALLDIR). Much more elegant than manually keep tracking of these invalid usernames."  
						
						... 
						
						
						
						This reverts commit 15f9c80c28 
						
						
					 
					
						2009-11-01 11:09:14 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						acaf07f6e8 
					 
					
						
						
							
							Added an "Verify Your Identity" page to the OpenID provider  
						
						
						
						
					 
					
						2009-10-30 13:21:37 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						005f85b5ea 
					 
					
						
						
							
							Removed reference to 'api' action which no longer exists since api refactor  
						
						
						
						
					 
					
						2009-10-30 01:25:52 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5d2b35cce6 
					 
					
						
						
							
							get location from a Profile  
						
						
						
						
					 
					
						2009-10-29 14:43:25 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e9644f03de 
					 
					
						
						
							
							get location from a Notice  
						
						
						
						
					 
					
						2009-10-29 14:43:18 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b73d6d18ba 
					 
					
						
						
							
							Merge branch '0.9.x' into location  
						
						
						
						
					 
					
						2009-10-28 17:24:53 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2df1189465 
					 
					
						
						
							
							save replies in the inbox  
						
						
						
						
					 
					
						2009-10-28 15:33:10 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6c615f6801 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-10-28 14:21:51 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7df082abb8 
					 
					
						
						
							
							replace some boolean-evaluations with calls to empty()  
						
						
						
						
					 
					
						2009-10-28 14:21:42 -04:00 
						 
				 
			
				
					
						
							
							
								Carlos Perilla 
							
						 
					 
					
						
						
							
						
						bf701b8235 
					 
					
						
						
							
							Enable welcome bot to broadcast it's notices  
						
						
						
						
					 
					
						2009-10-27 23:38:08 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3c724ccd0d 
					 
					
						
						
							
							Merge branch '0.9.x' into location  
						
						
						
						
					 
					
						2009-10-24 19:59:46 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						967de94665 
					 
					
						
						
							
							update location while saving new profile  
						
						
						
						
					 
					
						2009-10-23 11:47:00 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						943b2bea09 
					 
					
						
						
							
							update location while registering  
						
						
						
						
					 
					
						2009-10-23 11:46:44 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						c93b9b9523 
					 
					
						
						
							
							Merge commit 'refs/merge-requests/1815' of git://gitorious.org/statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-10-23 11:15:25 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b7a4437e79 
					 
					
						
						
							
							flip x flag on generated files  
						
						
						
						
					 
					
						2009-10-21 22:43:41 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6fc5c934ed 
					 
					
						
						
							
							statusnet.ini update  
						
						
						
						
					 
					
						2009-10-21 22:43:41 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2ed073f295 
					 
					
						
						
							
							new data structures for location  
						
						
						
						
					 
					
						2009-10-21 22:43:40 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						0bbc05c1d5 
					 
					
						
						
							
							Merge branch '0.9.x' into TwitterBridgePlugin  
						
						
						
						
					 
					
						2009-10-16 23:42:02 +00:00 
						 
				 
			
				
					
						
							
							
								Trever Fischer 
							
						 
					 
					
						
						
							
						
						1241e651ae 
					 
					
						
						
							
							Added support for profile designs to the twitter API  
						
						
						
						
					 
					
						2009-10-15 05:16:37 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						0fd8e758ad 
					 
					
						
						
							
							Make queuing and daemons work via events  
						
						
						
						
					 
					
						2009-10-14 04:50:16 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4f5badda94 
					 
					
						
						
							
							remove inboxes option  
						
						
						
						
					 
					
						2009-10-13 17:38:27 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						f719720e8a 
					 
					
						
						
							
							Merge remote branch 'statusnet/0.8.x' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	lib/common.php 
						
						
					 
					
						2009-10-11 13:39:10 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						bf1c662990 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						
						
						
					 
					
						2009-10-09 14:07:45 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						88e7092d23 
					 
					
						
						
							
							don't write session if it's unchanged  
						
						
						
						
					 
					
						2009-10-09 10:39:56 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						c5047fd90a 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	classes/Profile.php 
						
						
					 
					
						2009-10-04 03:07:37 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						18f4a7eaea 
					 
					
						
						
							
							reformat Notice.php  
						
						
						
						
					 
					
						2009-10-03 20:34:40 -04:00 
						 
				 
			
				
					
						
							
							
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						bcdf31c639 
					 
					
						
						
							
							added all them doxygens  
						
						
						
						
					 
					
						2009-10-04 11:14:26 +13:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						be513db013 
					 
					
						
						
							
							copy-and-paste typo in profile deletion  
						
						
						
						
					 
					
						2009-10-02 15:42:34 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						94e3f6bb09 
					 
					
						
						
							
							also delete blocks  
						
						
						
						
					 
					
						2009-10-02 15:29:57 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b3b3af9a2e 
					 
					
						
						
							
							Merge branch '0.8.x' into deleteuser  
						
						
						
						
					 
					
						2009-10-02 15:27:55 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0a57d1ccee 
					 
					
						
						
							
							change string return from Notice::saveNew to exceptions  
						
						
						
						
					 
					
						2009-09-29 17:16:07 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3afcdc18f7 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-09-27 21:15:14 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						38345d0783 
					 
					
						
						
							
							let hooks override standard user rights  
						
						
						
						
					 
					
						2009-09-27 21:11:45 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6c069312e2 
					 
					
						
						
							
							user rights  
						
						
						
						
					 
					
						2009-09-27 21:11:45 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						fc2426d7ce 
					 
					
						
						
							
							Fix some bugs in the URL linkification, and fixed the unit test.  
						
						
						
						
					 
					
						2009-09-27 16:52:15 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						93b7e60115 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	EVENTS.txt 
						
						
					 
					
						2009-09-24 17:24:15 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b5b3690eef 
					 
					
						
						
							
							Merge branch 'master' into 0.8.x  
						
						
						
						
					 
					
						2009-09-24 17:15:36 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8284b3cb82 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/noticeform.php 
						
						
					 
					
						2009-09-23 09:45:22 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						15f9c80c28 
					 
					
						
						
							
							Blacklist all files and directories in the web root (INSTALLDIR). Much more elegant than manually keep tracking of these invalid usernames.  
						
						
						
						
					 
					
						2009-09-18 17:53:06 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						46ece1178c 
					 
					
						
						
							
							check correct define (not backwards compatible)  
						
						
						
						
					 
					
						2009-09-15 21:12:44 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						13147143fc 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2009-09-15 17:16:35 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						4a97ad9efe 
					 
					
						
						
							
							Remove unnecessary Profile::pkeyGet  
						
						... 
						
						
						
						Thanks for the info, Evan. 
						
						
					 
					
						2009-09-15 17:08:26 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						bb48698416 
					 
					
						
						
							
							Add missing pkeyGet override to the Profile class  
						
						
						
						
					 
					
						2009-09-13 21:43:29 -04:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						2a06f2ac5b 
					 
					
						
						
							
							If there is no mimetype set, the file shouldn't be considered an enclosure  
						
						
						
						
					 
					
						2009-09-10 21:21:01 -04:00