Merge branch '0.9.x' into adminpanel

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

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 766bed75deff2a8af0134b0c6773dac420895844..912d05cdff0b5e9fb2cad788e5932bfa5d54a90d 100644 (file)
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -16,6 +16,15 @@ width = K
 height = K
 url = U
 
+[config]
+section = 130
+setting = 130
+value = 2
+
+[config__keys]
+section = K
+setting = K
+
 [confirm_address]
 code = 130
 user_id = 129
@@ -38,6 +47,17 @@ modified = 384
 [consumer__keys]
 consumer_key = K
 
+[deleted_notice]
+id = 129
+profile_id = 129
+uri = 2
+created = 142
+deleted = 142
+
+[deleted_notice__keys]
+id = K
+uri = U
+
 [design]
 id = 129
 backgroundcolor = 1
@@ -78,6 +98,7 @@ id = N
 file_id = 129
 version = 2
 type = 2
+mimetype = 2
 provider = 2
 provider_url = 2
 width = 1
@@ -223,12 +244,21 @@ created = 142
 [invitation__keys]
 code = K
 
+[location_namespace]
+id = 129
+description = 2
+created = 142
+modified = 384
+
+[location_namespace__keys]
+id = K
+
 [message]
 id = 129
 uri = 2
 from_profile = 129
 to_profile = 129
-content = 2
+content = 34
 rendered = 34
 url = 2
 created = 142
@@ -255,7 +285,7 @@ ts = K
 id = 129
 profile_id = 129
 uri = 2
-content = 2
+content = 34
 rendered = 34
 url = 2
 created = 142
@@ -264,6 +294,10 @@ reply_to = 1
 is_local = 17
 source = 2
 conversation = 1
+lat = 1
+lon = 1
+location_id = 1
+location_ns = 1
 
 [notice__keys]
 id = N
@@ -303,8 +337,12 @@ nickname = 130
 fullname = 2
 profileurl = 2
 homepage = 2
-bio = 2
+bio = 34
 location = 2
+lat = 1
+lon = 1
+location_id = 1
+location_ns = 1
 created = 142
 modified = 384
 
@@ -475,7 +513,7 @@ id = 129
 nickname = 2
 fullname = 2
 homepage = 2
-description = 2
+description = 34
 location = 2
 original_logo = 2
 homepage_logo = 2
@@ -498,3 +536,33 @@ modified = 384
 [user_openid__keys]
 canonical = K
 display = U
+
+[user_openid_trustroot]
+trustroot = 130
+user_id = 129
+created = 142
+modified = 384
+
+[user_openid__keys]
+trustroot = K
+user_id = K
+
+[user_role]
+user_id = 129
+role = 130
+created = 142
+
+[user_role__keys]
+user_id = K
+role = K
+
+[login_token]
+user_id = 129
+token = 130
+created = 142
+modified = 384
+
+[login_token__keys]
+user_id = K
+token = K
+