Merge commit 'origin/0.8.x' into 0.9.x

2 files changed, 5 insertions, 3 deletions

diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index f5d35f985..71c99f24f 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -441,7 +441,6 @@ create table group_inbox (
     group_id integer not null /* comment 'group receiving the message' references user_group (id) */,

     notice_id integer not null /* comment 'notice received' references notice (id) */,

     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date the notice was created' */,

-

     primary key (group_id, notice_id)

 );

 create index group_inbox_created_idx on group_inbox using btree(created);

@@ -456,7 +455,9 @@ create table file (
     size integer, 

     title varchar(255), 

     date integer, 

-    protected integer

+    protected integer,

+    filename text /* comment 'if a local file, name of the file' */,

+    modified timestamp default CURRENT_TIMESTAMP /* comment 'date this record was modified'*/

 );

 

 create sequence file_oembed_seq;

diff --git a/db/sms_carrier.sql b/db/sms_carrier.sql
index 6879f2089..055606f58 100644
--- a/db/sms_carrier.sql
+++ b/db/sms_carrier.sql
@@ -60,4 +60,5 @@ VALUES
     (100112, 'Cincinnati Bell Wireless', '%s@gocbw.com', now()),
     (100113, 'T-Mobile Germany', '%s@t-mobile-sms.de', now()),
     (100114, 'Vodafone Germany', '%s@vodafone-sms.de', now()),
-    (100115, 'E-Plus', '%s@smsmail.eplus.de', now());
+    (100115, 'E-Plus', '%s@smsmail.eplus.de', now()),
+    (100116, 'Cellular South', '%s@csouth1.com', now());