Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b3a0eea3b6 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						... 
						
						
						
						Conflicts:
	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php 
						
						
					 
					
						2009-03-12 11:56:23 -04:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						a5f1124830 
					 
					
						
						
							
							PostgreSQL - use the specific sequence names required by DB_DataObject, otherwise rebuilding can't work  
						
						
						
						
					 
					
						2009-03-08 15:51:31 +00:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						a4091c878a 
					 
					
						
						
							
							PostgreSQL - propogated nonce table fix from MySQL version - see bug  #1251  or  1179ecd13d 
						
						
						
						
					 
					
						2009-03-07 23:28:59 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1179ecd13d 
					 
					
						
						
							
							Fix nonce usage in OAuth store  
						
						... 
						
						
						
						The OAuth store was failing on getting a request token, because the
token value was forced to be non-null in the DB. Let this value be
null, and use the correct primary key (consumer, timestamp, nonce).
Drop the reference to token table, and don't ever use it. 
						
						
					 
					
						2009-03-07 12:55:09 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						13c183e2f4 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						
						
						
					 
					
						2009-03-06 16:17:58 -08:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						3c53e821cc 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-03-05 16:18:59 +00:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						97bc187e31 
					 
					
						
						
							
							PostgreSQL - the ts field in the OAuth nonce table needed to be an integer. (fix submitted by oxygene)  
						
						
						
						
					 
					
						2009-03-05 16:15:29 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8cc19b90ee 
					 
					
						
						
							
							Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x  
						
						
						
						
					 
					
						2009-03-04 11:05:58 -08:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						c02a2f1891 
					 
					
						
						
							
							PostgreSQL - added defaults for 'created' fields, so they work the same as the MySQL version, and made sure all 'modified' fields are not null  
						
						
						
						
					 
					
						2009-03-04 15:30:17 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						43ef29ba0c 
					 
					
						
						
							
							all inserts in one statement for foreign services  
						
						
						
						
					 
					
						2009-03-04 05:47:24 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						f53b6470cf 
					 
					
						
						
							
							add notice source to default install  
						
						
						
						
					 
					
						2009-03-04 05:42:20 -08:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						8408e82f92 
					 
					
						
						
							
							PostgreSQL - added new emailnotifyattn field to user table, to match MySQL version  
						
						
						
						
					 
					
						2009-03-03 20:18:26 +00:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9a2f335853 
					 
					
						
						
							
							add notice source to default install  
						
						
						
						
					 
					
						2009-03-02 18:25:10 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						fc44c9a7f4 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						
						
						
					 
					
						2009-02-28 21:11:16 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						1d610d3c6f 
					 
					
						
						
							
							don't use semicolons in comments  
						
						
						
						
					 
					
						2009-02-28 20:32:53 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						34a61b40f4 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						
						
						
					 
					
						2009-02-26 13:22:51 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						478192fa3b 
					 
					
						
						
							
							add conversation id to notice  
						
						
						
						
					 
					
						2009-02-26 13:22:41 -08:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						affb2f9359 
					 
					
						
						
							
							add email notify flag for @-replies  
						
						
						
						
					 
					
						2009-02-16 18:24:43 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						e686ef042b 
					 
					
						
						
							
							Make ID of SMS Carrier not autoincrement  
						
						... 
						
						
						
						Since we're doing fixed IDs for SMS Carrier, we change the definition
so it's not auto increment. 
						
						
					 
					
						2009-02-12 14:16:58 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						654a91cc1c 
					 
					
						
						
							
							Add fixed IDs to SMS carrier list  
						
						... 
						
						
						
						Changed the SMS carrier list to use a fixed ID number for each carrier
