Brion Vibber 
							
						 
					 
					
						
						
							
						
						3ac3bc32fc 
					 
					
						
						
							
							Some localization cleanup and doc to aid in customization:  
						
						... 
						
						
						
						* added locale/en/LC_MESSAGES/statusnet.po to make it easier to start customizing English texts
* added notes to locale/README about customizing and how to disable languages you haven't customized
* renamed PO templates from *.po to *.pot to match general conventions and reduce confusion for people trying to find which file they're supposed to edit 
						
						
					 
					
						2010-04-05 13:19:16 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						01a03e34c8 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-03-29 15:15:51 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f0d905112e 
					 
					
						
						
							
							Merge branch 'master' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	lib/attachmentlist.php 
						
						
					 
					
						2010-03-28 15:25:02 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						642adc3b00 
					 
					
						
						
							
							add an option to run a command as the site owner  
						
						
						
						
					 
					
						2010-03-28 14:38:07 -04:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						c3ceaa893f 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x  
						
						
						
						
					 
					
						2010-03-24 14:11:01 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						ecb009bcf5 
					 
					
						
						
							
							Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-03-24 13:57:20 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						13d59e0c76 
					 
					
						
						
							
							fixup_deletions.php script to look for notices posted by now-deleted profiles and remove them.  
						
						
						
						
					 
					
						2010-03-23 17:24:01 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						a5c78a6f1a 
					 
					
						
						
							
							Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-03-23 08:21:32 -07:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						b8e97ac709 
					 
					
						
						
							
							Some initial media parsing  
						
						... 
						
						
						
						- Activity now returns a list of activity objects
- Processing of photo objects 
						
						
					 
					
						2010-03-22 18:55:17 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						e89908f261 
					 
					
						
						
							
							Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	lib/channel.php
	scripts/imdaemon.php 
						
						
					 
					
						2010-03-22 13:56:16 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3e2e88b0df 
					 
					
						
						
							
							Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-03-18 17:19:28 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0fe82bd0c9 
					 
					
						
						
							
							Runtime check for known bad PHP versions with 64-bit stream_select() bug in xmppdaemon.php.  
						
						
						
						
					 
					
						2010-03-18 11:08:27 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						67f2f01c5e 
					 
					
						
						
							
							Merge branch 'testing' into 0.9.x  
						
						
						
						
					 
					
						2010-03-17 12:15:40 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						ca5612c451 
					 
					
						
						
							
							Merge branch 'master' into testing  
						
						
						
						
					 
					
						2010-03-17 12:15:12 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3e2b806e75 
					 
					
						
						
							
							Add scripts/docgen.php to build basic doxygen HTML docs from doc comments, either for core or a given plugin.  
						
						... 
						
						
						
						Nothing too fancy yet; style and layout needs some loving! 
						
						
					 
					
						2010-03-15 09:42:25 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						6828567ed0 
					 
					
						
						
							
							Add forgotten scripts/fixup_files.php to clean up "the h bug"  
						
						
						
						
					 
					
						2010-03-11 11:52:19 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						6d73fc1d54 
					 
					
						
						
							
							Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-03-10 11:57:38 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						54ff17010b 
					 
					
						
						
							
							Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing  
						
						
						
						
					 
					
						2010-03-10 11:56:51 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						532e486a93 
					 
					
						
						
							
							Detect when queuedaemon/xmppdaemon parent processes die and kill the child processes.  
						
						... 
						
						
						
						Keeps stray daemon subprocesses from floating around when we kill the parents via a signal!
Accomplished by opening a bidirectional pipe in the parent process; the children close out the writer end and keep the reader in their open sockets list. When the parent dies, the children see that the socket's been closed out and can perform an orderly shutdown. 
						
						
					 
					
						2010-03-10 11:54:00 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						6ea7e1c06e 
					 
					
						
						
							
							Merge branch 'testing' into 0.9.x  
						
						
						
						
					 
					
						2010-03-09 14:20:50 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						971f1f64f1 
					 
					
						
						
							
							Added scripts/command.php, can be used to run commands such as subscription on behalf of users.  
						
						... 
						
						
						
						This includes whatever support for extended command parsing plugins may have added.
