Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

[quix0rs-gnu-social.git] / classes / laconica.ini

diff --git a/classes/laconica.ini b/classes/laconica.ini
old mode 100644 (file)
new mode 100755 (executable)
index 470c0ea..529454d
--- a/classes/laconica.ini
+++ b/classes/laconica.ini
@@ -98,6 +98,26 @@ id = K
 service = K
 uri = U
 
+[group_inbox]
+group_id = 129
+notice_id = 129
+created = 142
+
+[group_inbox__keys]
+group_id = K
+notice_id = K
+
+[group_member]
+group_id = 129
+profile_id = 129
+is_admin = 17
+created = 142
+modified = 384
+
+[group_member__keys]
+group_id = K
+profile_id = K
+
 [invitation]
 code = 130
 user_id = 129
@@ -125,7 +145,7 @@ id = N
 
 [nonce]
 consumer_key = 130
-tok = 130
+tok = 2
 nonce = 130
 ts = 142
 created = 142
@@ -133,8 +153,8 @@ modified = 384
 
 [nonce__keys]
 consumer_key = K
-tok = K
 nonce = K
+ts = K
 
 [notice]
 id = 129
@@ -155,7 +175,6 @@ id = N
 [notice_inbox]
 user_id = 129
 notice_id = 129
-source = 17
 created = 142
 source = 17
 
@@ -196,6 +215,15 @@ modified = 384
 [profile__keys]
 id = N
 
+[profile_block]
+blocker = 129
+blocked = 129
+modified = 384
+
+[profile_block__keys]
+blocker = K
+blocked = K
+
 [profile_tag]
 tagger = 129
 tagged = 129
@@ -217,6 +245,15 @@ claimed = 14
 notice_id = K
 transport = K
 
+[related_group]
+group_id = 129
+related_group_id = 129
+created = 142
+
+[related_group__keys]
+group_id = K
+related_group_id = K
+
 [remember_me]
 code = 130
 user_id = 129
@@ -255,11 +292,14 @@ created = 142
 modified = 384
 
 [sms_carrier__keys]
-id = N
+id = K
+name = U
 
 [subscription]
 subscriber = 129
 subscribed = 129
+jabber = 17
+sms = 17
 token = 2
 secret = 2
 created = 142
@@ -292,6 +332,7 @@ emailnotifysub = 17
 emailnotifyfav = 17
 emailnotifynudge = 17
 emailnotifymsg = 17
+emailnotifyattn = 17
 emailmicroid = 17
 language = 2
 timezone = 2
@@ -322,6 +363,23 @@ jabber = U
 sms = U
 uri = U
 
+[user_group]
+id = 129
+nickname = 2
+fullname = 2
+homepage = 2
+description = 2
+location = 2
+original_logo = 2
+homepage_logo = 2
+stream_logo = 2
+mini_logo = 2
+created = 142
+modified = 384
+
+[user_group__keys]
+id = N
+
 [user_openid]
 canonical = 130
 display = 130