Ciaran Gultnieks 
							
						 
					 
					
						
						
							
						
						53274a6d93 
					 
					
						
						
							
							PostgreSQL - code changes to avoid problems where user table is referenced in ad-hoc queries  
						
						
						
						
					 
					
						2009-01-30 01:12:58 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a7c85bebd5 
					 
					
						
						
							
							Merge branch 'master' of /var/www/mublog  
						
						... 
						
						
						
						Conflicts:
	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php
Merged development trunk into laconica head. woohoo! 
						
						
					 
					
						2009-01-23 08:58:31 +01:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d6879bfe0c 
					 
					
						
						
							
							Debug some of the subscriptions+tags problems  
						
						
						
						
					 
					
						2009-01-22 22:38:10 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8516ccfb9d 
					 
					
						
						
							
							move membership/adminship tests to profile  
						
						
						
						
					 
					
						2009-01-21 13:57:18 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						00f6f4fb67 
					 
					
						
						
							
							user subscriptions methods  
						
						
						
						
					 
					
						2009-01-21 13:00:30 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						64f5c542df 
					 
					
						
						
							
							Add group and groups to list of forbidden user names  
						
						
						
						
					 
					
						2009-01-21 12:21:16 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fb6e9dda8e 
					 
					
						
						
							
							A method on User for getting groups  
						
						
						
						
					 
					
						2009-01-21 12:19:23 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						26652e92f2 
					 
					
						
						
							
							First pass at a group home page  
						
						... 
						
						
						
						This is the first pass at a group home page. 
						
						
					 
					
						2009-01-21 02:22:10 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						af2fb7dff2 
					 
					
						
						
							
							Don't override ORDER for inboxes; it messes up caching  
						
						
						
						
					 
					
						2009-01-19 22:51:03 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						35bc21d3bb 
					 
					
						
						
							
							whitespace conflicts in User.php  
						
						... 
						
						
						
						darcs-hash:20081211163434-5ed1f-38d9bf093db72d27837cbfe76d46fd518adc3bb6.gz 
						
						
					 
					
						2008-12-11 11:34:34 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						7ad2f2a371 
					 
					
						
						
							
							TRUE  
						
						... 
						
						
						
						More PEAR coding standards global changes. Here, I've changed all
instances of TRUE to true and FALSE to false.
darcs-hash:20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gz 
						
						
					 
					
						2008-12-23 14:44:28 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						04ef1ba8ee 
					 
					
						
						
							
							change function headers to K&R style  
						
						... 
						
						
						
						Another huge change, for PEAR code standards compliance. Function
headers have to be in K&R style (opening brace on its own line),
instead of having the opening brace on the same line as the function
and parameters. So, a little perl magic found all the function
definitions and move the opening brace to the next line (properly
indented... usually).
darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz 
						
						
					 
					
						2008-12-23 14:33:23 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						eb2f9c98ac 
					 
					
						
						
							
							replace NULL with null  
						
						... 
						
						
						
						Another global search-and-replace update. Here, I've replaced the PHP
keyword 'NULL' with its lowercase version. This is another PEAR code
standards change.
darcs-hash:20081223192129-84dde-4a0182e0ec16a01ad88745ad3e08f7cb501aee0b.gz 
						
						
					 
					
						2008-12-23 14:21:29 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						edbc0c665c 
					 
					
						
						
							
							replace all tabs with four spaces  
						
						... 
						
						
						
						The PEAR coding standards decree: no tabs, but indent by four spaces.
