Brion Vibber 
							
						 
					 
					
						
						
							
						
						26baad63f2 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-12-22 15:25:38 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						4b41d05a13 
					 
					
						
						
							
							Make restoreuser use new FeedImporter queue handler  
						
						
						
						
					 
					
						2010-12-17 16:27:20 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2e2519afee 
					 
					
						
						
							
							Move account restoration code to a shared library  
						
						... 
						
						
						
						Moved most of the heavy-lifting for account restoration out of
restoreuser.php and into its own class, with the hope that we'll do
the work from the Web eventually. 
						
						
					 
					
						2010-12-15 17:53:38 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9df856e667 
					 
					
						
						
							
							Merge branch '0.9.x' into merge  
						
						... 
						
						
						
						Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php 
						
						
					 
					
						2010-12-07 10:50:05 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						aa96c3c1d9 
					 
					
						
						
							
							Fix for tickets  #2917 ,  #2262 : user URL shortening options not being applied in non-web channels  
						
						... 
						
						
						
						common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc.
Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that.
Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little.
Note also ticket #2919 : there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance. 
						
						
					 
					
						2010-12-02 13:41:56 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0cc332eab6 
					 
					
						
						
							
							a quick script to flush the router from cache if needed  
						
						
						
						
					 
					
						2010-11-30 10:27:32 -05:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						2b0d1d9fc4 
					 
					
						
						
							
							Merge branch 'master' into 0.9.x  
						
						
						
						
					 
					
						2010-11-22 11:13:22 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9c6e63b0bc 
					 
					
						
						
							
							Fixes for delete_status_network.sh:  
						
						... 
						
						
						
						* add some sanity checking: abort on failures instead of plodding through
