Zach Copley 
							
						 
					 
					
						
						
							
						
						56c6315968 
					 
					
						
						
							
							Remove fulltext indexes from notice and profile tables. The default  
						
						... 
						
						
						
						for fulltext search is 'like' (MySQLLikeSearch) which doesn't require
them. 
						
						
					 
					
						2011-09-18 14:28:05 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						51764be5a1 
					 
					
						
						
							
							For fave count, don't use distinct  
						
						
						
						
					 
					
						2011-08-27 18:21:44 -04:00 
						 
				 
			
				
					
						
							
							
								Dan Scott 
							
						 
					 
					
						
						
							
						
						db9ac1a531 
					 
					
						
						
							
							Issue  #546 : enable case-insensitive searching in MySQL  
						
						... 
						
						
						
						MySQL needs the collation utf8_general_ci to support case-insensitive
searching. lib/mysqlschema.php already supports a 'collate' attribute on
a per-column basis, so we just need to take advantage of that attribute
on the columns we want to search and Bob (and BOB, and bOB) is your
uncle.
Signed-off-by: Dan Scott <dan@coffeecode.net > 
						
						
					 
					
						2011-08-27 16:36:58 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f81c1f7554 
					 
					
						
						
							
							use an array of profiles rather than a looping cursor for profile lists  
						
						
						
						
					 
					
						2011-08-27 12:53:15 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						34a0525b67 
					 
					
						
						
							
							Profile uses joinAdd() with explicit arguments  
						
						
						
						
					 
					
						2011-08-26 11:48:40 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9ca3c3d1c3 
					 
					
						
						
							
							move core schema to class files  
						
						
						
						
					 
					
						2011-08-22 17:52:02 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5081c56ea4 
					 
					
						
						
							
							remove some debugging stuff in Profile::fillAvatars()  
						
						
						
						
					 
					
						2011-08-02 13:14:11 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						af49545e95 
					 
					
						
						
							
							reduce the number of calls to get profile groups  
						
						
						
						
					 
					
						2011-08-02 12:14:55 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						06e2422517 
					 
					
						
						
							
							pre-fill avatars for Profiles in a notice list  
						
						
						
						
					 
					
						2011-08-02 11:54:27 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a3ef80941e 
					 
					
						
						
							
							use multiGet() for a profile's groups  
						
						
						
						
					 
					
						2011-08-01 15:18:29 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						874f1db389 
					 
					
						
						
							
							Pre-fill profiles in notice streams  
						
						
						
						
					 
					
						2011-08-01 14:51:59 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						6f0bd73e6c 
					 
					
						
						
							
							Squashed commit of the following:  
						
						... 
						
						
						
						Move OMB to a plugin
commit 75d21f00246bcc56d7f854936be1e28395e079a2
Merge: cea0199 d594d07
Author: Zach Copley <zach@status.net >
Date:   Fri Jul 15 11:16:54 2011 -0700
    Merge branch 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone into kill-omb2
    * 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
      Fix paths
      Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
      Some odds and ends
      Remove omb stuff from queuemanager defaults
      Add check to make sure we're not untagging an OMB profile to OMB plugin
      Move some more subscription stuff and peopletag checks to OMB plugin
      Move some OMB-specific unsubscribe stuff to OMB plugin
      Finish removing libomb from core extlibs
      Fix more conflicts
      Fix queuing/queuehandling
      Move some stuff around; fix references
      Fix conflicts
      Move OMB-specific files to OMB plugin
      Move some stuff around; fix references
      Add OMB plugin README and rm references to OMB in mail StatusNet README
      Update paths
      Fix define
      Basic plugin finished
      Move OMB-specific files to OMB plugin
      Remove OMB stuff from router
commit cea019967f343042ebaea14b7bbb0d54289bcc1a
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 13 14:38:40 2011 -0700
    Fix paths
commit d412aa3c0ea0e21e65a72a16c7b9edd64ff373e1
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 12 18:17:06 2011 -0700
    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
commit b459c9f10ac283d6e774ef13f3293fc8a6948143
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 19:02:08 2011 -0700
    Some odds and ends
commit 895cfbfce58ffb3a05beebf48a90c549e00f1cce
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 19:01:23 2011 -0700
    Remove omb stuff from queuemanager defaults
commit b41b9e994f291ff83afb2460d9b37aee8ec1ec2b
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 18:46:44 2011 -0700
    Add check to make sure we're not untagging an OMB profile to OMB plugin
