Merge branch 'extprofile' into 0.9.x

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

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 7a0f4dede8748f4768af131fe35cf43873523cf2..1916c2513972aa78339b3d5270c31524eee10f7d 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -47,6 +47,16 @@ modified = 384
 [consumer__keys]
 consumer_key = K
 
+[conversation]
+id = 129
+uri = 2
+created = 142
+modified = 384
+
+[conversation__keys]
+id = N
+uri = U
+
 [deleted_notice]
 id = 129
 profile_id = 129
@@ -235,13 +245,6 @@ modified = 384
 group_id = K
 profile_id = K
 
-[invitation]
-code = 130
-user_id = 129
-address = 130
-address_type = 130
-created = 142
-
 [inbox]
 user_id = 129
 notice_ids = 66
@@ -249,9 +252,26 @@ notice_ids = 66
 [inbox__keys]
 user_id = K
 
+[invitation]
+code = 130
+user_id = 129
+address = 130
+address_type = 130
+created = 142
+
 [invitation__keys]
 code = K
 
+[local_group]
+group_id = 129
+nickname = 2
+created = 142
+modified = 384
+
+[local_group__keys]
+group_id = K
+nickname = U
+
 [location_namespace]
 id = 129
 description = 2
@@ -359,7 +379,7 @@ icon = 130
 source_url = 2
 organization = 2
 homepage = 2
-callback_url = 130
+callback_url = 2
 type = 17
 access_type = 17
 created = 142
@@ -367,13 +387,13 @@ modified = 384
 
 [oauth_application__keys]
 id = N
+name = U
 
 [oauth_application_user]
 profile_id = 129
 application_id = 129
 access_type = 17
 token = 2
-verifier = 2
 created = 142
 modified = 384
 
@@ -381,6 +401,18 @@ modified = 384
 profile_id = K
 application_id = K
 
+[oauth_token_association]
+profile_id = 129
+application_id = 129
+token = 130
+created = 142
+modified = 384
+
+[oauth_token_association__keys]
+profile_id = K
+application_id = K
+token = K
+
 [profile]
 id = 129
 nickname = 130
@@ -429,14 +461,14 @@ tagged = K
 tag = K
 
 [queue_item]
-notice_id = 129
+id = 129
+frame = 194
 transport = 130
 created = 142
 claimed = 14
 
 [queue_item__keys]
-notice_id = K
-transport = K
+id = N
 
 [related_group]
 group_id = 129
@@ -470,7 +502,8 @@ uri = U
 [reply]
 notice_id = 129
 profile_id = 129
-modified = 384
+modified = 142
+;modified = 384 ; skipping the mysql_timestamp mode so we can override its setting
 replied_id = 1
 
 [reply__keys]
@@ -517,6 +550,8 @@ tok = 130
 secret = 130
 type = 145
 state = 17
+verifier = 2
+verified_callback = 2
 created = 142
 modified = 384
 
@@ -581,6 +616,8 @@ mini_logo = 2
 design_id = 1
 created = 142
 modified = 384
+uri = 2
+mainpage = 2
 
 [user_group__keys]
 id = N
@@ -614,4 +651,3 @@ modified = 384
 
 [user_location_prefs__keys]
 user_id = K
-