I've done a global search-and-replace on all tabs, replacing them by
four spaces. This is a huge change, but it will go a long way to
getting us towards phpcs-compliance. And that means better code
readability, and that means more participation.
darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz 
						
						
					 
					
						2008-12-23 14:19:07 -05:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						792cb7a535 
					 
					
						
						
							
							fix registration bug - fatal error when sending email confirmation  
						
						... 
						
						
						
						darcs-hash:20081209082750-7b5ce-6d06a7b1cda2a9afb6ce8ea64d65df81cc063139.gz 
						
						
					 
					
						2008-12-09 03:27:50 -05:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						92ea88fd60 
					 
					
						
						
							
							trac540 - Add 'since' param to Twitter-compatible API calls  
						
						... 
						
						
						
						darcs-hash:20081209055345-7b5ce-e48fd4c87963b8ae15859fd03d2f1f86a16f3a2b.gz 
						
						
					 
					
						2008-12-09 00:53:45 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8445796908 
					 
					
						
						
							
							fix Profile_block::get() again  
						
						... 
						
						
						
						darcs-hash:20081209041648-5ed1f-fb6ed96047ebfbbe769a11cc3171ce8a5a1440a7.gz 
						
						
					 
					
						2008-12-08 23:16:48 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						facba2566b 
					 
					
						
						
							
							removed Profile_block::get, changed to use pkeyGet  
						
						... 
						
						
						
						darcs-hash:20081209041227-5ed1f-2edefdc79545da646a6fd40b15fd72809c15831c.gz 
						
						
					 
					
						2008-12-08 23:12:27 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ef3d487ae0 
					 
					
						
						
							
							enable block API  
						
						... 
						
						
						
						darcs-hash:20081208185728-5ed1f-8d5f6be6decfbb50deb4ca50bee13404d0c51b72.gz 
						
						
					 
					
						2008-12-08 13:57:28 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						81a81baf83 
					 
					
						
						
							
							low-level management of blocks  
						
						... 
						
						
						
						darcs-hash:20081208031008-5ed1f-c96006b5c05fa0e68f9adaacd0518016aedfee2a.gz 
						
						
					 
					
						2008-12-07 22:10:08 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a143b64666 
					 
					
						
						
							
							edit throttling  
						
						... 
						
						
						
						darcs-hash:20081210174722-84dde-4c79d7f73230d008195bd19738bc9a6017b940e9.gz 
						
						
					 
					
						2008-12-10 12:47:22 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6f31f25105 
					 
					
						
						
							
							let users set their own profile tags from profilesettings  
						
						... 
						
						
						
						darcs-hash:20081120214821-84dde-c8569ef645b389de545f78bf01a270f28b871f02.gz 
						
						
					 
					
						2008-11-20 16:48:21 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3b4db8f5e1 
					 
					
						
						
							
							whitespace diffs in User.php  
						
						... 
						
						
						
						darcs-hash:20081120205421-84dde-b41e50386ce3ec5f887c87cd83258c2e0e86f713.gz 
						
						
					 
					
						2008-11-20 15:54:21 -05:00 
						 
				 
			
				
					
						
							
							
								millette 
							
						 
					 
					
						
						
							
						
						f71f2d5ba8 
					 
					
						
						
							
							emailnotifynudge added to User.php class manually (how to auto-gen?)  
						
						... 
						
						
						
						darcs-hash:20081117003010-099f7-dd605b41a28ab99c2fadde38d9c7341bfdae0312.gz 
						
						
					 
					
						2008-11-16 19:30:10 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						45f5ef8c87 
					 
					
						
						
							
							if all faves in cache, skip  
						
						... 
						
						
						
						darcs-hash:20081122192857-84dde-c8fcddd794a8339a53e6a0224bd07f6f86ef3896.gz 
						
						
					 
					
						2008-11-22 14:28:57 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						24ad0b3c13 
					 
					
						
						
							
							blow last cache for faves  
						
						... 
						
						
						
						darcs-hash:20081122165234-84dde-d9d6a608434502cb3d5fb09f04d0c641900c3134.gz 
						
						
					 
					
						2008-11-22 11:52:34 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5d161f3d24 
					 
					
						
						
							
							messed up logic for passing faves  
						
						... 
						
						
						
						darcs-hash:20081122163552-84dde-9171c5e24ae90a430f2abd78437073656af9e5ec.gz 
						
						
					 
					
						2008-11-22 11:35:52 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5632b2e6d5 
					 
					
						
						
							
							use cached fave stream to save DB hits for faves  
						
						... 
						
						
						
						darcs-hash:20081122163347-84dde-abb0dfc800f65f50951c5517af3bfda48013c6ed.gz 
						
						
					 
					
						2008-11-22 11:33:47 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						16e3fcf2c2 
					 
					
						
						
							
							add inboxes for new users  
						
						... 
						
						
						
						darcs-hash:20081116062937-84dde-2c2369d0513dba49514a6800f67324803d0fe335.gz 
						
						
					 
					
						2008-11-16 01:29:37 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5409bd6a5d 
					 
					
						
						
							
							different query based on config var and user inbox status  
						
						... 
						
						
						
						darcs-hash:20081113215734-84dde-badae0579fb70a6760dc6fdf0289b76356e479f6.gz 
						
						
					 
					
						2008-11-13 16:57:34 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						69a1cea319 
					 
					
						
						
							
							add inboxed and regenerate data objects  
						
						... 
						
						
						
						darcs-hash:20081113210209-84dde-56052bac5ce490d54f3220baaa13f5bfc0e7618d.gz 
						
						
					 
					
						2008-11-13 16:02:09 -05:00 
						 
				 
			
				
					
						
							
							
								millette 
							
						 
					 
					
						
						
							
						
						15c1d4f5e4 
					 
					
						
						
							
							trac31 url_auto_shortening by sgmurphy  
						
						... 
						
						
						
						darcs-hash:20081106205926-099f7-6bcfd7969a159a12b1ba6a9ee254e44a07b94761.gz 
						
						
					 
					
						2008-11-06 15:59:26 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						0625f18c8e 
					 
					
						
						
							
							notice_inbox.id -> notice_inbox.notice_id  
						
						... 
						
						
						
						darcs-hash:20081112173627-5ed1f-7cee5b6f25ab654f066c8902492ed531fb1ea091.gz 
						
						
					 
					
						2008-11-12 12:36:27 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3987de1064 
					 
					
						
						
							
							created timestamp on notice_inbox  
						
						... 
						
						
						
						darcs-hash:20081112172517-5ed1f-4e8534d7898e2134edf4c0a28417b4a5274617d4.gz 
						
						
					 
					
						2008-11-12 12:25:17 -05:00 
						 
				 
			
				
					
						
							
							
								zach 
							
						 
					 
					
						
						
							
						
						8deac7248e 
					 
					
						
						
							
							Twitter-compatible API - since_id and before_id were polluting the cache and generating bad SQL  
						
						... 
						
						
						
						(Also cleaned out some extra whitespace.)
