summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-05-31 17:12:04 -0400
committerRobin Millette <millette@controlyourself.ca>2009-05-31 17:12:04 -0400
commitebeb5f744cbfd5bfea0da1b350a3757865ec4b3b (patch)
treee94ceadeeba967759cb332211a5adb5d6dceab0b /db
parent3e0c291810d23bb54c337c0fe95c1ba441459c4c (diff)
parent36fe5a85b2de9f71a5c963abd0074dd5b7ae1e61 (diff)
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload
Conflicts: js/util.js lib/attachmentlist.php
Diffstat (limited to 'db')
-rw-r--r--db/laconica.sql2
-rw-r--r--db/notice_source.sql2
2 files changed, 3 insertions, 1 deletions
diff --git a/db/laconica.sql b/db/laconica.sql
index 0b20bc172..a11e31692 100644
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -285,7 +285,7 @@ create table foreign_user (
create table foreign_link (
user_id int comment 'link to user on this system, if exists' references user (id),
- foreign_id int comment 'link ' references foreign_user(id),
+ foreign_id bigint unsigned comment 'link to user on foreign service, if exists' references foreign_user(id),
service int not null comment 'foreign key to service' references foreign_service(id),
credentials varchar(255) comment 'authc credentials, typically a password',
noticesync tinyint not null default 1 comment 'notice synchronization, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies',
diff --git a/db/notice_source.sql b/db/notice_source.sql
index 1508af1ec..d5a280b82 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -2,6 +2,7 @@ INSERT INTO notice_source
(code, name, url, created)
VALUES
('adium', 'Adium', 'http://www.adiumx.com/', now()),
+ ('AgentSolo.com','AgentSolo.com','http://www.agentsolo.com/', now()),
('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),
('bti','bti','http://gregkh.github.com/bti/', now()),
('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()),
@@ -29,6 +30,7 @@ VALUES
('pingvine','PingVine','http://pingvine.com/', now()),
('pocketwit','PockeTwit','http://code.google.com/p/pocketwit/', now()),
('posty','Posty','http://spreadingfunkyness.com/posty/', now()),
+ ('qtwitter','qTwitter','http://qtwitter.ayoy.net/', now()),
('royalewithcheese','Royale With Cheese','http://p.hellyeah.org/', now()),
('rssdent','rssdent','http://github.com/zcopley/rssdent/tree/master', now()),
('rygh.no','rygh.no','http://rygh.no/', now()),