commit 94374d26ddd428dac8e4cd4541fd56db748c248b
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 18:34:20 2011 -0700
    Move some more subscription stuff and peopletag checks to OMB plugin
commit b91043b7820d5cd8b0ba4e9ee2a9d03c99248f11
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 16:37:25 2011 -0700
    Move some OMB-specific unsubscribe stuff to OMB plugin
commit d9430fe52975d9497b4a0d3d54da35b222e207ad
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 15:26:30 2011 -0700
    Finish removing libomb from core extlibs
commit bb6257eb85cc7ba392e91468c01503f51faeb989
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 13 12:47:32 2011 -0700
    Fix more conflicts
commit 3c760d0a4b4a083ae5fca2530d22aad5f4a9fdae
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 5 15:49:22 2011 -0700
    Fix queuing/queuehandling
commit ed635fa0c20e150673709c04ecc7f285d12e0ce2
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 5 15:29:35 2011 -0700
    Move some stuff around; fix references
commit cbc553a147941cad16e205a6b66ab4b32a5e3d3d
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 13 12:46:05 2011 -0700
    Fix conflicts
commit 5d77c81f75b57f5d5357d6b46d503650a4b3225d
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 19:10:38 2011 -0700
    Move OMB-specific files to OMB plugin
commit 2ed051dbce0ce9b44723b14922026849c39ed603
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 5 15:29:35 2011 -0700
    Move some stuff around; fix references
commit 8809b5e35b1aacb67d70ae3e55a43003b6f591b7
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 5 15:28:59 2011 -0700
    Add OMB plugin README and rm references to OMB in mail StatusNet README
commit 35ced4067c1915baca0b3e184f9533a91a951d2d
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 23:50:09 2011 -0700
    Update paths
commit 0ee5bafbce95fc9b8db98c1e828d33d26d08bc73
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 23:38:03 2011 -0700
    Fix define
commit e309dd22ffb9087d7fcf9180ede4f531dbd88c3c
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 23:30:43 2011 -0700
    Basic plugin finished
commit 00f1e930f27e080b04d1e82952f7886c84e01d97
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 19:10:38 2011 -0700
    Move OMB-specific files to OMB plugin
commit 39dcd031a79b49da0b4fe25f1594d2e406b5eb65
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 19:10:01 2011 -0700
    Remove OMB stuff from router
commit d594d071be1ec42518dd5465db61e01e7e8ec036
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 13 14:38:40 2011 -0700
    Fix paths
commit 48c1064b4b50e89cf51d2cab388f708f60601247
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 12 18:17:06 2011 -0700
    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
commit 1e1168978f38c31dbf0206b3493b2b6dcbe61589
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 19:02:08 2011 -0700
    Some odds and ends
commit ac43af2b497d8b9286c49a9469a1dff950e41650
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 19:01:23 2011 -0700
    Remove omb stuff from queuemanager defaults
commit 2471af2f8800515a3db544b3a186a18f3e8a43af
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 18:46:44 2011 -0700
    Add check to make sure we're not untagging an OMB profile to OMB plugin
commit df974646459ac6d5d97a40d008f1aab66f998226
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 18:34:20 2011 -0700
    Move some more subscription stuff and peopletag checks to OMB plugin
commit 8a1427b759e791c14a7a7a22128ba05f0b4b6d12
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 16:37:25 2011 -0700
    Move some OMB-specific unsubscribe stuff to OMB plugin
commit bd24220dbb5170af22ea0dea8a3062e6d1aeb6a2
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 6 15:26:30 2011 -0700
    Finish removing libomb from core extlibs
commit 4c3c6f1fabb0f2c92635ccc5e8f38db2293f5456
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 13 12:47:32 2011 -0700
    Fix more conflicts
commit db44deefd731a412685c5669c4c6fa69833de922
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 5 15:49:22 2011 -0700
    Fix queuing/queuehandling
commit ea2d84d2f3d518950d3aa1956ddc8f3a25ca55f3
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 5 15:29:35 2011 -0700
    Move some stuff around; fix references
commit 8ac3e010444b41bd9a78766f5e37e49dff023b45
Author: Zach Copley <zach@status.net >
Date:   Wed Jul 13 12:46:05 2011 -0700
    Fix conflicts
commit 0aad6e10e3637b3189a87b42c24c1d6de1b346bc
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 19:10:38 2011 -0700
    Move OMB-specific files to OMB plugin
commit d982d7076c5cb28c7b8e4b1dde8d07d7e58e278f
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 5 15:29:35 2011 -0700
    Move some stuff around; fix references
