diff options
author | Hugues Hiegel <root@paranoid> | 2015-04-21 12:49:44 +0200 |
---|---|---|
committer | Hugues Hiegel <root@paranoid> | 2015-04-21 12:49:44 +0200 |
commit | 733f8e8d0ce6217d906d06dc4fb08e36d48ed794 (patch) | |
tree | cff28366ff63ea6596f8026e1698090bd0b9405c /SQL | |
parent | ef2e7b3f9d264ec146d4dae257b1e295ab3b462a (diff) | |
parent | a4ba3df54834ee90fb2c9930669f1229dc80261a (diff) |
Conflicts:
composer.json-dist
config/defaults.inc.php
plugins
plugins/acl/acl.js
plugins/acl/acl.php
plugins/acl/skins/classic/templates/table.html
plugins/acl/skins/larry/templates/table.html
plugins/enigma/README
plugins/enigma/config.inc.php.dist
plugins/enigma/enigma.js
plugins/enigma/enigma.php
plugins/enigma/lib/enigma_driver.php
plugins/enigma/lib/enigma_driver_gnupg.php
plugins/enigma/lib/enigma_driver_phpssl.php
plugins/enigma/lib/enigma_engine.php
plugins/enigma/lib/enigma_error.php
plugins/enigma/lib/enigma_key.php
plugins/enigma/lib/enigma_signature.php
plugins/enigma/lib/enigma_subkey.php
plugins/enigma/lib/enigma_ui.php
plugins/enigma/lib/enigma_userid.php
plugins/enigma/localization/en_US.inc
plugins/enigma/localization/ja_JP.inc
plugins/enigma/localization/ru_RU.inc
plugins/enigma/skins/classic/enigma.css
plugins/enigma/skins/classic/templates/keys.html
plugins/help/config.inc.php.dist
plugins/help/help.php
plugins/help/localization/en_US.inc
plugins/jqueryui/jqueryui.php
plugins/managesieve/Changelog
plugins/managesieve/composer.json
plugins/managesieve/config.inc.php.dist
plugins/managesieve/lib/Roundcube/rcube_sieve.php
plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
plugins/managesieve/localization/en_US.inc
plugins/managesieve/managesieve.js
plugins/managesieve/skins/classic/managesieve.css
plugins/managesieve/skins/larry/managesieve.css
plugins/password/README
plugins/password/config.inc.php.dist
plugins/password/drivers/ldap.php
plugins/password/drivers/poppassd.php
plugins/password/drivers/vpopmaild.php
plugins/vcard_attachments/vcardattach.js
plugins/zipdownload/zipdownload.php
Diffstat (limited to 'SQL')
-rw-r--r-- | SQL/mssql.initial.sql | 2 | ||||
-rw-r--r-- | SQL/mssql/2015030800.sql | 1 | ||||
-rw-r--r-- | SQL/mysql.initial.sql | 4 | ||||
-rw-r--r-- | SQL/mysql/2015030800.sql | 1 | ||||
-rw-r--r-- | SQL/oracle.initial.sql | 2 | ||||
-rw-r--r-- | SQL/oracle/2015030800.sql | 1 | ||||
-rw-r--r-- | SQL/postgres.initial.sql | 2 | ||||
-rw-r--r-- | SQL/postgres/2015030800.sql | 1 | ||||
-rw-r--r-- | SQL/sqlite.initial.sql | 2 | ||||
-rw-r--r-- | SQL/sqlite/2015030800.sql | 1 |
10 files changed, 11 insertions, 6 deletions
diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql index b45db10b4..8002170d5 100644 --- a/SQL/mssql.initial.sql +++ b/SQL/mssql.initial.sql @@ -393,6 +393,6 @@ CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts] WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)
GO
-INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2014042900')
+INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2015030800')
GO
\ No newline at end of file diff --git a/SQL/mssql/2015030800.sql b/SQL/mssql/2015030800.sql new file mode 100644 index 000000000..fe6741a02 --- /dev/null +++ b/SQL/mssql/2015030800.sql @@ -0,0 +1 @@ +-- empty
\ No newline at end of file diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql index f174dc55f..721c839c7 100644 --- a/SQL/mysql.initial.sql +++ b/SQL/mysql.initial.sql @@ -162,7 +162,7 @@ CREATE TABLE `identities` ( `email` varchar(128) NOT NULL, `reply-to` varchar(128) NOT NULL DEFAULT '', `bcc` varchar(128) NOT NULL DEFAULT '', - `signature` text, + `signature` longtext, `html_signature` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY(`identity_id`), CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`) @@ -209,4 +209,4 @@ CREATE TABLE `system` ( /*!40014 SET FOREIGN_KEY_CHECKS=1 */; -INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900'); +INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800'); diff --git a/SQL/mysql/2015030800.sql b/SQL/mysql/2015030800.sql new file mode 100644 index 000000000..5ff6f1492 --- /dev/null +++ b/SQL/mysql/2015030800.sql @@ -0,0 +1 @@ +ALTER TABLE `identities` CHANGE `signature` `signature` longtext; diff --git a/SQL/oracle.initial.sql b/SQL/oracle.initial.sql index d32cc926f..0110abf4b 100644 --- a/SQL/oracle.initial.sql +++ b/SQL/oracle.initial.sql @@ -218,4 +218,4 @@ CREATE TABLE "system" ( "value" long ); -INSERT INTO "system" ("name", "value") VALUES ('roundcube-version', '2014042900'); +INSERT INTO "system" ("name", "value") VALUES ('roundcube-version', '2015030800'); diff --git a/SQL/oracle/2015030800.sql b/SQL/oracle/2015030800.sql new file mode 100644 index 000000000..fe6741a02 --- /dev/null +++ b/SQL/oracle/2015030800.sql @@ -0,0 +1 @@ +-- empty
\ No newline at end of file diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql index 238c3a657..ba53112f8 100644 --- a/SQL/postgres.initial.sql +++ b/SQL/postgres.initial.sql @@ -290,4 +290,4 @@ CREATE TABLE "system" ( value text ); -INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900'); +INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800'); diff --git a/SQL/postgres/2015030800.sql b/SQL/postgres/2015030800.sql new file mode 100644 index 000000000..fe6741a02 --- /dev/null +++ b/SQL/postgres/2015030800.sql @@ -0,0 +1 @@ +-- empty
\ No newline at end of file diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql index 897e3af20..a7426c1a1 100644 --- a/SQL/sqlite.initial.sql +++ b/SQL/sqlite.initial.sql @@ -201,4 +201,4 @@ CREATE TABLE system ( value text NOT NULL ); -INSERT INTO system (name, value) VALUES ('roundcube-version', '2014042900'); +INSERT INTO system (name, value) VALUES ('roundcube-version', '2015030800'); diff --git a/SQL/sqlite/2015030800.sql b/SQL/sqlite/2015030800.sql new file mode 100644 index 000000000..fe6741a02 --- /dev/null +++ b/SQL/sqlite/2015030800.sql @@ -0,0 +1 @@ +-- empty
\ No newline at end of file |