Example:
  ./scripts/command.php -nbrionv sub update@status.net  
						
						
					 
					
						2010-03-09 13:41:05 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						6c4ade4251 
					 
					
						
						
							
							Merge branch 'testing' into 0.9.x  
						
						
						
						
					 
					
						2010-03-09 11:27:53 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						61434ebaa2 
					 
					
						
						
							
							a script to flush site  
						
						
						
						
					 
					
						2010-03-09 10:55:48 -05:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						714d920fae 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	classes/statusnet.ini
	db/statusnet.sql
	lib/jabber.php
	lib/xmppmanager.php 
						
						
					 
					
						2010-03-08 17:22:23 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7faf6ec755 
					 
					
						
						
							
							add a script to import Twitter atom feed as notices  
						
						
						
						
					 
					
						2010-03-07 23:42:22 -05:00 
						 
				 
			
				
					
						
							
							
								Rasmus Lerdorf 
							
						 
					 
					
						
						
							
						
						086d517b87 
					 
					
						
						
							
							Fix a few typos  
						
						
						
						
					 
					
						2010-03-04 23:30:04 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						f969d6349c 
					 
					
						
						
							
							Merge branch 'testing' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	db/08to09.sql 
						
						
					 
					
						2010-03-04 10:16:59 -08:00 
						 
				 
			
				
					
						
							
							
								James Walker 
							
						 
					 
					
						
						
							
						
						02f49193d5 
					 
					
						
						
							
							adding checkschema to setup script  
						
						
						
						
					 
					
						2010-03-04 11:49:19 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3c4ead4996 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	db/08to09.sql
	locale/statusnet.po
	scripts/update_po_templates.php 
						
						
					 
					
						2010-03-01 14:59:26 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						00f724d0e6 
					 
					
						
						
							
							Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints.  
						
						
						
						
					 
					
						2010-03-01 14:10:13 -08:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						87c17bc0f0 
					 
					
						
						
							
							Also extract _m() used in core.  
						
						... 
						
						
						
						Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl > 
						
						
					 
					
						2010-03-01 15:47:43 +01:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9b366547d7 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-02-26 12:33:50 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6781f95c73 
					 
					
						
						
							
							Merge branch 'blacklistplus' into testing  
						
						... 
						
						
						
						Conflicts:
	EVENTS.txt 
						
						
					 
					
						2010-02-26 12:40:30 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						8dfc8f1635 
					 
					
						
						
							
							Merge branch 'testing' into 0.9.x  
						
						
						
						
					 
					
						2010-02-26 09:35:28 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						200a32b922 
					 
					
						
						
							
							don't choke on dupelimit in createsim.php  
						
						
						
						
					 
					
						2010-02-26 12:19:33 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						c8ddcbe0d3 
					 
					
						
						
							
							init_conversation.php script to copy old notice conversations into the conversation table  
						
						
						
						
					 
					
						2010-02-25 17:56:01 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						4a71753f20 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into testing  
						
						
						
						
					 
					
						2010-02-25 09:28:19 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						99c0e16844 
					 
					
						
						
							
							Merge commit 'refs/merge-requests/121' of git://gitorious.org/statusnet/mainline into integration  
						
						
						
						
					 
					
						2010-02-25 09:12:45 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						66373f8e5a 
					 
					
						
						
							
							Merge commit 'refs/merge-requests/2220' of git://gitorious.org/statusnet/mainline into integration  
						
						
						
						
					 
					
						2010-02-25 09:11:07 -08:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						c187bf5597 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	EVENTS.txt
	db/statusnet.sql
	lib/queuemanager.php 
						
						
					 
					
						2010-02-24 20:52:45 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						8914b69d50 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-02-24 16:35:57 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3b7084c6dd 
					 
					
						
						
							
							Fix update_po_templates.php to support the plural and context variants of _m() in plugins  
						
						
						
						
					 
					
						2010-02-24 16:34:45 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						85528ccb1f 
					 
					
						
						
							
							Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-02-21 11:12:56 -08:00 
						 
				 
			
				
					
						
							
							
								Christopher Vollick 
							
						 
					 
					
						
						
							
						
						e717cba19c 
					 
					
						
						
							
							Add Script To Update Group Avatar URLs  
						
						... 
						
						
						
						Similar to scripts/updateavatarurl.php.
Works for groups.
Again, I had to do some weird thing because using clone screwed up the find() iteration. 
						
						
					 
					
						2010-02-18 13:44:16 -05:00 
						 
				 
			
				
					
						
							
							
								Christopher Vollick 
							
						 
					 
					
						
						
							
						
						ddef800ec9 
					 
					
						
						
							
							Update Avatar URL Did Weird Stuff.  
						
						... 
						
						
						
						It was only finding the first two avatars and then thinking it was done.
I'm not entirely sure why it was doing that.
I think maybe all the cloning made it forget where it was or something.
Either way, it seems to work now, and really uses less memory. 
						
						
					 
					
						2010-02-18 12:14:34 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						07f145049e 
					 
					
						
						
							
							Merge branch 'master' into testing  
						
						
						
						
					 
					
						2010-02-17 16:52:13 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						ce6be4f836 
					 
					
						
						
							
							Queues: redid the breakout control model so we can start up and subscribe to queues without running through the complete site list, which is ok at 1k sites but too slow at 10k.  
						
						... 
						
						
						
						All breakout queues that we're going to need to listen to now need to be explicitly listed in $config['queue']['breakout'].
Until XMPP is moved to component model, this setting will let the individual processes work with their own queues:
$config['queue']['breakout'][] = 'xmpp/xmppout/' . $config['site']['nickname']; 
						
						
					 
					
						2010-02-17 16:49:00 -08:00 
						 
				 
			
				
					
						
							
							
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						20d6a7caed 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	lib/queuemanager.php
	lib/xmppmanager.php
	plugins/Xmpp/Fake_XMPP.php
	scripts/imdaemon.php 
						
						
					 
					
						2010-02-16 13:15:09 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						d5cbfe8071 
					 
					
						
						
							
							Merge branch 'testing' into 0.9.x  
						
						... 
						
						
						
						Conflicts:
	lib/iomaster.php 
						
						
					 
					
						2010-02-16 09:25:09 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						81b6b58e33 
					 
					
						
						
							
							Merge branch 'master' into testing  
						
						... 
						
						
						
						Conflicts:
	lib/stompqueuemanager.php 
						
						
					 
					
						2010-02-16 09:22:02 -08:00