commit 4b9d39c93562ff4c45c37c940013e8b78197dec1
Author: Zach Copley <zach@status.net >
Date:   Tue Jul 5 15:28:59 2011 -0700
    Add OMB plugin README and rm references to OMB in mail StatusNet README
commit dab0fb6647a85e6835298496d7127a398b6b9293
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 23:50:09 2011 -0700
    Update paths
commit 2cb73dac8ad971f1545dcf6ba57746c777e232ef
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 23:38:03 2011 -0700
    Fix define
commit 6f226b18a059f175b1bdd3abcb8cb95eedc22ee7
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 23:30:43 2011 -0700
    Basic plugin finished
commit 7be304beaa0f39755c3978e0b852fde768950da4
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 19:10:38 2011 -0700
    Move OMB-specific files to OMB plugin
commit 5b30da01cfa2802d6e7a4a4a4f39b8043c54f472
Author: Zach Copley <zach@status.net >
Date:   Thu Jun 30 19:10:01 2011 -0700
    Remove OMB stuff from router 
						
						
					 
					
						2011-07-15 12:13:57 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						73f4762a55 
					 
					
						
						
							
							Don't serialize protected attrs  
						
						
						
						
					 
					
						2011-04-18 18:23:06 -04:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						b78e5de474 
					 
					
						
						
							
							Profile::getOwnedTags -> Profile::getLists, first argument is the current user, or the user accessing the lists.  
						
						
						
						
					 
					
						2011-04-16 00:52:58 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						41dc9ca497 
					 
					
						
						
							
							Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x  
						
						... 
						
						
						
						Conflicts:
	classes/Profile.php 
						
						
					 
					
						2011-04-14 18:28:03 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						70c8de4354 
					 
					
						
						
							
							Remove bogus parameters from function declaration (was throwing a warning)  
						
						
						
						
					 
					
						2011-04-14 15:07:54 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9208c94b29 
					 
					
						
						
							
							don't show private lists; correct link in header  
						
						
						
						
					 
					
						2011-04-14 17:27:26 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						90e6eab68e 
					 
					
						
						
							
							show user's lists in sidebar  
						
						
						
						
					 
					
						2011-04-14 16:57:50 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a0b4282cbf 
					 
					
						
						
							
							hook for getting profile avatars  
						
						
						
						
					 
					
						2011-04-14 11:33:10 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f9a91a2809 
					 
					
						
						
							
							Utility Profile::current() to get current user's profile  
						
						
						
						
					 
					
						2011-04-11 11:16:30 -04:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						f0d762f196 
					 
					
						
						
							
							Update/add translator documentation.  
						
						... 
						
						
						
						L10n/i18n updates.
Superfluous whitespace removed.
Add FIXME for a few i18n issues I couldn't solve this quickly.
Takes care of documentation for all core code added in merge of "people tags" feature (Commit:e75c9988ebe33822e493ac225859bc593ff9b855). 
						
						
					 
					
						2011-04-10 19:59:55 +02:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						fc21e5c76b 
					 
					
						
						
							
							Fix type conversion warnings caused when calling getUser / getProfile for the second time  
						
						
						
						
					 
					
						2011-04-09 22:16:52 +05:30 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						f47027abbe 
					 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase  
						
						... 
						
						
						
						Conflicts:
	lib/profileblock.php
	theme/default/css/display.css 
						
						
					 
					
						2011-04-09 21:57:45 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						731bdab804 
					 
					
						
						
							
							Use pkeyGet() instead of idStream() for fave caching  
						
						
						
						
					 
					
						2011-04-07 16:57:16 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						adf4d96013 
					 
					
						
						
							
							store oft-requested stuff in the data object  
						
						
						
						
					 
					
						2011-04-07 16:55:32 -04:00 
						 
				 
			
				
					
						
							
							
								Shashi Gowda 
							
						 
					 
					
						
						
							
						
						ad86eb78d3 
					 
					
						
						
							
							Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase  
						
						... 
						
						
						
						Conflicts:
	js/util.min.js
	lib/default.php 
						
						
					 
					
						2011-04-07 23:13:45 +05:30 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						29243cd21a 
					 
					
						
						
							
							make Profile::isMember() and Profile::isAdmin() use caching pkeyGet()  
						
						
						
						
					 
					
						2011-04-06 18:12:25 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b3e7dd70e2 
					 
					
						
						
							
							don't put bogus groups into the groups array  
						
						
						
						
					 
					
						2011-04-05 18:27:01 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						efd2c68de9 
					 
					
						
						
							
							cache groups per user  
						
						
						
						
					 
					
						2011-04-05 17:20:17 -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 
							
						 
					 
					
						
						
							
						
						9f1603462d 
					 
					
						
						
							
							Merge branch 'limitdist2' into 1.0.x  
						
						
						
						
					 
					
						2011-03-29 17:32:17 -04:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						700018fd09 
					 
					
						
						
							
							L10n/i18n updated.  
						
						... 
						
						
						
						Translator documentation updated.
