From 92964a4a6c40539ba100f71c3c5be35930be2867 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 25 Nov 2012 11:49:53 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
plugins/managesieve/tests/Parser.php | 2 +-
plugins/managesieve/tests/Tokenizer.php | 2 +-
plugins/managesieve/Changelog | 1 +
plugins/managesieve/lib/Roundcube/rcube_sieve_script.php | 0
plugins/managesieve/lib/Roundcube/rcube_sieve.php | 0
skins/larry/mail.css | 3 ++-
6 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index dceac76..4b839a8 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,4 +1,5 @@
- Fixed filter activation/deactivation confirmation message (#1488765)
+- Moved rcube_* classes to <plugin>/lib/Roundcube for compat. with Roundcube Framework autoloader
* version 6.0 [2012-10-03]
-----------------------------------------------------------
diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
similarity index 100%
rename from plugins/managesieve/lib/rcube_sieve.php
rename to plugins/managesieve/lib/Roundcube/rcube_sieve.php
diff --git a/plugins/managesieve/lib/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
similarity index 100%
rename from plugins/managesieve/lib/rcube_sieve_script.php
rename to plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
diff --git a/plugins/managesieve/tests/Parser.php b/plugins/managesieve/tests/Parser.php
index 2f24870..9050f09 100644
--- a/plugins/managesieve/tests/Parser.php
+++ b/plugins/managesieve/tests/Parser.php
@@ -5,7 +5,7 @@
function setUp()
{
- include_once dirname(__FILE__) . '/../lib/rcube_sieve_script.php';
+ include_once dirname(__FILE__) . '/../lib/Roundcube/rcube_sieve_script.php';
}
/**
diff --git a/plugins/managesieve/tests/Tokenizer.php b/plugins/managesieve/tests/Tokenizer.php
index 8c0bced..e71bae0 100644
--- a/plugins/managesieve/tests/Tokenizer.php
+++ b/plugins/managesieve/tests/Tokenizer.php
@@ -5,7 +5,7 @@
function setUp()
{
- include_once dirname(__FILE__) . '/../lib/rcube_sieve_script.php';
+ include_once dirname(__FILE__) . '/../lib/Roundcube/rcube_sieve_script.php';
}
function data_tokenizer()
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 71b3357..48eba6e 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -52,7 +52,7 @@
bottom: 0;
width: 100%;
height: 27px;
- border-radius: 0 0 4px 4px;
+ border-radius: 4px;
border-top: none;
}
@@ -145,6 +145,7 @@
#mailboxlist li:first-child {
border-radius: 4px 4px 0 0;
+ border-top: 0;
}
#mailboxlist li.mailbox a {
--
Gitblit v1.9.1