Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						937521a1c6
					 | 
					
						
						
							
							add an index for site tags
						
						
						
						
						
						
					 | 
					
						2011-04-26 13:02:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shashi Gowda
							
						 
					 | 
					
						
						
							
						
						57198a7464
					 | 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
						
						
						
						
						
						
						
						Conflicts:
	actions/tagother.php
	lib/subscriberspeopleselftagcloudsection.php
	lib/subscriptionspeopleselftagcloudsection.php 
						
						
					 | 
					
						2011-04-04 13:26:27 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						9d0ccbff01
					 | 
					
						
						
							
							add a privacy flag to user table
						
						
						
						
						
						
					 | 
					
						2011-03-30 06:37:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shashi Gowda
							
						 
					 | 
					
						
						
							
						
						5a2bab07b2
					 | 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
						
						
						
						
						
						
						
						Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js 
						
						
					 | 
					
						2011-03-30 15:47:42 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						65694366df
					 | 
					
						
						
							
							Add a scope-forcing flag to user_group
						
						
						
						
						
						
					 | 
					
						2011-03-30 05:55:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						e862dcdb8a
					 | 
					
						
						
							
							Merge branch '1.0.x' into limitdist2
						
						
						
						
						
						
					 | 
					
						2011-03-28 21:56:34 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						df5def8ce4
					 | 
					
						
						
							
							Work in progress: subscription approval policy field in place on user, hooked up to settings. Queue not 100% tidied up, no UI for queue or management yet.
						
						
						
						
						
						
					 | 
					
						2011-03-28 15:13:59 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						4eb02c624e
					 | 
					
						
						
							
							Subscription_queue class for subscription approval
						
						
						
						
						
						
					 | 
					
						2011-03-28 13:59:48 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						7f74aa6c20
					 | 
					
						
						
							
							Add scope bitmap for notices
						
						
						
						
						
						
					 | 
					
						2011-03-22 11:56:28 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shashi Gowda
							
						 
					 | 
					
						
						
							
						
						bf121a695a
					 | 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
						
						
						
						
						
						
						
						Conflicts:
	classes/Profile.php 
						
						
					 | 
					
						2011-03-22 07:59:06 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shashi Gowda
							
						 
					 | 
					
						
						
							
						
						31c1177970
					 | 
					
						
						
							
							Merge branch '1.0.x' into people_tags_rebase
						
						
						
						
						
						
						
						Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php 
						
						
					 | 
					
						2011-03-22 07:56:25 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						a54eb0941e
					 | 
					
						
						
							
							Tweaking request_queue -> group_join_queue, easier to deal with the indexes and keys and caching this way.
						
						
						
						
						
						
					 | 
					
						2011-03-21 15:05:36 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						0bec9cfdbc
					 | 
					
						
						
							
							Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation.
						
						
						
						
						
						
						
						UI for setting the join policy is in, but not yet used. 
						
						
					 | 
					
						2011-03-21 13:51:13 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						1b5faf1c4e
					 | 
					
						
						
							
							correct length and default value for object_type
						
						
						
						
						
						
					 | 
					
						2011-03-07 03:34:20 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						a0e2ebec8f
					 | 
					
						
						
							
							add activity object type to notice
						
						
						
						
						
						
					 | 
					
						2011-03-07 03:34:20 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Shashi Gowda
							
						 
					 | 
					
						
						
							
						
						32a00059fa
					 | 
					
						
						
							
							Database schema
						
						
						
						
						
						
					 | 
					
						2011-03-06 23:26:27 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						b7d0746694
					 | 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x
						
						
						
						
						
						
						
						Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css 
						
						
					 | 
					
						2011-02-28 15:39:43 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						f6cb4ea58d
					 | 
					
						
						
							
							Add IdentiCurse to notice sources
						
						
						
						
						
						
					 | 
					
						2011-01-26 10:51:44 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						debf4dacf1
					 | 
					
						
						
							
							change default urlshortener from ur1.ca to internal
						
						
						
						
						
						
					 | 
					
						2011-01-23 16:51:18 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						963e7576f2
					 | 
					
						
						
							
							Merge branch 'testing' into moveaccount
						
						
						
						
						
						
					 | 
					
						2011-01-19 10:41:14 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						1d24ece32e
					 | 
					
						
						
							
							add rss.me to notice_source defaults
						
						
						
						
						
						
					 | 
					
						2011-01-18 15:18:55 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						f9b2feb7f5
					 | 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x
						
						
						
						
						
						
						
						Conflicts:
	README 
						
						
					 | 
					
						2011-01-12 18:05:56 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Craig Andrews
							
						 
					 | 
					
						
						
							
						
						f5a4e35059
					 | 
					
						
						
							
							Add Dialog Axiata to SMS carriers
						
						
						
						
						
						
					 | 
					
						2011-01-05 13:13:45 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						d8a3a88ec8
					 | 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x
						
						
						
						
						
						
						
						Conflicts:
	classes/Memcached_DataObject.php 
						
						
					 | 
					
						2010-12-17 17:13:21 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						5300d657cc
					 | 
					
						
						
							
							Sort indexing fix for profile sidebar: add group_member_profile_id_created_idx to group_member table, streamlines sorting of your group memberships in the sidebar
						
						
						
						
						
						
					 | 
					
						2010-12-17 16:22:26 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						146d6b8b73
					 | 
					
						
						
							
							Sorting index fix for role lookups: adds profile_role_role_created_profile_id_idx index on profile_role
						
						
						
						
						
						
					 | 
					
						2010-12-17 16:12:44 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						fb65d5901d
					 | 
					
						
						
							
							Update sorting for conversation views: adds notice_conversation_created_id_idx index on notice, replacing more limited notice_conversation_idx
						
						
						
						
						
						
					 | 
					
						2010-12-17 16:08:37 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						1b90ed564a
					 | 
					
						
						
							
							Update sorting on api/statuses/retweets: adds notice_repeat_of_created_id_idx index to replace notice_repeatof_idx
						
						
						
						
						
						
					 | 
					
						2010-12-17 15:13:09 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						66474586af
					 | 
					
						
						
							
							Update sorting for group inbox timelines; adds group_inbox_group_id_created_notice_id_idx index to group_inbox table
						
						
						
						
						
						
					 | 
					
						2010-12-17 14:51:37 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						3ddfa4de93
					 | 
					
						
						
							
							Update sorting on reply/mentions timeline: added reply_profile_id_modified_notice_id_idx index to reply table
						
						
						
						
						
						
					 | 
					
						2010-12-17 14:43:45 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						00a5a5342a
					 | 
					
						
						
							
							Update sorting for tag-filtered public timeline: needs notice_tag_tag_created_notice_id_idx index added to notice_tag
						
						
						
						
						
						
					 | 
					
						2010-12-17 14:37:46 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						53dd2583fc
					 | 
					
						
						
							
							Switch public timeline to new sorting; new index notice_created_id_is_local_idx
						
						
						
						
						
						
						
						http://status.net/wiki/Sorting_changes 
						
						
					 | 
					
						2010-12-17 12:49:02 -08: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Evan Prodromou
							
						 
					 | 
					
						
						
							
						
						9ea1a9c631
					 | 
					
						
						
							
							session table was missing from upgrade scripts
						
						
						
						
						
						
					 | 
					
						2010-11-09 12:53:57 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						f5019ac5aa
					 | 
					
						
						
							
							tweaks for the installer whee
						
						
						
						
						
						
					 | 
					
						2010-10-29 16:26:45 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						345b7d33b8
					 | 
					
						
						
							
							some sorta vaguely working bits
						
						
						
						
						
						
					 | 
					
						2010-10-29 15:28:48 -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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						307c819089
					 | 
					
						
						
							
							Merge commit 'refs/merge-requests/2223' of git://gitorious.org/statusnet/mainline into integration
						
						
						
						
						
						
					 | 
					
						2010-10-25 14:35:56 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michele macno Azzolari
							
						 
					 | 
					
						
						
							
						
						0243cea82b
					 | 
					
						
						
							
							Updated mustard description and link
						
						
						
						
						
						
					 | 
					
						2010-10-25 23:08:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						b483a0549f
					 | 
					
						
						
							
							Merge branch '1.0.x' into schema-x
						
						
						
						
						
						
						
						Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po 
						
						
					 | 
					
						2010-10-25 13:14:33 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						ca489631db
					 | 
					
						
						
							
							Merge branch '0.9.x' into 1.0.x
						
						
						
						
						
						
						
						Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php 
						
						
					 | 
					
						2010-10-25 13:08:57 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						e56385a7bb
					 | 
					
						
						
							
							Use a new table (oauth_token_association) to associate authorized
						
						
						
						
						
						
						
						request tokins with OAuth client applications and profiles. 
						
						
					 | 
					
						2010-10-20 17:21:04 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						3d6a0f730d
					 | 
					
						
						
							
							Revert DB change for OAuth. Change compound key for oauth_application_user
						
						
						
						
						
						
						
						back to (profile_id, application_id). I think we can get away without