distributed with the software. We claim IDs > 100000; admins can use
IDs < 100000 for local values. I'd be pretty surprised if there were
more than 100K wireless carriers in the world, but hey. 
						
						
					 
					
						2009-02-12 14:03:15 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5118643695 
					 
					
						
						
							
							move carrier.sql to sms_carrier.sql  
						
						
						
						
					 
					
						2009-02-12 13:58:05 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						2393fbec60 
					 
					
						
						
							
							add some indices for performance  
						
						
						
						
					 
					
						2009-02-09 14:47:23 -05:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						8c8feb59b5 
					 
					
						
						
							
							PostgreSQL - database creation script updated to cover 0.7.x features  
						
						
						
						
					 
					
						2009-02-05 22:15:45 +00:00 
						 
				 
			
				
					
						
							
							
								Ciaran Gultnieks 
							
						 
					 
					
						
						
							
						
						a4291d64ce 
					 
					
						
						
							
							PostgreSQL - remaining changes to fix db create script up to laconica 0.6.4 level  
						
						
						
						
					 
					
						2009-01-30 01:11:03 +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 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						33c13030e5 
					 
					
						
						
							
							PostgreSQL - added the rest of the recently added tables for blocking, notice inboxes, etc. Needs testing  
						
						
						
						
					 
					
						2009-01-14 11:05:15 -05:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						140bee20a2 
					 
					
						
						
							
							Some more PostgreSQL script updates - some recently added fields were missing  
						
						
						
						
					 
					
						2009-01-14 11:05:02 -05:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						9e64492c29 
					 
					
						
						
							
							Added the inboxed field to the user table for PostgreSQL - resolves bug  #892  
						
						
						
						
					 
					
						2009-01-14 11:04:46 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						51064cc14a 
					 
					
						
						
							
							SQL setup for groups.  
						
						
						
						
					 
					
						2009-01-13 00:26:13 -05:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						dccf8374cf 
					 
					
						
						
							
							trac750 - Exoskeleton of a nascent Facebook app  
						
						... 
						
						
						
						darcs-hash:20081206030132-7b5ce-96c38ab67edd3d58f8722ef25852a6143f05a86b.gz 
						
						
					 
					
						2008-12-05 22:01:32 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a68f513cc8 
					 
					
						
						
							
							database changes to say whether to deliver messages for a subscription  
						
						... 
						
						
						
						darcs-hash:20081209033637-5ed1f-df5ef40e57cc0e9485e34e2f5e46249dcb0d9130.gz 
						
						
					 
					
						2008-12-08 22:36:37 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						9c3fdeeafb 
					 
					
						
						
							
							whitespace in laconica.sql  
						
						... 
						
						
						
						darcs-hash:20081203222819-5ed1f-49d1657730072be304ea6455ac96637ab47191f3.gz 
						
						
					 
					
						2008-12-03 17:28:19 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						cb93e214f8 
					 
					
						
						
							
							add profile block data object  
						
						... 
						
						
						
						darcs-hash:20081203222619-5ed1f-b313092893c67a3ec1dc92a79aa7fed4ab583729.gz 
						
						
					 
					
						2008-12-03 17:26:19 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						8a0c438aed 
					 
					
						
						
							
							add profile tags to DB  
						
						... 
						
						
						
						darcs-hash:20081120205506-84dde-e9aa0a70d3529f91909dbe29f03a46b40ef18fff.gz 
						
						
					 
					
						2008-11-20 15:55:06 -05:00 
						 
				 
			
				
					
						
							
							
								csarven 
							
						 
					 
					
						
						
							
						
						f3572aec7f 
					 
					
						
						
							
							Nudge feature  
						
						... 
						
						
						
						darcs-hash:20081116022735-eefa4-366f6deb85942f859ebd532e477b57737bcafbf8.gz 
						
						
					 
					
						2008-11-15 21:27:35 -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 
							
						 
					 
					
						
						
							
						
						14f69f8d2e 
					 
					
						
						
							
							trac31 pg support, fixing 2tu typo, set ur1.ca as default service  
						
						... 
						
						
						
						darcs-hash:20081113152718-099f7-42b60d02395f016c54c5f3c301f9dbe987c1283f.gz 
						
						
					 
					
						2008-11-13 10:27:18 -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 
							
						 
					 
					
						
						
							
						
						3987de1064 
					 
					
						
						
							
							created timestamp on notice_inbox  
						
						... 
						
						
						
						darcs-hash:20081112172517-5ed1f-4e8534d7898e2134edf4c0a28417b4a5274617d4.gz 
						
						
					 
					
						2008-11-12 12:25:17 -05:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a15034bea5 
					 
					
						
						
							
							notice inbox  
						
						... 
						
						
						
						darcs-hash:20081022203600-5ed1f-344e77e348655806a27db2de043b55ba67afc73a.gz 
						
						
					 
					
						2008-10-22 16:36:00 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b26477d787 
					 
					
						
						
							
							add an index to subscription token  
						
						... 
						
						
						
						darcs-hash:20081022192750-5ed1f-3265f9f4954cff431a0c276c16a98b9c22d8d40b.gz 
						
						
					 
					
						2008-10-22 15:27:50 -04:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						0d4d0c7911 
					 
					
						
						
							
							PostgreSQL: Put a default on confirm_address.address_extra to mimic mysql's behaviour when a not-null field is not set in a new record  
						
						... 
						
						
						
						darcs-hash:20080929060227-f6e2c-5996ad74cb5c89052417e36634a22b6e219bd92d.gz 
						
						
					 
					
						2008-09-29 02:02:27 -04:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						ca4f358362 
					 
					
						
						
							
							PostgreSQL: Corrections to the two new table definitions  
						
						... 
						
						
						
						darcs-hash:20080924113550-f6e2c-8791d68684424ef028049ee9ed95b3853dd8f770.gz 
						
						
					 
					
						2008-09-24 07:35:50 -04:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						cfc8a47bf1 
					 
					
						
						
							
							PostgreSQL: New tables for private messages and invitations (untested)  
						
						... 
						
						
						
						darcs-hash:20080923214601-f6e2c-350de6e8df8bb6e9e5f3dbb1ea43360fc55ee847.gz 
						
						
					 
					
						2008-09-23 17:46:01 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						06859cc14e 
					 
					
						
						
							
							Twitter bridge - pref setting to turn off sending @-replies to Twitter  
						
						... 
						
						
						
						darcs-hash:20080924023615-7b5ce-c747e8236b3967824ed93f18285e1b6e0b46c3f0.gz 
						
						
					 
					
						2008-09-23 22:36:15 -04:00 
						 
				 
			
				
					
						
							
							
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						130ba28886 
					 
					
						
						
							
							newmessage and showmessage  
						
						... 
						
						
						
						darcs-hash:20080917174741-5ed1f-c090055487bab0df52d25ad6550d3850ef5f7661.gz 
						
						
					 
					
						2008-09-17 13:47:41 -04:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						3632a76773 
					 
					
						
						
							
							PostgreSQL: support for full text searching (notice and people)  
						
						... 
						
						
						
						darcs-hash:20080914201744-f6e2c-71b2a3aec4c0b91557465323d79645e7eab2bfd1.gz 
						
						
					 
					
						2008-09-14 16:17:44 -04:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						c10ab14d13 
					 
					
						
						
							
							PostgreSQL - reply.modified needs a default  
						
						... 
						
						
						
						darcs-hash:20080910073741-f6e2c-fe856e1acbc14f77e8ad6502cf5e16de768e0e5f.gz 
						
						
					 
					
						2008-09-10 03:37:41 -04:00 
						 
				 
			
				
					
						
							
							
								CiaranG 
							
						 
					 
					
						
						
							
						
						26634ef0a0 
					 
					
						
						
							
							Initial support for PostgreSQL  
						
						... 
						
						
						
						darcs-hash:20080909072224-f6e2c-881bd2e7fb032f336fecae9ca5ce527dd821d3dc.gz 
						
						
					 
					
						2008-09-09 03:22:24 -04:00 
						 
				 
			
				
					
						
							
							
								Zach Copley 
							
						 
					 
					
						
						
							
						
						f5c9a6ebcf 
					 
					
						
						
							
							Twitter integration - decided to change Twitter to service ID  #1  
						
						... 
						
						
						
						darcs-hash:20080827021635-7b5ce-9b96743999aa85a505aecd5f25867937f0c34434.gz 
						
						
					 
					
						2008-08-26 22:16:35 -04:00