* add some progress / error output
* fetch the target database server name from the status_network entry and use that to target the DROP DATABASE
Note that database names and other overrides in status_network entry may still not be seen. 
						
						
					 
					
						2010-11-22 11:10:10 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9a590e0843 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-11-19 10:43:20 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						573f98c5bc 
					 
					
						
						
							
							scripts/deletegroup.php -- basic CLI script to delete a group by id or local nickname. Like deleteuser.php, this can be used in batch runs by providing the -y override.  
						
						
						
						
					 
					
						2010-11-18 14:40:05 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						62dfdb34a6 
					 
					
						
						
							
							Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x  
						
						
						
						
					 
					
						2010-11-15 13:56:17 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						defaa3b332 
					 
					
						
						
							
							clear_jabber.php script to clear confirmed jabber/xmpp addresses from one or more accounts  
						
						
						
						
					 
					
						2010-11-15 13:26:42 -08:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b716d01a41 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-11-03 16:09:49 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0229c22d23 
					 
					
						
						
							
							Merge branch '1.0.x' into schema-x  
						
						
						
						
					 
					
						2010-11-02 15:02:55 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						04ca706601 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	actions/confirmaddress.php
	actions/othersettings.php 
						
						
					 
					
						2010-11-02 15:02:10 -07:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						5bd6458f00 
					 
					
						
						
							
							i18n/L10n, translator documentation updates.  
						
						
						
						
					 
					
						2010-11-02 23:00:50 +01:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						345b7d33b8 
					 
					
						
						
							
							some sorta vaguely working bits  
						
						
						
						
					 
					
						2010-10-29 15:28:48 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9ced8af8dc 
					 
					
						
						
							
							fix notices in dumpschema  
						
						
						
						
					 
					
						2010-10-29 15:11:41 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						0c64df8cd9 
					 
					
						
						
							
							Quickie script to aid in building release tarballs -- encapsulates the archive-i18n gen-changelog gen-retar steps.  
						
						
						
						
					 
					
						2010-10-29 14:34:27 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						e7c7fd39fc 
					 
					
						
						
							
							Merge branch '1.0.x' into schema-x  
						
						... 
						
						
						
						Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po 
						
						
					 
					
						2010-10-28 16:27:53 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						b26eccf33c 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-10-28 16:26:34 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						511566a132 
					 
					
						
						
							
							userrole.php will take a profile id for remote profiles  
						
						
						
						
					 
					
						2010-10-26 11:19:47 -04:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						8b0ba03a2e 
					 
					
						
						
							
							Starting to encapsulate some of the schema_version checksum / updater logic  
						
						
						
						
					 
					
						2010-10-19 17:07:37 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						a053871ddc 
					 
					
						
						
							
							update -> create on dumpschema options, easier for me to remember  
						
						
						
						
					 
					
						2010-10-18 17:49:08 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						eb93bdbb03 
					 
					
						
						
							
							some more tweaking to do the mappings during filterDef; not totally sure I like it  
						
						
						
						
					 
					
						2010-10-15 16:32:37 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						d84923470f 
					 
					
						
						
							
							fix bug with --diff on missing table  
						
						
						
						
					 
					
						2010-10-13 17:35:18 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						a421dd934a 
					 
					
						
						
							
							Nicer diff display for schema dump  
						
						
						
						
					 
					
						2010-10-13 16:58:28 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						229c772634 
					 
					
						
						
							
							Filter table definitions to scrub out unsupported features before trying to alter a table. This lets us skip those where we end up trying to change unsupported features.  
						
						
						
						
					 
					
						2010-10-13 16:04:28 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						621233e1ad 
					 
					
						
						
							
							some of the ensureTable stuff partially working  
						
						
						
						
					 
					
						2010-10-12 17:58:26 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						9364e446b1 
					 
					
						
						
							
							Start reworking things to build create table stuff (can view via dumpschema.php --build)  
						
						
						
						
					 
					
						2010-10-11 19:10:51 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3c979ec506 
					 
					
						
						
							
							Add --all option on dumpschema.php to check all core tables  
						
						
						
						
					 
					
						2010-10-07 17:02:42 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						cc69ede1ee 
					 
					
						
						
							
							stop str_repeat from whinging about being run with repeat value of 0. :P  
						
						
						
						
					 
					
						2010-10-07 17:01:14 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						443be8a99c 
					 
					
						
						
							
							some more cleanup on table defs  
						
						
						
						
					 
					
						2010-10-07 17:00:40 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						82e9a2eee8 
					 
					
						
						
							
							Add --diff option to dumpschema.php to run a (quickie text) diff betwen the theoretical and detected schemas for the given tables  
						
						
						
						
					 
					
						2010-10-07 16:49:15 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						312b87ea79 
					 
					
						
						
							
							output tweak hack for primary keys on single line  
						
						
						
						
					 
					
						2010-10-07 16:23:36 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						fcef2aaab7 
					 
					
						
						
							
							Pretty up the table dumper :D  
						
						
						
						
					 
					
						2010-10-07 15:48:38 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						6df4ed697c 
					 
					
						
						
							
							quickie script to test schema fetch  
						
						
						
						
					 
					
						2010-10-06 18:28:19 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						8ff45823ba 
					 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x  
						
						
						
						
					 
					
						2010-10-05 11:40:49 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						c6e8fbebef 
					 
					
						
						
							
							scripts/fixup_group_uri.php to fill in empty user_group.uri entries; needed before changing domain names on sites that are hosting groups for remote users  
						
						
						
						
					 
					
						2010-10-04 15:13:27 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						59119482ca 
					 
					
						
						
							
							Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php 
						
						
					 
					
						2010-10-04 12:54:36 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						1acc7d66c6 
					 
					
						
						
							
							Always specify UTF-8 targt charset for html_entity_decode(); default is 8-bit ISO-8859-1 which causes things to break when we later pass them through things that expect to work with UTF-8. For instance, running through preg_replace() with the /u option results in NULL, leading to problems with OStatus and SubMirror generating their plaintext versions and doing length-cropping.  
						
						
						
						
					 
					
						2010-09-30 11:29:31 -07:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						ec83fef9b7 
					 
					
						
						
							
							Take trailing newline out of i18n.  
						
						
						
						
					 
					
						2010-09-28 01:33:09 +02:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						be14f409e4 
					 
					
						
						
							
							initial script to restore a backed-up user  
						
						
						
						
					 
					
						2010-09-22 12:08:39 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b5cfcba471 
					 
					
						
						
							
							Merge branch '0.9.x' into activityexport  
						
						... 
						
						
						
						Conflicts:
	plugins/OStatus/OStatusPlugin.php 
						
						
					 
					
						2010-09-22 10:45:34 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						78ed0348b0 
					 
					
						
						
							
							Merge remote branch 'gitorious/0.9.x' into 0.9.x  
						
						
						
						
					 
					
						2010-09-21 14:07:48 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						91a1862510 
					 
					
						
						
							
							printfv and printfq functions in commandline.inc  
						
						
						
						
					 
					
						2010-09-21 14:06:39 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ab24007f4c 
					 
					
						
						
							
							throw a catchable exception in getUser()  
						
						
						
						
					 
					
						2010-09-21 06:12:43 -04:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						06272668ec 
					 
					
						
						
							
							Update group ID for translations export.  
						
						
						
						
					 
					
						2010-09-18 23:50:36 +02:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						234b1e6c23 
					 
					
						
						
							
							Remove do_translatewiki_plugin(). No longer needed.  
						
						... 
						
						
						
						Replaced by MediaWiki Translate extension script http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/Translate/scripts/genStatusNetPluginsConfig.php?view=markup  
						
						
					 
					
						2010-09-18 00:23:38 +02:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b1802b8720 
					 
					
						
						
							
							don't redeclare getUser() for backupuser.php  
						
						
						
						
					 
					
						2010-09-15 23:32:27 -04:00