FIXME added for missing class documentation.
Various documentation tweaks. 
						
						
					 
					
						2011-03-29 23:00:29 +02:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e862dcdb8a 
					 
					
						
						
							
							Merge branch '1.0.x' into limitdist2  
						
						
						
						
					 
					
						2011-03-28 21:56:34 -04:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						e5b5c256a3 
					 
					
						
						
							
							Working subscription approval!  
						
						
						
						
					 
					
						2011-03-28 17:08:04 -07:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						a70e68e09c 
					 
					
						
						
							
							Work in progress: can create & cancel sub requests  
						
						
						
						
					 
					
						2011-03-28 16:12:51 -07: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 
							
						 
					 
					
						
						
							
						
						11b40ddb1b 
					 
					
						
						
							
							work in progress...  
						
						
						
						
					 
					
						2011-03-28 13:59:48 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0c3f8208cd 
					 
					
						
						
							
							Merge branch 'limitdist' into limitdist2  
						
						
						
						
					 
					
						2011-03-25 11:46:49 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						44bcc942b8 
					 
					
						
						
							
							Break up stream code to use separate notice stream classes  
						
						... 
						
						
						
						Rearchitect (again!) notice stream code to delegate different functionality up and down the stack.
Now, different classes implement NoticeStream. 
						
						
					 
					
						2011-03-24 18:04:19 -04:00 
						 
				 
			
				
					
						
							
							
								Siebrand Mazeland 
							
						 
					 
					
						
						
							
						
						3be26565fb 
					 
					
						
						
							
							Update translator documentation.  
						
						... 
						
						
						
						i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME in files with missing documentation. 
						
						
					 
					
						2011-03-24 11:48:51 +01:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						eb1faa7865 
					 
					
						
						
							
							Merge branch '1.0.x' into limitdist  
						
						... 
						
						
						
						Conflicts:
	classes/Notice.php 
						
						
					 
					
						2011-03-23 15:58:27 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2b901894c2 
					 
					
						
						
							
							Some fixes to make the notice stream class work  
						
						
						
						
					 
					
						2011-03-23 11:59:01 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0b35ce7c37 
					 
					
						
						
							
							New NoticeStream class to reify streams of notices  
						
						... 
						
						
						
						We've been muddling through with 6- or 8-argument functions for managing streams. I'd
like to start thinking of streams as their own thing, and give them some more value.
So, the new NoticeStream class takes over the Notice::stream() function and Notice::getStreamByIds().
There's probably some fine-tuning to do on the object interface. 
						
						
					 
					
						2011-03-23 11:29:55 -04:00 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						14a6ab2b04 
					 
					
						
						
							
							Refactoring on notification mail generation: common profile & footer chunks pulled out, notifications added for group joins.  
						
						
						
						
					 
					
						2011-03-22 16:50:27 -07:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fd8dad3963 
					 
					
						
						
							
							Merge branch 'limitdist' of gitorious.org:~evan/statusnet/evans-mainline into limitdist  
						
						... 
						
						
						
						Conflicts:
	classes/Notice.php 
						
						
					 
					
						2011-03-22 18:17:09 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						26a4bd7dbf 
					 
					
						
						
							
							move scope check to Notice so we can have a null profile  
						
						
						
						
					 
					
						2011-03-22 11:56:28 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7fc5679e7e 
					 
					
						
						
							
							function for checking scope rules for Profile  
						
						
						
						
					 
					
						2011-03-22 11:56:28 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						83fb5e6023 
					 
					
						
						
							
							Mass replacement of #-comments with //-comments  
						
						... 
						
						
						
						like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh? 
						
						
					 
					
						2011-03-22 11:54:23 -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 
						 
				 
			
				
					
						
							
							
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						942887ca8c 
					 
					
						
						
							
							Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working.  
						
						
						
						
					 
					
						2011-03-21 17:17:18 -07:00