darcs-hash:20081104053359-462f3-2f6619bb942aa34b38dd82cb427878f83d4c332c.gz 
						
						
					 
					
						2008-11-04 00:33:59 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						561140fbed 
					 
					
						
						
							
							change User to use notice inboxes rather than subscription  
						
						... 
						
						
						
						darcs-hash:20081022210445-5ed1f-94a7b172f33411dfa8d1faaf7dc72169f57d6b39.gz 
						
						
					 
					
						2008-10-22 17:04:45 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						894496f0e8 
					 
					
						
						
							
							remove unused noticesWithFriendsWindow from User  
						
						... 
						
						
						
						darcs-hash:20081022210428-5ed1f-8de35689bfee3b38e6da83328137fb457a0bfdb0.gz 
						
						
					 
					
						2008-10-22 17:04:28 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						06a80c829b 
					 
					
						
						
							
							Another patch to fix up whitespace conflicts in User.php  
						
						... 
						
						
						
						darcs-hash:20081005181614-7b5ce-4ab236108fe2570a199120317120d921715fbd19.gz 
						
						
					 
					
						2008-10-05 14:16:14 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e115322473 
					 
					
						
						
							
							Fixed up conflict (over white space) in User.php  
						
						... 
						
						
						
						darcs-hash:20081005181350-7b5ce-1e722af0bd3677b27dd6d100456131a42072dd91.gz 
						
						
					 
					
						2008-10-05 14:13:50 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5978fcb601 
					 
					
						
						
							
							fix deleted function after synch from Zach  
						
						... 
						
						
						
						darcs-hash:20081004194218-5ed1f-efd9e82c9f78e19185d8ef6b626f46c5ae6613db.gz 
						
						
					 
					
						2008-10-04 15:42:18 -04:00 
						 
				 
			
				
					
						
							
							
								mac65 
							
						 
					 
					
						
						
							
						
						c08a67094c 
					 
					
						
						
							
							Add support for since_id and before_id to Twitter API. Ticket  #540 .  
						
						... 
						
						
						
						darcs-hash:20081001001233-e558a-3fcc269985050021ec9b44c052206c731cc4689d.gz 
						
						
					 
					
						2008-09-30 20:12:33 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						67cf415b7e 
					 
					
						
						
							
							don't try to free faves in User  
						
						... 
						
						
						
						darcs-hash:20081002162739-5ed1f-7d83c69d986cc704ef1bb9703a105ac04ad38d06.gz 
						
						
					 
					
						2008-10-02 12:27:39 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						37735a35c0 
					 
					
						
						
							
							try to use caching functions where possible in User  
						
						... 
						
						
						
						darcs-hash:20081002162513-5ed1f-fff718be660fa4a8abf58df402a3db30d72d11db.gz 
						
						
					 
					
						2008-10-02 12:25:13 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f290ae348a 
					 
					
						
						
							
							remove unused helper function  
						
						... 
						
						
						
						darcs-hash:20081002144628-5ed1f-0cf7909fd15d5361d391a9bcde723585d83e5ed3.gz 
						
						
					 
					
						2008-10-02 10:46:28 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f5f9559a60 
					 
					
						
						
							
							correct some SQL and add some spaces  
						
						... 
						
						
						
						darcs-hash:20080928174316-5ed1f-73bc071fed0aff359c94b4213816e8830eba6c50.gz 
						
						
					 
					
						2008-09-28 13:43:16 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3a99883c6c 
					 
					
						
						
							
							remove noticewrapper  
						
						... 
						
						
						
						darcs-hash:20080928171634-5ed1f-5a62d8a16dedeff8a9ed5677b2288c9890a008e7.gz 
						
						
					 
					
						2008-09-28 13:16:34 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						02a3f24b92 
					 
					
						
						
							
							single function for important streams, with memcached support  
						
						... 
						
						
						
						I moved the 4 streams for a user (with friends, faves, replies,
personal) into functions on the User object. Added a helper function
in Notice for making notice streams. Also, will fetch notice streams
out of the memcached server, if possible. Made the API, RSS, and HTML
output all use the same streams (hopefully cached).
Added some code to Notice to blow the cache when a notice is posted.
Also, added code to favor and disfavor actions to blow the faves
cache, too.
darcs-hash:20080928120119-5ed1f-ead542348bcd3cf315be6f42934353154402eb16.gz 
						
						
					 
					
						2008-09-28 08:01:19 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						82084ab74c 
					 
					
						
						
							
							move memcache connections to util.php  
						
						... 
						
						
						
						darcs-hash:20080926200102-5ed1f-debbc18981424d7724277ac82e5fbfd5e797090e.gz 
						
						
					 
					
						2008-09-26 16:01:02 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8da61dc1d3 
					 
					
						
						
							
							path correct in require_once for memcached  
						
						... 
						
						
						
						darcs-hash:20080926161824-5ed1f-b4fb53e5ca65bb099aabbba6ea60a13496f669a2.gz 
						
						
					 
					
						2008-09-26 12:18:24 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f6615f70e5 
					 
					
						
						
							
							prepend Memcached_DataObject require with INSTALLDIR  
						
						... 
						
						
						
						darcs-hash:20080926161540-5ed1f-2e9dc6f2297c612208214a6d52f36ce0dd7aa4de.gz 
						
						
					 
					
						2008-09-26 12:15:40 -04:00