From 72b117feb1afafb74d33056c22a14b257d9fa38e Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 9 Dec 2014 05:02:13 -0500 Subject: Use consistent license identifiers, remove redundant package.xml files --- plugins/acl/composer.json | 2 +- plugins/acl/package.xml | 63 --------- plugins/archive/composer.json | 2 +- plugins/archive/package.xml | 110 --------------- plugins/attachment_reminder/composer.json | 2 +- plugins/attachment_reminder/package.xml | 67 --------- plugins/database_attachments/composer.json | 5 +- plugins/database_attachments/package.xml | 62 --------- plugins/debug_logger/composer.json | 2 +- plugins/debug_logger/package.xml | 55 -------- plugins/emoticons/composer.json | 2 +- plugins/emoticons/package.xml | 53 -------- plugins/filesystem_attachments/composer.json | 2 +- plugins/filesystem_attachments/package.xml | 59 -------- plugins/help/composer.json | 2 +- plugins/help/package.xml | 92 ------------- plugins/hide_blockquote/composer.json | 2 +- plugins/hide_blockquote/package.xml | 54 -------- plugins/identity_select/composer.json | 2 +- plugins/identity_select/package.xml | 53 -------- plugins/jqueryui/composer.json | 2 +- plugins/legacy_browser/package.xml | 54 -------- plugins/markasjunk/composer.json | 2 +- plugins/markasjunk/package.xml | 68 ---------- plugins/new_user_dialog/composer.json | 2 +- plugins/new_user_dialog/package.xml | 69 ---------- plugins/new_user_identity/composer.json | 2 +- plugins/new_user_identity/package.xml | 49 ------- plugins/newmail_notifier/composer.json | 2 +- plugins/newmail_notifier/package.xml | 70 ---------- plugins/password/package.xml | 114 ---------------- plugins/redundant_attachments/composer.json | 5 +- plugins/redundant_attachments/package.xml | 63 --------- plugins/show_additional_headers/composer.json | 2 +- plugins/show_additional_headers/package.xml | 49 ------- plugins/subscriptions_option/composer.json | 2 +- plugins/subscriptions_option/package.xml | 69 ---------- plugins/userinfo/composer.json | 2 +- plugins/userinfo/package.xml | 70 ---------- plugins/vcard_attachments/composer.json | 2 +- plugins/vcard_attachments/package.xml | 187 -------------------------- plugins/virtuser_file/composer.json | 2 +- plugins/virtuser_file/package.xml | 47 ------- plugins/virtuser_query/composer.json | 2 +- plugins/virtuser_query/package.xml | 47 ------- plugins/zipdownload/composer.json | 2 +- plugins/zipdownload/package.xml | 96 ------------- program/lib/Roundcube/rcube_plugin_api.php | 1 + 48 files changed, 28 insertions(+), 1745 deletions(-) delete mode 100644 plugins/acl/package.xml delete mode 100644 plugins/archive/package.xml delete mode 100644 plugins/attachment_reminder/package.xml delete mode 100644 plugins/database_attachments/package.xml delete mode 100644 plugins/debug_logger/package.xml delete mode 100644 plugins/emoticons/package.xml delete mode 100644 plugins/filesystem_attachments/package.xml delete mode 100644 plugins/help/package.xml delete mode 100644 plugins/hide_blockquote/package.xml delete mode 100644 plugins/identity_select/package.xml delete mode 100644 plugins/legacy_browser/package.xml delete mode 100644 plugins/markasjunk/package.xml delete mode 100644 plugins/new_user_dialog/package.xml delete mode 100644 plugins/new_user_identity/package.xml delete mode 100644 plugins/newmail_notifier/package.xml delete mode 100644 plugins/password/package.xml delete mode 100644 plugins/redundant_attachments/package.xml delete mode 100644 plugins/show_additional_headers/package.xml delete mode 100644 plugins/subscriptions_option/package.xml delete mode 100644 plugins/userinfo/package.xml delete mode 100644 plugins/vcard_attachments/package.xml delete mode 100644 plugins/virtuser_file/package.xml delete mode 100644 plugins/virtuser_query/package.xml delete mode 100644 plugins/zipdownload/package.xml diff --git a/plugins/acl/composer.json b/plugins/acl/composer.json index 20859eabf..a08d211dd 100644 --- a/plugins/acl/composer.json +++ b/plugins/acl/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/acl", "type": "roundcube-plugin", "description": "IMAP Folders Access Control Lists Management (RFC4314, RFC2086).", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.5", "authors": [ { diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml deleted file mode 100644 index feec9cebe..000000000 --- a/plugins/acl/package.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - acl - pear.roundcube.net - Folders Access Control Lists - IMAP Folders Access Control Lists Management (RFC4314, RFC2086). - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2014-08-11 - - 1.5 - 1.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/archive/composer.json b/plugins/archive/composer.json index 1e3331b2c..0fa3802ea 100644 --- a/plugins/archive/composer.json +++ b/plugins/archive/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/archive", "type": "roundcube-plugin", "description": "This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "2.3", "authors": [ { diff --git a/plugins/archive/package.xml b/plugins/archive/package.xml deleted file mode 100644 index 4f5a87c7b..000000000 --- a/plugins/archive/package.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - archive - pear.roundcube.net - Archive feature for Roundcube - This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel. - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2014-04-07 - - 2.3 - 2.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/attachment_reminder/composer.json b/plugins/attachment_reminder/composer.json index a9601458d..7690a31a2 100644 --- a/plugins/attachment_reminder/composer.json +++ b/plugins/attachment_reminder/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/Attachment Reminder", "type": "roundcube-plugin", "description": "This Roundcube plugin reminds the user to attach a file if the composed message text indicates that there should be any.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.1", "authors": [ { diff --git a/plugins/attachment_reminder/package.xml b/plugins/attachment_reminder/package.xml deleted file mode 100644 index 78768d534..000000000 --- a/plugins/attachment_reminder/package.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - Attachment Reminder - Roundcube plugin that prompts you if it looks like you wanted to attach a file but you didn't. - - This Roundcube plugin reminds the user to attach a file if the composed message text indicates that there should be any. - - - Aleksander Machniak - alec - alec@alec.pl - yes - - - Thomas Yu - Sian, Liu - yes - - 2013-05-20 - - 1.1 - 1.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/database_attachments/composer.json b/plugins/database_attachments/composer.json index 86eced62c..d0df987eb 100644 --- a/plugins/database_attachments/composer.json +++ b/plugins/database_attachments/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/database_attachments", "type": "roundcube-plugin", "description": "This plugin which provides database backed storage for temporary attachment file handling. The primary advantage of this plugin is its compatibility with round-robin dns multi-server Roundcube installations.", - "license": "GNU GPLv2", + "license": "GPLv2", "version": "1.1", "authors": [ { @@ -24,6 +24,7 @@ ], "require": { "php": ">=5.3.0", - "roundcube/plugin-installer": ">=0.1.3" + "roundcube/plugin-installer": ">=0.1.3", + "roundcube/filesystem_attachments": ">=1.0.0" } } diff --git a/plugins/database_attachments/package.xml b/plugins/database_attachments/package.xml deleted file mode 100644 index 44adc219e..000000000 --- a/plugins/database_attachments/package.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - database_attachments - pear.roundcube.net - Database storage for uploaded attachments - - This plugin which provides database backed storage for temporary - attachment file handling. The primary advantage of this plugin - is its compatibility with round-robin dns multi-server Roundcube - installations. - - - Aleksander Machniak - alec - alec@alec.pl - yes - - - Ziba Scott - ziba - ziba@umich.edu - yes - - 2013-06-13 - - 1.1 - 1.0 - - - stable - stable - - GNU GPLv2 - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - filesystem_attachments - pear.roundcube.net - - - - - diff --git a/plugins/debug_logger/composer.json b/plugins/debug_logger/composer.json index 8ae445247..af7e1c1f8 100644 --- a/plugins/debug_logger/composer.json +++ b/plugins/debug_logger/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/debug_logger", "type": "roundcube-plugin", "description": "Enhanced logging for debugging purposes. It is not recommened to be enabled on production systems without testing because of the somewhat increased memory, cpu and disk i/o overhead.", - "license": "GNU GPLv2", + "license": "GPLv2", "version": "1.0", "authors": [ { diff --git a/plugins/debug_logger/package.xml b/plugins/debug_logger/package.xml deleted file mode 100644 index f416238ef..000000000 --- a/plugins/debug_logger/package.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - debug_logger - pear.roundcube.net - Additional debugging logs - - Enhanced logging for debugging purposes. It is not recommened - to be enabled on production systems without testing because of - the somewhat increased memory, cpu and disk i/o overhead. - - - Ziba Scott - ziba - ziba@umich.edu - yes - - 2011-11-21 - - 1.0 - 1.0 - - - stable - stable - - GNU GPLv2 - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/emoticons/composer.json b/plugins/emoticons/composer.json index c2ada7846..8e7b90ae9 100644 --- a/plugins/emoticons/composer.json +++ b/plugins/emoticons/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/emoticons", "type": "roundcube-plugin", "description": "Sample plugin to replace emoticons in plain text message body with real icons.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.3", "authors": [ { diff --git a/plugins/emoticons/package.xml b/plugins/emoticons/package.xml deleted file mode 100644 index b4218103c..000000000 --- a/plugins/emoticons/package.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - emoticons - pear.roundcube.net - Display emoticons in text messages - Sample plugin to replace emoticons in plain text message body with real icons. - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2011-11-21 - - 1.3 - 1.3 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/filesystem_attachments/composer.json b/plugins/filesystem_attachments/composer.json index 292360144..f13901275 100644 --- a/plugins/filesystem_attachments/composer.json +++ b/plugins/filesystem_attachments/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/filesystem_attachments", "type": "roundcube-plugin", "description": "This is a core plugin which provides basic, filesystem based attachment temporary file handling. This includes storing attachments of messages currently being composed, writing attachments to disk when drafts with attachments are re-opened and writing attachments to disk for inline display in current html compositions.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.0", "authors": [ { diff --git a/plugins/filesystem_attachments/package.xml b/plugins/filesystem_attachments/package.xml deleted file mode 100644 index 49ec51934..000000000 --- a/plugins/filesystem_attachments/package.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - filesystem_attachments - pear.roundcube.net - Default database storage for uploaded attachments - - This is a core plugin which provides basic, filesystem based - attachment temporary file handling. This includes storing - attachments of messages currently being composed, writing attachments - to disk when drafts with attachments are re-opened and writing - attachments to disk for inline display in current html compositions. - - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - - Ziba Scott - ziba - ziba@umich.edu - yes - - 2011-11-21 - - 1.0 - 1.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/help/composer.json b/plugins/help/composer.json index ee99de56d..53d413648 100644 --- a/plugins/help/composer.json +++ b/plugins/help/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/help", "type": "roundcube-plugin", "description": "Plugin adds a new item (Help) in taskbar.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.4", "authors": [ { diff --git a/plugins/help/package.xml b/plugins/help/package.xml deleted file mode 100644 index d39143ba1..000000000 --- a/plugins/help/package.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - help - pear.roundcube.net - Online Help for Roundcube - Plugin adds a new item (Help) in taskbar. - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2013-07-03 - - 1.4 - 1.4 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/hide_blockquote/composer.json b/plugins/hide_blockquote/composer.json index 986477a83..5af75fe7e 100644 --- a/plugins/hide_blockquote/composer.json +++ b/plugins/hide_blockquote/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/hide_blockquote", "type": "roundcube-plugin", "description": "This allows to hide long blocks of cited text in messages.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.0", "authors": [ { diff --git a/plugins/hide_blockquote/package.xml b/plugins/hide_blockquote/package.xml deleted file mode 100644 index 0d895c1d9..000000000 --- a/plugins/hide_blockquote/package.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - hide_blockquote - pear.roundcube.net - Citation blocks hiding for Roundcube - This allows to hide long blocks of cited text in messages. - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2012-05-23 - - 1.0 - 1.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/identity_select/composer.json b/plugins/identity_select/composer.json index 61a4b0d00..c31239360 100644 --- a/plugins/identity_select/composer.json +++ b/plugins/identity_select/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/identity_select", "type": "roundcube-plugin", "description": "On reply to a message user identity selection is based on\n\t\tcontent of standard headers like From, To, Cc and Return-Path.\n\t\tHere you can add header(s) set by your SMTP server (e.g.\n\t\tDelivered-To, Envelope-To, X-Envelope-To, X-RCPT-TO) to make\n\t\tidentity selection more accurate.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.0", "authors": [ { diff --git a/plugins/identity_select/package.xml b/plugins/identity_select/package.xml deleted file mode 100644 index 425c28830..000000000 --- a/plugins/identity_select/package.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - identity_select - pear.roundcube.net - Extended identity selection - - On reply to a message user identity selection is based on - content of standard headers like From, To, Cc and Return-Path. - Here you can add header(s) set by your SMTP server (e.g. - Delivered-To, Envelope-To, X-Envelope-To, X-RCPT-TO) to make - identity selection more accurate. - - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2013-08-04 - - 1.0 - 1.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/jqueryui/composer.json b/plugins/jqueryui/composer.json index d52e57c67..13ed9a16f 100644 --- a/plugins/jqueryui/composer.json +++ b/plugins/jqueryui/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/jqueryui", "type": "roundcube-plugin", "description": "Plugin adds the complete jQuery-UI library including the smoothness theme to Roundcube. This allows other plugins to use jQuery-UI without having to load their own version. The benefit of using one central jQuery-UI is that we wont run into problems of conflicting jQuery libraries being loaded. All plugins that want to use jQuery-UI should use this plugin as a requirement.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.10.4", "authors": [ { diff --git a/plugins/legacy_browser/package.xml b/plugins/legacy_browser/package.xml deleted file mode 100644 index 06e5fa2ba..000000000 --- a/plugins/legacy_browser/package.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - legacy_browser - pear.roundcube.net - Legacy browser (IE 7/8, Firefox < 4) support - This adds support for legacy browsers (IE 7/8, Firefox < 4). - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2014-06-19 - - 1.1 - 1.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/markasjunk/composer.json b/plugins/markasjunk/composer.json index edf1ad699..8ec5f3de8 100644 --- a/plugins/markasjunk/composer.json +++ b/plugins/markasjunk/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/markasjunk", "type": "roundcube-plugin", "description": "Adds a new button to the mailbox toolbar to mark the selected messages as Junk and move them to the configured Junk folder.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.2", "authors": [ { diff --git a/plugins/markasjunk/package.xml b/plugins/markasjunk/package.xml deleted file mode 100644 index 95597481a..000000000 --- a/plugins/markasjunk/package.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - markasjunk - pear.roundcube.net - Mark messages as Junk - Adds a new button to the mailbox toolbar to mark the selected messages as Junk and move them to the configured Junk folder. - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - 2013-08-29 - - 1.2 - 1.2 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/new_user_dialog/composer.json b/plugins/new_user_dialog/composer.json index cf3a37291..78ea0645c 100644 --- a/plugins/new_user_dialog/composer.json +++ b/plugins/new_user_dialog/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/new_user_dialog", "type": "roundcube-plugin", "description": "When a new user is created, this plugin checks the default identity and sets a session flag in case it is incomplete. An overlay box will appear on the screen until the user has reviewed/completed his identity.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "2.1", "authors": [ { diff --git a/plugins/new_user_dialog/package.xml b/plugins/new_user_dialog/package.xml deleted file mode 100644 index 90ca4bed0..000000000 --- a/plugins/new_user_dialog/package.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - new_user_dialog - pear.roundcube.net - Present identities settings dialog to new users - When a new user is created, this plugin checks the default identity and sets a session flag in case it is incomplete. An overlay box will appear on the screen until the user has reviewed/completed his identity. - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - 2014-04-28 - - 2.1 - 2.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/new_user_identity/composer.json b/plugins/new_user_identity/composer.json index a2e9e95dc..8378ae50c 100644 --- a/plugins/new_user_identity/composer.json +++ b/plugins/new_user_identity/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/new_user_identity", "type": "roundcube-plugin", "description": "Populates a new user's default identity from LDAP on their first visit.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.1", "authors": [ { diff --git a/plugins/new_user_identity/package.xml b/plugins/new_user_identity/package.xml deleted file mode 100644 index 12409392b..000000000 --- a/plugins/new_user_identity/package.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - new_user_identity - pear.roundcube.net - Populates a new user's default identity from LDAP on their first visit. - - Populates a new user's default identity from LDAP on their first visit. - - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2014-10-30 - - 1.1 - 1.1 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/newmail_notifier/composer.json b/plugins/newmail_notifier/composer.json index 2ca5db709..1bca39c1f 100644 --- a/plugins/newmail_notifier/composer.json +++ b/plugins/newmail_notifier/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/newmail_notifier", "type": "roundcube-plugin", "description": "Supports three methods of notification: 1. Basic - focus browser window and change favicon 2. Sound - play wav file 3. Desktop - display desktop notification (using webkitNotifications feature, supported by Chrome and Firefox with 'HTML5 Notifications' plugin).", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "0.7", "authors": [ { diff --git a/plugins/newmail_notifier/package.xml b/plugins/newmail_notifier/package.xml deleted file mode 100644 index 3d7277bb4..000000000 --- a/plugins/newmail_notifier/package.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - newmail_notifier - pear.roundcube.net - Displays notification about a new mail - - Supports three methods of notification: - 1. Basic - focus browser window and change favicon - 2. Sound - play wav file - 3. Desktop - display desktop notification (using webkitNotifications feature, - supported by Chrome and Firefox with 'HTML5 Notifications' plugin). - - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2013-10-04 - - 0.7 - 0.5 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/password/package.xml b/plugins/password/package.xml deleted file mode 100644 index 4fa023c77..000000000 --- a/plugins/password/package.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - password - pear.roundcube.net - Password Change for Roundcube - Plugin that adds a possibility to change user password using many - methods (drivers) via Settings/Password tab. - - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2014-06-10 - - 3.5 - 2.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/redundant_attachments/composer.json b/plugins/redundant_attachments/composer.json index 3c98b6885..56f3ab832 100644 --- a/plugins/redundant_attachments/composer.json +++ b/plugins/redundant_attachments/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/redundant_attachments", "type": "roundcube-plugin", "description": "This plugin provides a redundant storage for temporary uploaded attachment files. They are stored in both the database backend as well as on the local file system. It provides also memcache store as a fallback.", - "license": "GNU GPLv2", + "license": "GPLv2", "version": "1.0", "authors": [ { @@ -24,6 +24,7 @@ ], "require": { "php": ">=5.3.0", - "roundcube/plugin-installer": ">=0.1.3" + "roundcube/plugin-installer": ">=0.1.3", + "roundcube/filesystem_attachments": ">=1.0.0" } } diff --git a/plugins/redundant_attachments/package.xml b/plugins/redundant_attachments/package.xml deleted file mode 100644 index 939cf12bd..000000000 --- a/plugins/redundant_attachments/package.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - redundant_attachments - pear.roundcube.net - Redundant storage for uploaded attachments - - This plugin provides a redundant storage for temporary uploaded - attachment files. They are stored in both the database backend - as well as on the local file system. - It provides also memcache store as a fallback. - - - Aleksander Machniak - alec - alec@alec.pl - yes - - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - 2011-11-21 - - 1.0 - 1.0 - - - stable - stable - - GNU GPLv2 - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - filesystem_attachments - pear.roundcube.net - - - - - diff --git a/plugins/show_additional_headers/composer.json b/plugins/show_additional_headers/composer.json index 53cd5a885..d1007547f 100644 --- a/plugins/show_additional_headers/composer.json +++ b/plugins/show_additional_headers/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/show_additional_headers", "type": "roundcube-plugin", "description": "Proof-of-concept plugin which will fetch additional headers and display them in the message view.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "2.0", "authors": [ { diff --git a/plugins/show_additional_headers/package.xml b/plugins/show_additional_headers/package.xml deleted file mode 100644 index 9ca60baa9..000000000 --- a/plugins/show_additional_headers/package.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - show_additional_headers - pear.roundcube.net - Displays additional message headers - - Proof-of-concept plugin which will fetch additional headers and display them in the message view. - - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - 2012-04-23 - - 2.0 - 2.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/subscriptions_option/composer.json b/plugins/subscriptions_option/composer.json index a3ba7b684..57b95d2c8 100644 --- a/plugins/subscriptions_option/composer.json +++ b/plugins/subscriptions_option/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/subscriptions_option", "type": "roundcube-plugin", "description": "A plugin which can enable or disable the use of imap subscriptions. It includes a toggle on the settings page under \"Server Settings\". The preference can also be locked.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.3", "authors": [ { diff --git a/plugins/subscriptions_option/package.xml b/plugins/subscriptions_option/package.xml deleted file mode 100644 index 04f2c1b3c..000000000 --- a/plugins/subscriptions_option/package.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - subscriptions_option - pear.roundcube.net - Option to disable IMAP subscriptions - - A plugin which can enable or disable the use of imap subscriptions. - It includes a toggle on the settings page under "Server Settings". - The preference can also be locked. - - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - - Ziba Scott - ziba - ziba@umich.edu - yes - - 2012-05-21 - - 1.3 - 1.1 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/userinfo/composer.json b/plugins/userinfo/composer.json index 0ae6f6db8..af5f6d7fa 100644 --- a/plugins/userinfo/composer.json +++ b/plugins/userinfo/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/userinfo", "type": "roundcube-plugin", "description": "Sample plugin that adds a new tab to the settings section to display some information about the current user.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.0", "authors": [ { diff --git a/plugins/userinfo/package.xml b/plugins/userinfo/package.xml deleted file mode 100644 index dd25d443b..000000000 --- a/plugins/userinfo/package.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - userinfo - pear.roundcube.net - Information about logged in user - - Sample plugin that adds a new tab to the settings section - to display some information about the current user. - - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - 2011-11-21 - - 1.0 - 1.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/vcard_attachments/composer.json b/plugins/vcard_attachments/composer.json index 5e451adf4..07105bdf6 100644 --- a/plugins/vcard_attachments/composer.json +++ b/plugins/vcard_attachments/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/vcard_attachments", "type": "roundcube-plugin", "description": "This plugin detects vCard attachments/bodies and shows a button(s) to add them to address book", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "3.2", "authors": [ { diff --git a/plugins/vcard_attachments/package.xml b/plugins/vcard_attachments/package.xml deleted file mode 100644 index 9fdf0acf2..000000000 --- a/plugins/vcard_attachments/package.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - vcard_attachments - pear.roundcube.net - vCard handler for Roundcube - This plugin detects vCard attachments/bodies and shows a button(s) to add them to address book - - Thomas Bruederli - thomasb - roundcube@gmail.com - yes - - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2012-11-18 - - 3.2 - 3.2 - - - stable - stable - - GNU GPLv3+ - -- Skip invalid vcards (#1488788) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - - - 2010-04-28 - - - 2.0 - 2.0 - - - stable - stable - - GNU GPLv2 - -- Added support for Content-Type: text/directory; profile=vCard -- Added handler for message bodies of type vCard (#1486683) -- Added support for more than one vCard attachment/body -- Added support for more than one contact in one vCard file -- Created package.xml - - - - 2012-03-11 - - - 3.1 - 3.1 - - - stable - stable - - GNU GPLv3+ - - - Add styles for new skin "Larry" - - - - 2012-03-11 - - - 3.1-beta - 3.1-beta - - - stable - stable - - GNU GPLv3+ - -- Add styles for new skin "Larry" -- Exec contact_create hook when adding contact (#1486964) -- Make icons skinable -- Display vcard icon on messages list when message is of type vcard - - - - 2012-04-13 - - 3.1 - 3.1 - - - stable - stable - - GNU GPLv3+ - -- Fixed doble urlencoding of vcard identifier -- Fixed encoding when default charset is different than vcard charset -- Improved vcards import to work as addressbook::import procedure (with validation and autofix) -- Support IDNA -- Import contacts to default addressbook - - - - diff --git a/plugins/virtuser_file/composer.json b/plugins/virtuser_file/composer.json index 1bf6ec043..27beab830 100644 --- a/plugins/virtuser_file/composer.json +++ b/plugins/virtuser_file/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/virtuser_file", "type": "roundcube-plugin", "description": "Plugin adds possibility to resolve user email/login according to lookup tables in files.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "1.0", "authors": [ { diff --git a/plugins/virtuser_file/package.xml b/plugins/virtuser_file/package.xml deleted file mode 100644 index 9b55ce427..000000000 --- a/plugins/virtuser_file/package.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - virtuser_file - pear.roundcube.net - File based User-to-Email and Email-to-User lookup - Plugin adds possibility to resolve user email/login according to lookup tables in files. - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2011-11-21 - - 1.0 - 1.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/virtuser_query/composer.json b/plugins/virtuser_query/composer.json index 6585a4117..7459ca9bd 100644 --- a/plugins/virtuser_query/composer.json +++ b/plugins/virtuser_query/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/virtuser_query", "type": "roundcube-plugin", "description": "Plugin adds possibility to resolve user email/login according to lookup tables in SQL database.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "2.0", "authors": [ { diff --git a/plugins/virtuser_query/package.xml b/plugins/virtuser_query/package.xml deleted file mode 100644 index 9430bf69d..000000000 --- a/plugins/virtuser_query/package.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - virtuser_query - pear.roundcube.net - SQL based User-to-Email and Email-to-User lookup - Plugin adds possibility to resolve user email/login according to lookup tables in SQL database. - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2012-02-17 - - 2.0 - 2.0 - - - stable - stable - - GNU GPLv3+ - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - - - diff --git a/plugins/zipdownload/composer.json b/plugins/zipdownload/composer.json index cdfbf9923..bc171d82a 100644 --- a/plugins/zipdownload/composer.json +++ b/plugins/zipdownload/composer.json @@ -2,7 +2,7 @@ "name": "roundcube/zipdownload", "type": "roundcube-plugin", "description": "Adds an option to download all attachments to a message in one zip file, when a message has multiple attachments. Also allows the download of a selection of messages in one zip file. Supports mbox and maildir format.", - "license": "GNU GPLv3+", + "license": "GPLv3+", "version": "3.0", "authors": [ { diff --git a/plugins/zipdownload/package.xml b/plugins/zipdownload/package.xml deleted file mode 100644 index 7485c5870..000000000 --- a/plugins/zipdownload/package.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - zipdownload - pear.roundcube.net - Download multiple attachments or messages in one zip file - Adds an option to download all attachments to a message in one zip file, when a message has multiple attachments. - Also allows the download of a selection of messages in one zip file. Supports mbox and maildir formats. - - Philip Weir - JohnDoh - roundcube@tehinterweb.co.uk - no - - - Thomas Bruederli - bruederli - roundcube@gmail.com - yes - - - Aleksander Machniak - alec - alec@alec.pl - yes - - 2014-04-18 - - - 3.0 - 3.0 - - - stable - stable - - GNU GPLv3+ - Repo only - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5.2.1 - - - 1.7.0 - - - zip - pecl.php.net - zip - - - - - diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php index 92a56363a..c74162619 100644 --- a/program/lib/Roundcube/rcube_plugin_api.php +++ b/program/lib/Roundcube/rcube_plugin_api.php @@ -252,6 +252,7 @@ class rcube_plugin_api 'GPLv2' => 'http://www.gnu.org/licenses/gpl-2.0.html', 'GPL-2.0' => 'http://www.gnu.org/licenses/gpl-2.0.html', 'GPLv3' => 'http://www.gnu.org/licenses/gpl-3.0.html', + 'GPLv3+' => 'http://www.gnu.org/licenses/gpl-3.0.html', 'GPL-3.0' => 'http://www.gnu.org/licenses/gpl-3.0.html', 'GPL-3.0+' => 'http://www.gnu.org/licenses/gpl.html', 'GPL-2.0+' => 'http://www.gnu.org/licenses/gpl.html', -- cgit v1.2.3