diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-05-26 23:22:29 +0000 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-05-26 23:22:29 +0000 |
| commit | a497114a5534fcc368fc3d4b9af356089432a628 (patch) | |
| tree | 2fd50af55c6ba06db6a9c186d30ab62a8dec1458 /classes | |
| parent | 69a656af2210acf9211aa4fcb1c05bfd5c5a2e1f (diff) | |
| parent | 0b53a820c2b4224b66b2a24f67302b4c5ca1deed (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'classes')
| -rw-r--r--[-rwxr-xr-x] | classes/Group_inbox.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | classes/Group_member.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | classes/Related_group.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | classes/Status_network.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | classes/User_group.php | 0 | ||||
| -rw-r--r-- | classes/laconica.ini | 118 |
6 files changed, 58 insertions, 60 deletions
diff --git a/classes/Group_inbox.php b/classes/Group_inbox.php index b80ba4272..b80ba4272 100755..100644 --- a/classes/Group_inbox.php +++ b/classes/Group_inbox.php diff --git a/classes/Group_member.php b/classes/Group_member.php index 3c23a991f..3c23a991f 100755..100644 --- a/classes/Group_member.php +++ b/classes/Group_member.php diff --git a/classes/Related_group.php b/classes/Related_group.php index c00ad9c44..c00ad9c44 100755..100644 --- a/classes/Related_group.php +++ b/classes/Related_group.php diff --git a/classes/Status_network.php b/classes/Status_network.php index f7747f71d..f7747f71d 100755..100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php diff --git a/classes/User_group.php b/classes/User_group.php index 7cc31e702..7cc31e702 100755..100644 --- a/classes/User_group.php +++ b/classes/User_group.php diff --git a/classes/laconica.ini b/classes/laconica.ini index 316923af0..92bbb35d4 100644 --- a/classes/laconica.ini +++ b/classes/laconica.ini @@ -46,6 +46,64 @@ modified = 384 notice_id = K user_id = K +[file] +id = 129 +url = 2 +mimetype = 2 +size = 1 +title = 2 +date = 1 +protected = 1 + +[file__keys] +id = N + +[file_oembed] +id = 129 +file_id = 1 +version = 2 +type = 2 +provider = 2 +provider_url = 2 +width = 1 +height = 1 +html = 34 +title = 2 +author_name = 2 +author_url = 2 +url = 2 + +[file_oembed__keys] +id = N + +[file_redirection] +id = 129 +url = 2 +file_id = 1 +redirections = 1 +httpcode = 1 + +[file_redirection__keys] +id = N + +[file_thumbnail] +id = 129 +file_id = 1 +url = 2 +width = 1 +height = 1 + +[file_thumbnail__keys] +id = N + +[file_to_post] +id = 129 +file_id = 1 +post_id = 1 + +[file_to_post__keys] +id = N + [foreign_link] user_id = 129 foreign_id = 129 @@ -392,63 +450,3 @@ modified = 384 [user_openid__keys] canonical = K display = U - -[file] -id = 129 -url = 2 -mimetype = 2 -size = 1 -title = 2 -date = 1 -protected = 1 - -[file__keys] -id = N - -[file_oembed] -id = 129 -file_id = 129 -version = 2 -type = 2 -provider = 2 -provider_url = 2 -width = 1 -height = 1 -html = 34 -title = 2 -author_name = 2 -author_url = 2 -url = 2 - -[file_oembed__keys] -id = N - -[file_redirection] -id = 129 -url = 2 -file_id = 129 -redirections = 1 -httpcode = 1 - -[file_redirection__keys] -id = N - -[file_thumbnail] -id = 129 -file_id = 129 -url = 2 -width = 1 -height = 1 - -[file_thumbnail__keys] -id = N - -[file_to_post] -id = 129 -file_id = 129 -post_id = 129 - -[file_to_post__keys] -id = N - - |