summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/beta5tobeta6.sql28
-rw-r--r--db/local_group.sql17
-rw-r--r--lib/common.php2
-rw-r--r--lib/default.php1
4 files changed, 29 insertions, 19 deletions
diff --git a/db/beta5tobeta6.sql b/db/beta5tobeta6.sql
new file mode 100644
index 000000000..e9dff17ef
--- /dev/null
+++ b/db/beta5tobeta6.sql
@@ -0,0 +1,28 @@
+alter table oauth_application
+ modify column name varchar(255) not null unique key comment 'name of the application',
+ modify column access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write';
+
+alter table user_group
+add column uri varchar(255) unique key comment 'universal identifier',
+add column mainpage varchar(255) comment 'page for group info to link to',
+drop index nickname;
+
+create table conversation (
+ id integer auto_increment primary key comment 'unique identifier',
+ uri varchar(225) unique comment 'URI of the conversation',
+ created datetime not null comment 'date this record was created',
+ modified timestamp comment 'date this record was modified'
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table local_group (
+ group_id integer primary key comment 'group represented' references user_group (id),
+ nickname varchar(64) unique key comment 'group represented',
+
+ created datetime not null comment 'date this record was created',
+ modified timestamp comment 'date this record was modified'
+
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+insert into local_group (group_id, nickname, created)
+select id, nickname, created from user_group;
+
diff --git a/db/local_group.sql b/db/local_group.sql
deleted file mode 100644
index 14973e755..000000000
--- a/db/local_group.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-alter table user_group
- add uri varchar(255) unique key comment 'universal identifier',
- add mainpage varchar(255) comment 'page for group info to link to',
- drop index nickname;
-
-create table local_group (
-
- group_id integer primary key comment 'group represented' references user_group (id),
- nickname varchar(64) unique key comment 'group represented',
-
- created datetime not null comment 'date this record was created',
- modified timestamp comment 'date this record was modified'
-
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-insert into local_group (group_id, nickname, created, modified)
- select id, nickname, created, modified from user_group;
diff --git a/lib/common.php b/lib/common.php
index 68723955e..2dbe3b3c5 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
//exit with 200 response, if this is checking fancy from the installer
if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; }
-define('STATUSNET_VERSION', '0.9.0beta5');
+define('STATUSNET_VERSION', '0.9.0beta6');
define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
define('STATUSNET_CODENAME', 'Stand');
diff --git a/lib/default.php b/lib/default.php
index bb7708bfc..d849055c2 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -278,7 +278,6 @@ $default =
'TightUrl' => array('shortenerName' => '2tu.us', 'freeService' => true,'serviceUrl'=>'http://2tu.us/?save=y&url=%1$s'),
'Geonames' => null,
'Mapstraction' => null,
- 'Linkback' => null,
'WikiHashtags' => null,
'OpenID' => null),
),