a DB change by only issuing one anonymous access token per user. 
						
						
					 | 
					
						2010-10-20 11:41:04 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zach Copley
							
						 
					 | 
					
						
						
							
						
						e8b6d7c946
					 | 
					
						
						
							
							Add support for an anonymous OAuth consumer. Note: this requires a
						
						
						
						
						
						
						
						small DB tweak.  Oauth_application_user needs to have the primary
compound key: (profile_id, application_id, token).
http://status.net/open-source/issues/2761
This should also make it possible to have multiple access tokens
per application.
http://status.net/open-source/issues/2788 
						
						
					 | 
					
						2010-10-19 20:54:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						4f7eae8702
					 | 
					
						
						
							
							Add stub schema_version table
						
						
						
						
						
						
					 | 
					
						2010-10-19 15:38:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						7751d455de
					 | 
					
						
						
							
							Initial foreign key setup support
						
						
						
						
						
						
					 | 
					
						2010-10-19 12:08:59 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						b635c75639
					 | 
					
						
						
							
							Fix unique & foreign constraints on foreign_* tables. Reference info copied from old schema wasn't correctly taking into account that (id, service) must be treated together as a unit to identify a foreign_user uniquely.
						
						
						
						
						
						
					 | 
					
						2010-10-19 11:24:33 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						d3f8a880a9
					 | 
					
						
						
							
							Fix misnamed unique constraint
						
						
						
						
						
						
					 | 
					
						2010-10-18 18:16:07 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brion Vibber
							
						 
					 | 
					
						
						
							
						
						54bac12eb9
					 | 
					
						
						
							
							Normalize the 'modified' vs 'created' field definitions to not-null timestamps. We can't rely on database DEFAULT or ON UPDATE values, since they don't play well with our insert-time caching.
						
						
						
						
						
						
					 | 
					
						2010-10-18 17:08:23 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |